knova/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)

Browse source
This commit is contained in:
nenolod@dereferenced.org 2018-04-19 12:29:35 +00:00 committed by William Pitcock
parent d24ddd9fb9
commit f08f9d4498
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View file

@ -23,10 +23,12 @@ defp check_media_removal(actor_info, object) do
@media_nsfw Keyword.get(@mrf_policy, :media_nsfw) @media_nsfw Keyword.get(@mrf_policy, :media_nsfw)
defp check_media_nsfw(actor_info, object) do defp check_media_nsfw(actor_info, object) do
if actor_info.host in @media_nsfw and object["attachment"] != nil and length(object["attachment"]) > 0 do child_object = object["object"]
tags = (object["tag"] || []) ++ ["nsfw"] if actor_info.host in @media_nsfw and child_object["attachment"] != nil and length(child_object["attachment"]) > 0 do
object = Map.put(object, "tags", tags) tags = (child_object["tag"] || []) ++ ["nsfw"]
object = Map.put(object, "sensitive", true) child_object = Map.put(child_object, "tags", tags)
child_object = Map.put(child_object, "sensitive", true)
object = Map.put(object, "object", child_object)
end end
{:ok, object} {:ok, object}