diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-05 14:52:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-08 00:58:31 +0300 |
| commit | 9396b2f8cf0fa26f6fb5e372112b394b74ae8a4e (patch) | |
| tree | 2a6f7a4d20811bb1a17afba56a40d4dba7885bb1 /lib/pleroma/web/mastodon_api/controllers | |
| parent | 0186f56d932a441f106e35c86bfefe57c9ead64d (diff) | |
| download | pleroma-9396b2f8cf0fa26f6fb5e372112b394b74ae8a4e.tar.gz | |
Merge branch 'features/apc2s-pagination' into 'develop'
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index 09e08271b..c3cebd71e 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -40,10 +40,8 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do |> Map.put("muting_user", user) |> Map.put("user", user) - recipients = [user.ap_id | User.following(user)] - activities = - recipients + [user.ap_id | User.following(user)] |> ActivityPub.fetch_activities(params) |> Enum.reverse() |