diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-16 23:34:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-16 23:34:43 +0000 |
| commit | e4f57f89de0ac947393362b665cb72eb9c0a35b0 (patch) | |
| tree | 50557032f5b1facda1f15528d941a21a4eaddcd6 /lib | |
| parent | 2f639ea1292b1dee01b10fc78bbbe253a4592f2d (diff) | |
| parent | f87b315618cf55f5c0794ab0dfc5523bdce348ef (diff) | |
| download | pleroma-e4f57f89de0ac947393362b665cb72eb9c0a35b0.tar.gz | |
Merge branch 'bugfix/dm-timeline-scope' into 'develop'
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
See merge request pleroma/pleroma!457
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 69e576048..cd0e2121c 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -130,7 +130,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do query = ActivityPub.fetch_activities_query( [user.ap_id], - Map.merge(params, %{"type" => "Create", visibility: "direct"}) + Map.merge(params, %{"type" => "Create", "user" => user, visibility: "direct"}) ) activities = Repo.all(query) |