From: Roger Braun Date: Tue, 31 Oct 2017 14:26:37 +0000 (+0100) Subject: Only search through last 100_000 activities for fetches. X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3037814fde83d869f7a71567511a6aa5e0700073;p=akkoma Only search through last 100_000 activities for fetches. This is purely a performance enhancement --- diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index dcd27d04a..71e52cb46 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -155,6 +155,14 @@ 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) - 100_000 + + from activity in query, + where: activity.id > ^since + end + def fetch_activities(recipients, opts \\ %{}) do base_query = from activity in Activity, limit: 20, @@ -169,6 +177,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do |> restrict_actor(opts) |> restrict_type(opts) |> restrict_favorited_by(opts) + |> restrict_recent(opts) |> Repo.all |> Enum.reverse end