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
96014f8e
Commit
96014f8e
authored
May 02, 2017
by
lain
Browse files
Update incoming new avatars.
parent
102455bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/ostatus/ostatus.ex
View file @
96014f8e
...
@@ -42,8 +42,8 @@ def handle_incoming(xml_string) do
...
@@ -42,8 +42,8 @@ def handle_incoming(xml_string) do
def
handle_note
(
entry
,
doc
\\
nil
)
do
def
handle_note
(
entry
,
doc
\\
nil
)
do
content_html
=
string_from_xpath
(
"/entry/content[1]"
,
entry
)
content_html
=
string_from_xpath
(
"/entry/content[1]"
,
entry
)
uri
=
string_from_xpath
(
"/entry/author/uri[1]"
,
entry
)
||
string_from_xpath
(
"/feed
/author
/uri
[1]
"
,
doc
)
[
author
]
=
:xmerl_xpath
.
string
(
'/
/author[1]
'
,
doc
)
{
:ok
,
actor
}
=
find_
or_
make_user
(
uri
)
{
:ok
,
actor
}
=
find_mak
e_or_updat
e_user
(
author
)
context
=
(
string_from_xpath
(
"/entry/ostatus:conversation[1]"
,
entry
)
||
""
)
|>
String
.
trim
context
=
(
string_from_xpath
(
"/entry/ostatus:conversation[1]"
,
entry
)
||
""
)
|>
String
.
trim
context
=
if
String
.
length
(
context
)
>
0
do
context
=
if
String
.
length
(
context
)
>
0
do
...
...
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