remote user deactivation: fix test failures

2018-05-18 22:17:56 -05:00 · 2018-05-18 22:17:56 -05:00 · 13d4b6d2b5
commit 13d4b6d2b5
parent a6a6915aaf
1 changed files with 7 additions and 4 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -17,10 +17,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
  end

  defp check_actor_is_active(actor) do
-    user = User.get_cached_by_ap_id(actor)
-
-    if user.info["deactivated"] == true do
-      :reject
+    if not is_nil(actor) do
+      with user <- User.get_cached_by_ap_id(actor),
+           nil <- user.info["deactivated"] do
+        :ok
+      else
+        _e -> :reject
+      end
    else
      :ok
    end