From 5171aa5b4d6be5ba911039c52fa356da068b4b4f Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 19 Aug 2019 20:36:25 +0300 Subject: [PATCH] Refactor check_actor_is_active --- lib/pleroma/web/activity_pub/activity_pub.ex | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 16e0c3880..2e8cbe13d 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -61,18 +61,16 @@ defp get_recipients(data) do {recipients, to, cc} end - defp check_actor_is_active(true, _), do: :ok - - defp check_actor_is_active(false, actor) do + defp check_actor_is_active(actor) do if not is_nil(actor) do with user <- User.get_cached_by_ap_id(actor), false <- user.info.deactivated do - :ok + true else - _e -> :reject + _e -> false end else - :ok + true end end @@ -124,7 +122,7 @@ def increase_poll_votes_if_vote(_create_data), do: :noop def insert(map, local \\ true, fake \\ false, bypass_actor_check \\ false) when is_map(map) do with nil <- Activity.normalize(map), map <- lazy_put_activity_defaults(map, fake), - :ok <- check_actor_is_active(bypass_actor_check, map["actor"]), + true <- bypass_actor_check || check_actor_is_active(map["actor"]), {_, true} <- {:remote_limit_error, check_remote_limit(map)}, {:ok, map} <- MRF.filter(map), {recipients, _, _} = get_recipients(map),