diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-06-09 18:06:27 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-09 18:06:27 +0000 |
| commit | 6c90fc8e70760bf8c58bb731ce294e9eee02f430 (patch) | |
| tree | bd9a1f004b07c434c1ae2a6b3701ffad52d6304a /lib/pleroma/web/mastodon_api/controllers | |
| parent | a5ccb5b0b1032b102c54d4df2e17c61423089e73 (diff) | |
| parent | f05f206e13a152ccdae679e84a29633adfbba2b1 (diff) | |
| download | pleroma-2.0.6.tar.gz | |
Merge branch 'release/2.0.6' into 'stable'v2.0.6
Release/2.0.6
See merge request pleroma/pleroma!2632
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() |