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
a09ed0f5
Commit
a09ed0f5
authored
Dec 06, 2018
by
Hakaba Hitoyo
Browse files
avoid mix format bug
parent
96ba95df
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
a09ed0f5
...
...
@@ -765,7 +765,7 @@ def fetch_and_contain_remote_object_from_id(id) do
{
:ok
,
%{
body:
body
,
status:
code
}}
when
code
in
200
..
299
<-
@httpoison
.
get
(
id
,
Accept
:
"application/activity+json"
[{
:
Accept
,
"application/activity+json"
}]
),
{
:ok
,
data
}
<-
Jason
.
decode
(
body
),
:ok
<-
Transmogrifier
.
contain_origin_from_id
(
id
,
data
)
do
...
...
lib/pleroma/web/ostatus/ostatus.ex
View file @
a09ed0f5
...
...
@@ -349,7 +349,7 @@ def fetch_activity_from_atom_url(url) do
{
:ok
,
%{
body:
body
,
status:
code
}}
when
code
in
200
..
299
<-
@httpoison
.
get
(
url
,
Accept
:
"application/atom+xml"
[{
:
Accept
,
"application/atom+xml"
}]
)
do
Logger
.
debug
(
"Got document from
#{
url
}
, handling..."
)
handle_incoming
(
body
)
...
...
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