diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-27 05:49:12 +0000 | 
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-27 05:49:12 +0000 | 
| commit | 39c80a3667afec25a187894d67e0d0e9b8713eb1 (patch) | |
| tree | 4f66157f8444b2b0f3dd113742d622a002d8af70 | |
| parent | 6eb274f278e2a02fdba244072db8202de4030bf4 (diff) | |
| parent | 90bbd946145ad5d622044fea396b7d5d4a14f575 (diff) | |
| download | pleroma-39c80a3667afec25a187894d67e0d0e9b8713eb1.tar.gz pleroma-39c80a3667afec25a187894d67e0d0e9b8713eb1.zip | |
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 4dfb0c867..ea1af0f4d 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -15,7 +15,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do    @media_removal Keyword.get(@mrf_policy, :media_removal)    defp check_media_removal(actor_info, object) do      if actor_info.host in @media_removal do -      object = Map.delete(object, "attachments") +      child_object = Map.delete(object["object"], "attachment") +      object = Map.put(object, "object", child_object)      end      {:ok, object} | 
