diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-05-16 13:11:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-05-16 13:11:17 -0500 |
| commit | ebb04821161e4377f311af7192168e2c01e8c1bb (patch) | |
| tree | 37995ccda7c4351653de56db4593b877a443fde0 /lib/pleroma/web/twitter_api | |
| parent | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (diff) | |
| parent | fde30aee43edd50a40dd4bfdc0008f5395dfc751 (diff) | |
| download | pleroma-ebb04821161e4377f311af7192168e2c01e8c1bb.tar.gz | |
Merge branch 'develop' into conversations-import
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
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) |