diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-07 10:19:24 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-07 10:19:24 +0000 |
| commit | 93bdc55306895dce0554e7838ecf2ea7ddaea3a7 (patch) | |
| tree | 4e585d38cf71a92b43b164f7e81bf5c3029b184f /lib | |
| parent | 15592f1abe117761b90846e02194a35982f3bebf (diff) | |
| parent | 58aeabd020ae7355aea6b63a331b164e8b23a6c0 (diff) | |
| download | pleroma-93bdc55306895dce0554e7838ecf2ea7ddaea3a7.tar.gz | |
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 4 |
1 files changed, 3 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 8aa6852f0..8e53296e7 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -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 |