pleroma

commit: fd2f1258fb0249694d1ed7f5ba5a2f4baa858f20
parent: de1da7b3d1c855df87262b8d24d6cdb6a6a518bc
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 14 Jan 2019 18:49:53 +0000

Merge branch 'load-all-dms' into 'develop'

Remove recent activity restriction.

See merge request pleroma/pleroma!644
Diffstat:
M
lib/pleroma/web/activity_pub/activity_pub.ex
10
----------

1 file changed, 0 insertions(+), 10 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -515,15 +515,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 || []
@@ -574,7 +565,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)