summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2020-12-30 16:10:10 -0600
committerMark Felder <feld@feld.me>2020-12-30 16:10:10 -0600
commit085d4e6cfcdecd967cbe6716d06d1ace0108a11a (patch)
treeb251522059f9c64e788c18778a488f9782857710
parent4c5f75f4e96b8ee8ab1e37b03d46f4e7ead870ac (diff)
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex2
-rw-r--r--lib/pleroma/web/admin_api/controllers/admin_api_controller.ex2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 5059bff03..f82f34de5 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -608,7 +608,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
reading_user: reading_user
}
|> user_activities_recipients()
- |> fetch_activities(params)
+ |> fetch_activities(params, :offset)
|> Enum.reverse()
end
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 9086c4928..6ef8d6061 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -106,7 +106,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
{page, page_size} = page_params(params)
activities =
- ActivityPub.fetch_statuses(user, %{
+ ActivityPub.fetch_user_activities(user, nil, %{
limit: page_size,
offset: (page - 1) * page_size,
godmode: godmode,