aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-25 00:10:20 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-05-15 15:53:06 +0000
commitde114ffbb0f92d24fd370adaaf43ff301ab04b4b (patch)
tree7fc9a0bd61cf3206dab6eb5485f215a27ebe68b2 /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parent0387f5213805cdc4e0bf86f98797cefcd03ba61d (diff)
downloadpleroma-de114ffbb0f92d24fd370adaaf43ff301ab04b4b.tar.gz
activitypub: remove contain_timeline()
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 3c5a70be9..31e86685a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -101,9 +101,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> Map.put("blocking_user", user)
|> Map.put("user", user)
- activities =
- ActivityPub.fetch_activities([user.ap_id | user.following], params)
- |> ActivityPub.contain_timeline(user)
+ activities = ActivityPub.fetch_activities([user.ap_id | user.following], params)
conn
|> put_view(ActivityView)