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

Move single used schemas to operation schema

Browse source
This commit is contained in:
Egor Kislitsyn 2020-04-27 22:55:05 +04:00
commit dda65f7799
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
21 changed files with 402 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -104,8 +104,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
:fullname
])
|> Map.put(:nickname, params.username)
|> Map.put(:fullname, params.fullname || params.username)
|> Map.put(:bio, params.bio || "")
|> Map.put(:fullname, Map.get(params, :fullname, params.username))
|> Map.put(:confirm, params.password)
|> Map.put(:trusted_app, app.trusted)
@ -158,7 +157,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
params =
params
|> Map.from_struct()
|> Enum.filter(fn {_, value} -> not is_nil(value) end)
|> Enum.into(%{})
@ -217,11 +215,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
Enum.map(fields, fn {_, v} -> v end)
else
Enum.map(fields, fn
%Pleroma.Web.ApiSpec.Schemas.AccountAttributeField{} = field ->
%{"name" => field.name, "value" => field.value}
field ->
field
%{} = field -> %{"name" => field.name, "value" => field.value}
field -> field
end)
end
end