diff options
author | lain <lain@soykaf.club> | 2020-07-28 07:41:44 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-28 07:41:44 +0000 |
commit | e5ac9534aa48abb3bc8abe5dda96c1969c8901e8 (patch) | |
tree | 524b20b4e31922bffaa8c294d03befceeae0e34b | |
parent | 057936bf0b5af2cc35a6ecb1c800a841ca4760a8 (diff) | |
parent | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (diff) | |
download | pleroma-e5ac9534aa48abb3bc8abe5dda96c1969c8901e8.tar.gz |
Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
masto_fe_view: Remove @default_settings
See merge request pleroma/pleroma!2799
-rw-r--r-- | lib/pleroma/web/views/masto_fe_view.ex | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/lib/pleroma/web/views/masto_fe_view.ex b/lib/pleroma/web/views/masto_fe_view.ex index f739dacb6..b1669d198 100644 --- a/lib/pleroma/web/views/masto_fe_view.ex +++ b/lib/pleroma/web/views/masto_fe_view.ex @@ -9,36 +9,6 @@ defmodule Pleroma.Web.MastoFEView do alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.CustomEmojiView - @default_settings %{ - onboarded: true, - home: %{ - shows: %{ - reblog: true, - reply: true - } - }, - notifications: %{ - alerts: %{ - follow: true, - favourite: true, - reblog: true, - mention: true - }, - shows: %{ - follow: true, - favourite: true, - reblog: true, - mention: true - }, - sounds: %{ - follow: true, - favourite: true, - reblog: true, - mention: true - } - } - } - def initial_state(token, user, custom_emojis) do limit = Config.get([:instance, :limit]) @@ -86,7 +56,7 @@ defmodule Pleroma.Web.MastoFEView do "video\/mp4" ] }, - settings: user.mastofe_settings || @default_settings, + settings: user.mastofe_settings || %{}, push_subscription: nil, accounts: %{user.id => render(AccountView, "show.json", user: user, for: user)}, custom_emojis: render(CustomEmojiView, "index.json", custom_emojis: custom_emojis), |