aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-08-10 09:04:16 +0000
committerrinpatch <rinpatch@sdf.org>2020-08-10 09:04:16 +0000
commit21dfcafeb1ecca43e9ba61a4fc11dca67b723d4e (patch)
treebdf5fb16cf34b7fa4f180c1efdef0524c30be11e /lib
parent0149dd01469b7c52f4abe173157b8b5cc4442ff6 (diff)
parent66122a11b59a3859f3eb67066148e9c75139d3ee (diff)
downloadpleroma-21dfcafeb1ecca43e9ba61a4fc11dca67b723d4e.tar.gz
Merge branch '2038-old-update-info' into 'develop'
AccountController: Build the correct update activity. Closes #2038 See merge request pleroma/pleroma!2867
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index f45678184..95d8452df 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -226,7 +226,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
with changeset <- User.update_changeset(user, user_params),
{:ok, unpersisted_user} <- Ecto.Changeset.apply_action(changeset, :update),
updated_object <-
- Pleroma.Web.ActivityPub.UserView.render("user.json", user: user)
+ Pleroma.Web.ActivityPub.UserView.render("user.json", user: unpersisted_user)
|> Map.delete("@context"),
{:ok, update_data, []} <- Builder.update(user, updated_object),
{:ok, _update, _} <-