alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update incoming new avatars.

This commit is contained in:
Roger Braun 2017-05-02 17:16:01 +02:00
parent 102455bf29
commit 96014f8e0b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -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_make_or_update_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