commit: 2597b028f797c74eb16e7cd5bfc251dfe03ad934
parent 085d4e6cfcdecd967cbe6716d06d1ace0108a11a
Author: Mark Felder <feld@feld.me>
Date: Wed, 30 Dec 2020 16:37:04 -0600
Make pagination type conditional
Diffstat:
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git 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