X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=0878e773bf9fe796baaebaab5663a2b09e1fd851;hb=0c0ea169d4be469921f8bbb72995f3d5bff87b0d;hp=ba0a7d1435e72cf11f409d58177de9baf2c8d7f4;hpb=bb54720778da713a6cfff0a44e9fb97b2e018c57;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index ba0a7d143..0878e773b 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -494,15 +494,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> maybe_update_cc(list_memberships, opts[:user])
   end
 
-  def fetch_activities_secret(recipients, opts \\ %{}, pagination \\ :keyset) do
-    list_memberships = Pleroma.List.memberships(opts[:user])
-
-    fetch_activities_query_secret(recipients ++ list_memberships, opts)
-    |> fetch_paginated_optimized(opts, pagination)
-    |> Enum.reverse()
-  end
-
-
   @spec fetch_public_or_unlisted_activities(map(), Pagination.type()) :: [Activity.t()]
   def fetch_public_or_unlisted_activities(opts \\ %{}, pagination \\ :keyset) do
     opts = Map.delete(opts, :user)
@@ -1318,64 +1309,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     {restrict_blocked_opts, restrict_muted_opts, restrict_muted_reblogs_opts}
   end
 
-  def fetch_activities_query_secret(recipients, opts \\ %{}) do
-    opts = normalize_fetch_activities_query_opts(opts)
-
-    {restrict_blocked_opts, restrict_muted_opts, restrict_muted_reblogs_opts} =
-      fetch_activities_query_ap_ids_ops(opts)
-
-    config = %{
-      skip_thread_containment: true
-    }
-
-    query =
-      Activity
-      |> maybe_preload_objects(opts)
-      |> maybe_preload_bookmarks(opts)
-      |> maybe_preload_report_notes(opts)
-      |> maybe_set_thread_muted_field(opts)
-      |> maybe_order(opts)
-      |> restrict_recipients(recipients, opts[:user])
-      |> restrict_replies(opts)
-      |> restrict_since(opts)
-      |> restrict_local(opts)
-      |> restrict_remote(opts)
-      |> restrict_actor(opts)
-      |> restrict_type(opts)
-      |> restrict_state(opts)
-      |> restrict_favorited_by(opts)
-      |> restrict_blocked(restrict_blocked_opts)
-      |> restrict_blockers_visibility(opts)
-      |> restrict_muted(restrict_muted_opts)
-      |> restrict_filtered(opts)
-      |> restrict_media(opts)
-      |> restrict_visibility(opts)
-      |> restrict_thread_visibility(opts, config)
-      |> restrict_reblogs(opts)
-      |> restrict_pinned(opts)
-      |> restrict_muted_reblogs(restrict_muted_reblogs_opts)
-      |> 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)
-      |> exclude_visibility(opts)
-
-    if Config.feature_enabled?(:improved_hashtag_timeline) do
-      query
-      |> restrict_hashtag_any(opts)
-      |> restrict_hashtag_all(opts)
-      |> restrict_hashtag_reject_any(opts)
-    else
-      query
-      |> restrict_embedded_tag_any(opts)
-      |> restrict_embedded_tag_all(opts)
-      |> restrict_embedded_tag_reject_any(opts)
-    end
-  end
-
   def fetch_activities_query(recipients, opts \\ %{}) do
     opts = normalize_fetch_activities_query_opts(opts)
 
@@ -1383,7 +1316,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 =