X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=e6548a8188a535d35cdfc29763bcce96cd63e94b;hb=c12879841836035da0a4dc2117459801f16a27fb;hp=f3e55c79cdd777d5bf2aa3ea5b6d0b1092e5a309;hpb=ca2bd8b72b1c6d83938066520a4f63ba1d814fa4;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index f3e55c79c..e6548a818 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -81,6 +81,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     if is_public?(object), do: User.decrease_note_count(actor), else: {:ok, actor}
   end
 
+  def update_last_status_at_if_public(actor, object) do
+    if is_public?(object), do: User.update_last_status_at(actor), else: {:ok, actor}
+  end
+
   defp increase_replies_count_if_reply(%{
          "object" => %{"inReplyTo" => reply_ap_id} = object,
          "type" => "Create"
@@ -136,6 +140,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
       end)
 
+      # Add local posts to search index
+      if local, do: Pleroma.Search.add_to_index(activity)
+
       {:ok, activity}
     else
       %Activity{} = activity ->
@@ -288,6 +295,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
          _ <- increase_replies_count_if_reply(create_data),
          {:quick_insert, false, activity} <- {:quick_insert, quick_insert?, activity},
          {:ok, _actor} <- increase_note_count_if_public(actor, activity),
+         {:ok, _actor} <- update_last_status_at_if_public(actor, activity),
          _ <- notify_and_stream(activity),
          :ok <- maybe_schedule_poll_notifications(activity),
          :ok <- maybe_federate(activity) do
@@ -494,15 +502,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,63 +1317,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)
-      |> 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)
 
@@ -1382,7 +1324,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       fetch_activities_query_ap_ids_ops(opts)
 
     config = %{
-      skip_thread_containment: true
+      skip_thread_containment: Config.get([:instance, :skip_thread_containment])
     }
 
     query =
@@ -1414,6 +1356,7 @@ 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)