aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-09-05 11:40:34 +0200
committerRoger Braun <roger@rogerbraun.net>2017-09-05 11:40:34 +0200
commite9ebfdb83b91a632e7513360946f54b9d9aa353f (patch)
tree4dafb9af2fda510954d292ff84edd70b70f91347 /lib
parentd1c10ad2fb7641c88eec04e9474af143170c507a (diff)
downloadpleroma-e9ebfdb83b91a632e7513360946f54b9d9aa353f.tar.gz
Fix remote profile update code.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 02a0996b0..3e2acdd0f 100644
--- 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),
- 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)