projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
102455b
)
Update incoming new avatars.
author
Roger Braun
<roger@rogerbraun.net>
Tue, 2 May 2017 15:16:01 +0000
(17:16 +0200)
committer
Roger Braun
<roger@rogerbraun.net>
Tue, 2 May 2017 15:16:01 +0000
(17:16 +0200)
lib/pleroma/web/ostatus/ostatus.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/ostatus/ostatus.ex
b/lib/pleroma/web/ostatus/ostatus.ex
index 4c72e9cd190eb0c386581975db882bde493d7230..340228dcf31d423dd78c42248e720e64d0e06ff2 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus.ex
+++ b/
lib/pleroma/web/ostatus/ostatus.ex
@@
-42,8
+42,8
@@
defmodule Pleroma.Web.OStatus do
def handle_note(entry, doc \\ nil) do
content_html = string_from_xpath("/entry/content[1]", entry)
def handle_note(entry, doc \\ nil) do
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)
- {:ok, actor} = find_
or_make_user(uri
)
+
[author] = :xmerl_xpath.string('//author[1]'
, doc)
+ {:ok, actor} = find_
make_or_update_user(author
)
context = (string_from_xpath("/entry/ostatus:conversation[1]", entry) || "") |> String.trim
context = if String.length(context) > 0 do
context = (string_from_xpath("/entry/ostatus:conversation[1]", entry) || "") |> String.trim
context = if String.length(context) > 0 do