From: Mark Felder <feld@feld.me>
Date: Wed, 30 Dec 2020 22:37:04 +0000 (-0600)
Subject: Make pagination type conditional
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2597b028f797c74eb16e7cd5bfc251dfe03ad934;hp=-c;p=akkoma

Make pagination type conditional
---

2597b028f797c74eb16e7cd5bfc251dfe03ad934
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index f82f34de5..68494f047 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -603,12 +603,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         |> Map.put(:muting_user, reading_user)
       end
 
+    pagination_type =
+      cond do
+        is_nil(params[:offset]) -> :keyset
+        true -> :offset
+      end
+
     %{
       godmode: params[:godmode],
       reading_user: reading_user
     }
     |> user_activities_recipients()
-    |> fetch_activities(params, :offset)
+    |> fetch_activities(params, pagination_type)
     |> Enum.reverse()
   end