X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=4f7be4293332cb09bc75e86e337fe8a1589e7d62;hb=ed1eb5deea35ff2c3487ef550fad3a543a80cb32;hp=31aa2c4f127798be671ffc9c4ba4ce204c2afdcb;hpb=260f09dd6cc3d1d0b616496bfbc4a758ef84fa39;p=akkoma diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 31aa2c4f1..4f7be4293 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -87,17 +87,17 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do } with Repo.delete(object), Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)), - Repo.delete_all(Activity.all_by_object_ap_id_q(id)), {:ok, activity} <- insert(data, local), :ok <- maybe_federate(activity) do {:ok, activity} end end - def fetch_activities_for_context(context) do + def fetch_activities_for_context(context, opts \\ %{}) do query = from activity in Activity, where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context), order_by: [desc: :id] + query = restrict_blocked(query, opts) Repo.all(query) end @@ -156,6 +156,21 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end defp restrict_favorited_by(query, _), do: query + # Only search through last 100_000 activities by default + defp restrict_recent(query, _) do + since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000 + + from activity in query, + where: activity.id > ^since + end + + defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do + blocks = info["blocks"] || [] + from activity in query, + where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks) + end + defp restrict_blocked(query, _), do: query + def fetch_activities(recipients, opts \\ %{}) do base_query = from activity in Activity, limit: 20, @@ -170,6 +185,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> restrict_actor(opts) |> restrict_type(opts) |> restrict_favorited_by(opts) + |> restrict_recent(opts) + |> restrict_blocked(opts) |> Repo.all |> Enum.reverse end