diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-29 12:20:04 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-29 12:20:04 +0000 |
| commit | 269b61a2402e3d12d09baf26ba73359776f556b0 (patch) | |
| tree | c9ef146b4b9d8d0b6ca0869748798cd2336ade18 /lib | |
| parent | de5c7e20a36ecb0f08e8c1d8248cdb288003cacf (diff) | |
| parent | edf8b6abfeba487406db756254a00524e3a9dce2 (diff) | |
| download | pleroma-269b61a2402e3d12d09baf26ba73359776f556b0.tar.gz | |
Merge branch '1996-dont-break-on-chatmessages' into 'develop'
EnsureRePrepended: Don't break on chat messages.
Closes #1996
See merge request pleroma/pleroma!2808
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex | 3 |
1 files changed, 2 insertions, 1 deletions
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 2627a0007..3bf70b894 100644 --- a/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex +++ b/lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex @@ -27,7 +27,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do def filter_by_summary(_in_reply_to, child), do: child - def filter(%{"type" => "Create", "object" => child_object} = object) do + def filter(%{"type" => "Create", "object" => child_object} = object) + when is_map(child_object) do child = child_object["inReplyTo"] |> Object.normalize(child_object["inReplyTo"]) |