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

Move settings to Source subentity

Browse source
This commit is contained in:
rinpatch 2019-04-25 09:14:35 +03:00
commit dfc8425659
5 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -113,7 +113,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
bot: bot,
source: %{
note: "",
sensitive: false
sensitive: false,
pleroma: %{}
},
# Pleroma extension
@ -145,8 +146,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
) do
data
|> Kernel.put_in([:source, :privacy], user_info.default_scope)
|> Kernel.put_in([:pleroma, :show_role], user.info.show_role)
|> Kernel.put_in([:pleroma, :no_rich_text], user.info.no_rich_text)
|> Kernel.put_in([:source, :pleroma, :show_role], user.info.show_role)
|> Kernel.put_in([:source, :pleroma, :no_rich_text], user.info.no_rich_text)
end
defp maybe_put_settings(data, _, _, _), do: data