diff options
| author | lambda <lain@soykaf.club> | 2019-05-16 13:44:22 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-16 13:44:22 +0000 |
| commit | fde30aee43edd50a40dd4bfdc0008f5395dfc751 (patch) | |
| tree | f66947d0d59680dd3166c0bf8ea9ae39775977ef /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 103f205097e73dd5bcc1b302e0d27a180c4b0e15 (diff) | |
| parent | f3971cbde3d69faec973717e1421f4a643ef947e (diff) | |
| download | pleroma-fde30aee43edd50a40dd4bfdc0008f5395dfc751.tar.gz | |
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -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) |