projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'list-users' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub_controller.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 56862331851e92fd1d7cd5e5da80779e76c1334a..b2cd965fe0db08bc7cf183928a251ace949df6d9 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@
-319,12
+319,12
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
when page? in [true, "true"] do
activities =
if params["max_id"] do
when page? in [true, "true"] do
activities =
if params["max_id"] do
- ActivityPub.fetch_activities([user.ap_id |
user.following
], %{
+ ActivityPub.fetch_activities([user.ap_id |
User.following(user)
], %{
"max_id" => params["max_id"],
"limit" => 10
})
else
"max_id" => params["max_id"],
"limit" => 10
})
else
- ActivityPub.fetch_activities([user.ap_id |
user.following
], %{"limit" => 10})
+ ActivityPub.fetch_activities([user.ap_id |
User.following(user)
], %{"limit" => 10})
end
conn
end
conn