hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/mastodon-api-settings' into 'develop'

Browse source 
Fix put_settings and remove info_changeset

See merge request pleroma/pleroma!507
This commit is contained in:
kaniini 2018-12-06 16:01:58 +00:00
commit 1d531fd2f3
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -979,9 +979,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
with new_info <- Map.put(user.info, "settings", settings),
change <- User.info_changeset(user, %{info: new_info}),
{:ok, _user} <- User.update_and_set_cache(change) do
info_cng = User.Info.mastodon_settings_update(user.info, settings)
with changeset <- User.update_changeset(user),
changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng),
{:ok, user} <- User.update_and_set_cache(changeset) do
conn
|> json(%{})
else