projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
admin_api_controller.ex
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 9086c49286d8e24878bc5b7fa51c389e178e4552..6ef8d6061a8151c3191c6fdf82756e07d3d122c3 100644
(file)
--- 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,