diff options
| author | lain <lain@soykaf.club> | 2018-05-20 16:15:18 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-20 16:15:18 +0200 |
| commit | 434601a5c367bb2d41115e3060f5d5b70572da39 (patch) | |
| tree | 7b8b2dd2c1ddfddf9250ad74c038fcc2b6be4b35 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | bdfe0991d25cc38080d513835b9b16f785856e9a (diff) | |
| download | pleroma-434601a5c367bb2d41115e3060f5d5b70572da39.tar.gz | |
Return private / direct posts on user timelines, too.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index a99487738..dd1dc241d 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -96,13 +96,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def user_timeline(%{assigns: %{user: user}} = conn, params) do case TwitterAPI.get_user(user, params) do {:ok, target_user} -> - params = - params - |> Map.put("type", ["Create", "Announce"]) - |> Map.put("actor_id", target_user.ap_id) - |> Map.put("whole_db", true) - - activities = ActivityPub.fetch_public_activities(params) + activities = ActivityPub.fetch_user_activities(target_user, user, params) conn |> render(ActivityView, "index.json", %{activities: activities, for: user}) |