Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

lib/pleroma/activity.ex

@@ -362,8 +362,7 @@ defmodule Pleroma.Activity do
   end
 
   def restrict_deactivated_users(query) do
-    deactivated_users_query =
+    deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
-      from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
 
     from(activity in query, where: activity.actor not in subquery(deactivated_users_query))
   end

test/pleroma/web/activity_pub/activity_pub_test.exs

@@ -776,6 +776,20 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
     assert Enum.member?(activities, activity_one)
   end
 
+  test "doesn't return activities from deactivated users" do
+    _user = insert(:user)
+    deactivated = insert(:user)
+    active = insert(:user)
+    {:ok, activity_one} = CommonAPI.post(deactivated, %{status: "hey!"})
+    {:ok, activity_two} = CommonAPI.post(active, %{status: "yay!"})
+    {:ok, _updated_user} = User.set_activation(deactivated, false)
+
+    activities = ActivityPub.fetch_activities([], %{})
+
+    refute Enum.member?(activities, activity_one)
+    assert Enum.member?(activities, activity_two)
+  end
+
   test "always see your own posts even when they address people you block" do
     user = insert(:user)
     blockee = insert(:user)