Commit e4f57f89 authored by kaniini's avatar kaniini
Browse files

Merge branch 'bugfix/dm-timeline-scope' into 'develop'

TwitterAPI: Fix dm_timeline displaying only half of the conversation.

See merge request pleroma/pleroma!457
parents 2f639ea1 f87b3156
Pipeline #4508 failed with stages
in 6 minutes and 41 seconds
......@@ -130,7 +130,7 @@ def dm_timeline(%{assigns: %{user: user}} = conn, params) 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)
......
......@@ -284,6 +284,12 @@ test "it show direct messages", %{conn: conn} do
"visibility" => "direct"
})
{:ok, direct_two} =
CommonAPI.post(user_two, %{
"status" => "Hi @#{user_one.nickname}!",
"visibility" => "direct"
})
{:ok, _follower_only} =
CommonAPI.post(user_one, %{
"status" => "Hi @#{user_two.nickname}!",
......@@ -296,8 +302,9 @@ test "it show direct messages", %{conn: conn} do
|> assign(:user, user_two)
|> get("/api/statuses/dm_timeline.json")
[status] = json_response(res_conn, 200)
assert status["id"] == direct.id
[status, status_two] = json_response(res_conn, 200)
assert status["id"] == direct_two.id
assert status_two["id"] == direct.id
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment