Skip to content
GitLab
Menu
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
935e544e
Commit
935e544e
authored
May 31, 2018
by
eal
Browse files
TwitterAPI: fix "Follows you" being shown for the wrong user.
parent
196d36a7
Pipeline
#2166
passed with stages
in 5 minutes and 11 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
935e544e
...
...
@@ -309,18 +309,18 @@ def update_most_recent_notification(%{assigns: %{user: user}} = conn, %{"id" =>
end
def
followers
(
conn
,
params
)
do
with
{
:ok
,
user
}
<-
TwitterAPI
.
get_user
(
conn
.
assigns
.
user
,
params
),
with
{
:ok
,
user
}
<-
TwitterAPI
.
get_user
(
conn
.
assigns
[
:
user
]
,
params
),
{
:ok
,
followers
}
<-
User
.
get_followers
(
user
)
do
render
(
conn
,
UserView
,
"index.json"
,
%{
users:
followers
,
for:
user
})
render
(
conn
,
UserView
,
"index.json"
,
%{
users:
followers
,
for:
conn
.
assigns
[
:
user
]
})
else
_e
->
bad_request_reply
(
conn
,
"Can't get followers"
)
end
end
def
friends
(
conn
,
params
)
do
with
{
:ok
,
user
}
<-
TwitterAPI
.
get_user
(
conn
.
assigns
.
user
,
params
),
with
{
:ok
,
user
}
<-
TwitterAPI
.
get_user
(
conn
.
assigns
[
:
user
]
,
params
),
{
:ok
,
friends
}
<-
User
.
get_friends
(
user
)
do
render
(
conn
,
UserView
,
"index.json"
,
%{
users:
friends
,
for:
user
})
render
(
conn
,
UserView
,
"index.json"
,
%{
users:
friends
,
for:
conn
.
assigns
[
:
user
]
})
else
_e
->
bad_request_reply
(
conn
,
"Can't get friends"
)
end
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
935e544e
...
...
@@ -668,6 +668,7 @@ test "it returns a given user's friends with user_id", %{conn: conn} do
conn
=
conn
|>
assign
(
:user
,
user
)
|>
get
(
"/api/statuses/friends"
,
%{
"user_id"
=>
user
.
id
})
assert
MapSet
.
equal?
(
...
...
@@ -689,6 +690,7 @@ test "it returns a given user's friends with screen_name", %{conn: conn} do
conn
=
conn
|>
assign
(
:user
,
user
)
|>
get
(
"/api/statuses/friends"
,
%{
"screen_name"
=>
user
.
nickname
})
assert
MapSet
.
equal?
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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