aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-04-25 09:14:35 +0300
committerrinpatch <rinpatch@sdf.org>2019-04-25 10:31:14 +0300
commitdfc8425659620d023540538ec943490cf523f434 (patch)
tree89cfb3199b8ba068cff0f49008bfed11c7340eef /lib
parent4baea6e6d9efa619402a031a84f74787653df2b5 (diff)
downloadpleroma-dfc8425659620d023540538ec943490cf523f434.tar.gz
Move settings to Source subentity
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 6e6f0ba93..779b9a382 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -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