diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-26 06:45:38 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-26 06:45:38 +0000 |
| commit | 44762daf5193fd8c4919ebb00214316dfd9d6f5c (patch) | |
| tree | ba03da29d6805b09b328c5030a2942728455b635 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | 9b39670683af82e120689753e20c5fb39ed51ba0 (diff) | |
| parent | 2ac13061afe4c360bb98ba8f05bc540b2cf27e74 (diff) | |
| download | pleroma-44762daf5193fd8c4919ebb00214316dfd9d6f5c.tar.gz | |
Merge branch 'feature/broken-thread-filtering' into 'develop'
broken thread filtering, part 1
See merge request pleroma/pleroma!394
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 751698ca8..bc7558cb8 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -223,6 +223,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do activities = ActivityPub.fetch_activities([user.ap_id | user.following], params) + |> ActivityPub.contain_timeline(user) |> Enum.reverse() conn |