From: scarlett <nia@netbsd.org>
Date: Thu, 6 Dec 2018 13:48:12 +0000 (+0000)
Subject: Harden re: detection.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3dff61ebec4f4b216903d79261ec5cac80e70a08;p=akkoma

Harden re: detection.
---

diff --git a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
index 06fafb3ee..a3b9c4616 100644
--- a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
+++ b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
@@ -3,13 +3,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
 
   @behaviour Pleroma.Web.ActivityPub.MRF
 
+  @have_re Regex.compile!("^re:[[:space:]]*", [:caseless])
   def filter_by_summary(
         %{"summary" => parent_summary} = parent,
         %{"summary" => child_summary} = child
       )
-      when not is_nil(child_summary) and child_summary == parent_summary and
-             byte_size(child_summary) > 1 do
-    if not String.starts_with?(child_summary, "re:") do
+      when not is_nil(child_summary) and byte_size(child_summary) > 0 and
+             not is_nil(parent_summary) and byte_size(parent_summary) > 0 do
+    if (child_summary == parent_summary and not Regex.match?(@have_re, child_summary)) or
+         (Regex.match?(@have_re, parent_summary) &&
+            Regex.replace(@have_re, parent_summary, "") == child_summary) do
       Map.put(child, "summary", "re: " <> child_summary)
     else
       child