diff options
author | eugenijm <eugenijm@protonmail.com> | 2019-03-04 02:59:54 +0300 |
---|---|---|
committer | eugenijm <eugenijm@protonmail.com> | 2019-03-04 06:24:27 +0300 |
commit | 86e4b48a5e053f7fc949c682c1d5c0c820b0dd58 (patch) | |
tree | ab42797e8d6e6907c655e7cad8e6fad09d0c503e /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | dd5865535eb16f535ff996eb3dec5e947a905268 (diff) | |
download | pleroma-86e4b48a5e053f7fc949c682c1d5c0c820b0dd58.tar.gz |
Fix DM visibility for blocking users
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index de7b9f24c..5e4ebb8e8 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -177,13 +177,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def dm_timeline(%{assigns: %{user: user}} = conn, params) do - query = - ActivityPub.fetch_activities_query( - [user.ap_id], - Map.merge(params, %{"type" => "Create", "user" => user, visibility: "direct"}) - ) + params = + params + |> Map.put("type", "Create") + |> Map.put("blocking_user", user) + |> Map.put("user", user) + |> Map.put(:visibility, "direct") - activities = Repo.all(query) + activities = + ActivityPub.fetch_activities_query([user.ap_id], params) + |> Repo.all() conn |> put_view(ActivityView) |