remove deactivated_users call

[akkoma] / lib / pleroma / web / activity_pub / activity_pub.ex

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index ba0a7d1435e72cf11f409d58177de9baf2c8d7f4..f3e55c79cdd777d5bf2aa3ea5b6d0b1092e5a309 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1357,7 +1357,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       |> restrict_instance(opts)
       |> restrict_announce_object_actor(opts)
       |> restrict_filtered(opts)
-      |> Activity.restrict_deactivated_users()
       |> exclude_poll_votes(opts)
       |> exclude_chat_messages(opts)
       |> exclude_invisible_actors(opts)
@@ -1383,7 +1382,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       fetch_activities_query_ap_ids_ops(opts)
 
     config = %{
-      skip_thread_containment: Config.get([:instance, :skip_thread_containment])
+      skip_thread_containment: true
     }
 
     query =
@@ -1415,7 +1414,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       |> restrict_instance(opts)
       |> restrict_announce_object_actor(opts)
       |> restrict_filtered(opts)
-      |> Activity.restrict_deactivated_users()
       |> exclude_poll_votes(opts)
       |> exclude_chat_messages(opts)
       |> exclude_invisible_actors(opts)