alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop' 

ActivityPub MRF SimplePolicy: fix media stripping

See merge request pleroma/pleroma!133
This commit is contained in:
lambda 2018-04-27 05:49:12 +00:00
parent 6eb274f278 90bbd94614
commit 39c80a3667
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View File

@ -15,7 +15,8 @@ defp check_reject(actor_info, object) do
@media_removal Keyword.get(@mrf_policy, :media_removal) @media_removal Keyword.get(@mrf_policy, :media_removal)
defp check_media_removal(actor_info, object) do defp check_media_removal(actor_info, object) do
if actor_info.host in @media_removal 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 end
{:ok, object} {:ok, object}