X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fensure_re_prepended.ex;h=c438b8f704569dc51731df2473243e66cee97f8b;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=a3b9c461666c5219efb1592bdba28ef5bd1e661f;hpb=3dff61ebec4f4b216903d79261ec5cac80e70a08;p=akkoma

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 a3b9c4616..c438b8f70 100644
--- a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
+++ b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
@@ -1,35 +1,40 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
   alias Pleroma.Object
 
-  @behaviour Pleroma.Web.ActivityPub.MRF
+  @moduledoc "Ensure a re: is prepended on replies to a post with a Subject"
+  @behaviour Pleroma.Web.ActivityPub.MRF.Policy
+
+  @reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
+
+  def history_awareness, do: :auto
 
-  @have_re Regex.compile!("^re:[[:space:]]*", [:caseless])
   def filter_by_summary(
-        %{"summary" => parent_summary} = parent,
+        %{data: %{"summary" => parent_summary}} = _in_reply_to,
         %{"summary" => child_summary} = child
       )
       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
+    if (child_summary == parent_summary and not Regex.match?(@reply_prefix, child_summary)) or
+         (Regex.match?(@reply_prefix, parent_summary) &&
+            Regex.replace(@reply_prefix, parent_summary, "") == child_summary) do
       Map.put(child, "summary", "re: " <> child_summary)
     else
       child
     end
   end
 
-  def filter_by_summary(parent, child), do: child
-
-  def filter(%{"type" => activity_type} = object) when activity_type == "Create" do
-    child = object["object"]
-    in_reply_to = Object.normalize(child["inReplyTo"])
+  def filter_by_summary(_in_reply_to, child), do: child
 
+  def filter(%{"type" => type, "object" => child_object} = object)
+      when type in ["Create", "Update"] and is_map(child_object) do
     child =
-      if(in_reply_to,
-        do: filter_by_summary(in_reply_to.data, child),
-        else: child
-      )
+      child_object["inReplyTo"]
+      |> Object.normalize(fetch: false)
+      |> filter_by_summary(child_object)
 
     object = Map.put(object, "object", child)
 
@@ -37,4 +42,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
   end
 
   def filter(object), do: {:ok, object}
+
+  def describe, do: {:ok, %{}}
 end