aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-10-26 06:16:51 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-10-26 06:16:51 +0000
commit26eb11c172e2de2db0f4c51a9df5f0369fb37a95 (patch)
tree01192a18ee156c85a17729496985c830c1678bfd /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
parentae7c79cfc236f7192ea8425560cc31a60e689e9d (diff)
downloadpleroma-26eb11c172e2de2db0f4c51a9df5f0369fb37a95.tar.gz
activitypub: add support for filtering broken threads out of timelines
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex1
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