Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
f87b3156
Commit
f87b3156
authored
Nov 16, 2018
by
lain
Browse files
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
parent
2f639ea1
Pipeline
#4507
passed with stages
in 6 minutes and 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
f87b3156
...
...
@@ -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
)
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
f87b3156
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment