hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'mrf/simple_policy/check_actor' into 'develop'

Browse source 
mrf/simple_policy: check actor against accept/reject

See merge request pleroma/pleroma!1806
This commit is contained in:
kaniini 2019-10-07 10:19:24 +00:00
commit 93bdc55306
3 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
when obj_type in ["Application", "Group", "Organization", "Person", "Service"] do
actor_info = URI.parse(actor)
with {:ok, object} <- check_avatar_removal(actor_info, object),
with {:ok, object} <- check_accept(actor_info, object),
{:ok, object} <- check_reject(actor_info, object),
{:ok, object} <- check_avatar_removal(actor_info, object),
{:ok, object} <- check_banner_removal(actor_info, object) do
{:ok, object}
else