alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AccountController: Build the correct update activity. 

Will fix federation issues.
This commit is contained in:
lain 2020-08-10 10:33:05 +02:00
parent 0149dd0146
commit 66122a11b5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View File

@ -226,7 +226,7 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
with changeset <- User.update_changeset(user, user_params), with changeset <- User.update_changeset(user, user_params),
{:ok, unpersisted_user} <- Ecto.Changeset.apply_action(changeset, :update), {:ok, unpersisted_user} <- Ecto.Changeset.apply_action(changeset, :update),
updated_object <- updated_object <-
Pleroma.Web.ActivityPub.UserView.render("user.json", user: user) Pleroma.Web.ActivityPub.UserView.render("user.json", user: unpersisted_user)
|> Map.delete("@context"), |> Map.delete("@context"),
{:ok, update_data, []} <- Builder.update(user, updated_object), {:ok, update_data, []} <- Builder.update(user, updated_object),
{:ok, _update, _} <- {:ok, _update, _} <-

4
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
View File

@ -214,6 +214,10 @@ test "updates the user's name", %{conn: conn} do
assert user_data = json_response_and_validate_schema(conn, 200) assert user_data = json_response_and_validate_schema(conn, 200)
assert user_data["display_name"] == "markorepairs" assert user_data["display_name"] == "markorepairs"
update_activity = Repo.one(Pleroma.Activity)
assert update_activity.data["type"] == "Update"
assert update_activity.data["object"]["name"] == "markorepairs"
end end
test "updates the user's avatar", %{user: user, conn: conn} do test "updates the user's avatar", %{user: user, conn: conn} do