aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-11-30 17:21:58 +0100
committerlain <lain@soykaf.club>2018-11-30 17:21:58 +0100
commitd088ac628654a189260279a9216ddb22ab7e56c6 (patch)
tree794081752734fda00e9ccb5403cfd66e637eeb46
parent48b95a9b954b6d9e1b6f98097b35fcca4172c8a0 (diff)
downloadpleroma-d088ac628654a189260279a9216ddb22ab7e56c6.tar.gz
Fix OStatus user updates.
Breaks banner updating.
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 1d0019d3b..6a27f1730 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -226,25 +226,21 @@ defmodule Pleroma.Web.OStatus do
old_data = %{
avatar: user.avatar,
bio: user.bio,
- name: user.name,
- info: user.info
+ name: user.name
}
with false <- user.local,
avatar <- make_avatar_object(doc),
bio <- string_from_xpath("//author[1]/summary", doc),
name <- string_from_xpath("//author[1]/poco:displayName", doc),
- info <-
- Map.put(user.info, "banner", make_avatar_object(doc, "header") || user.info["banner"]),
new_data <- %{
avatar: avatar || old_data.avatar,
name: name || old_data.name,
- bio: bio || old_data.bio,
- info: info || old_data.info
+ bio: bio || old_data.bio
},
false <- new_data == old_data do
change = Ecto.Changeset.change(user, new_data)
- Repo.update(change)
+ User.update_and_set_cache(change)
else
_ ->
{:ok, user}