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
d009a79d
Commit
d009a79d
authored
Sep 17, 2017
by
lain
Browse files
TwitterAPI: Return proper error.
Fixes
#32
.
parent
ae38b72e
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
d009a79d
...
...
@@ -211,6 +211,11 @@ def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" =>
response
<-
Poison
.
encode!
(
user_map
)
do
conn
|>
json_reply
(
200
,
response
)
else
_e
->
conn
|>
put_status
(
404
)
|>
json
(%{
error:
"Can't find user"
})
end
end
...
...
lib/pleroma/web/web_finger/web_finger.ex
View file @
d009a79d
...
...
@@ -105,13 +105,10 @@ def finger(account) do
URI
.
parse
(
account
)
.
host
end
{
:ok
,
template
}
=
find_lrdd_template
(
domain
)
address
=
String
.
replace
(
template
,
"{uri}"
,
URI
.
encode
(
account
))
response
=
@httpoison
.
get
(
address
,
[
"Accept"
:
"application/xrd+xml"
])
with
{
:ok
,
%{
status_code:
status_code
,
body:
body
}}
when
status_code
in
200
..
299
<-
response
,
with
{
:ok
,
template
}
<-
find_lrdd_template
(
domain
),
address
<-
String
.
replace
(
template
,
"{uri}"
,
URI
.
encode
(
account
)),
response
<-
@httpoison
.
get
(
address
,
[
"Accept"
:
"application/xrd+xml"
]),
{
:ok
,
%{
status_code:
status_code
,
body:
body
}}
when
status_code
in
200
..
299
<-
response
,
doc
when
doc
!=
:error
<-
XML
.
parse_document
(
body
),
{
:ok
,
data
}
<-
webfinger_from_xml
(
doc
)
do
{
:ok
,
data
}
...
...
Write
Preview
Markdown
is supported
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