projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
mrf
/
ensure_re_prepended.ex
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 15d8514be577f1117cae0e868d523b3412d79182..3a3e72910cc7909bc8cb81f975ac0dc027280d67 100644
(file)
--- a/
lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
+++ b/
lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
@@
-9,8
+9,9
@@
defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
@behaviour Pleroma.Web.ActivityPub.MRF
@reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
@behaviour Pleroma.Web.ActivityPub.MRF
@reply_prefix Regex.compile!("^re:[[:space:]]*", [:caseless])
+
def filter_by_summary(
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
%{"summary" => child_summary} = child
)
when not is_nil(child_summary) and byte_size(child_summary) > 0 and
@@
-24,17
+25,13
@@
defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
end
end
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" => "Create", "object" => child_object} = object) do
child =
child =
- if(in_reply_to,
- do: filter_by_summary(in_reply_to.data, child),
- else: child
- )
+ child_object["inReplyTo"]
+ |> Object.normalize(child_object["inReplyTo"])
+ |> filter_by_summary(child_object)
object = Map.put(object, "object", child)
object = Map.put(object, "object", child)
@@
-42,4
+39,6
@@
defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
end
def filter(object), do: {:ok, object}
end
def filter(object), do: {:ok, object}
+
+ def describe, do: {:ok, %{}}
end
end