Remove recent activity restriction.
authorlain <lain@soykaf.club>
Wed, 9 Jan 2019 11:38:23 +0000 (12:38 +0100)
committerlain <lain@soykaf.club>
Wed, 9 Jan 2019 11:38:23 +0000 (12:38 +0100)
This should be fine now, everything should be covered by indices.

lib/pleroma/web/activity_pub/activity_pub.ex

index 4685f6d95ad796f6e8cca791c6426361b60b90ee..ea65538b66784c8782a3df9dafa6ac7cae2abd51 100644 (file)
@@ -517,15 +517,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   defp restrict_reblogs(query, _), do: query
 
-  # Only search through last 100_000 activities by default
-  defp restrict_recent(query, %{"whole_db" => true}), do: query
-
-  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 || []
     domain_blocks = info.domain_blocks || []
@@ -570,7 +561,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     |> restrict_actor(opts)
     |> restrict_type(opts)
     |> restrict_favorited_by(opts)
-    |> restrict_recent(opts)
     |> restrict_blocked(opts)
     |> restrict_media(opts)
     |> restrict_visibility(opts)