projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d1c10ad
)
Fix remote profile update code.
author
Roger Braun
<roger@rogerbraun.net>
Tue, 5 Sep 2017 09:40:34 +0000
(11:40 +0200)
committer
Roger Braun
<roger@rogerbraun.net>
Tue, 5 Sep 2017 09:40:34 +0000
(11:40 +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 02a0996b0c80f6fe4bb143267af30bedb4b9a028..3e2acdd0facba28119100c3a043c05709f33124b 100644
(file)
--- a/
lib/pleroma/web/ostatus/ostatus.ex
+++ b/
lib/pleroma/web/ostatus/ostatus.ex
@@
-177,8
+177,8
@@
defmodule Pleroma.Web.OStatus do
with false <- user.local,
avatar <- make_avatar_object(doc),
bio <- string_from_xpath("//author[1]/summary", doc),
with false <- user.local,
avatar <- make_avatar_object(doc),
bio <- string_from_xpath("//author[1]/summary", doc),
- name
when not is_nil(name)
<- string_from_xpath("//author[1]/poco:displayName", doc),
- new_data <- %{avatar: avatar
, name: name, bio:
bio},
+ name <- string_from_xpath("//author[1]/poco:displayName", doc),
+ new_data <- %{avatar: avatar
|| old_data.avatar, name: name || old_data.name, bio: bio || old_data.
bio},
false <- new_data == old_data do
change = Ecto.Changeset.change(user, new_data)
Repo.update(change)
false <- new_data == old_data do
change = Ecto.Changeset.change(user, new_data)
Repo.update(change)