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

Rename user.settings column

Browse source 
This is used exclusively by MastoFE/GlitchFE now
This commit is contained in:
Mark Felder 2020-06-30 11:50:53 -05:00
commit d69af7f742
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/views/masto_fe_view.ex
View file

@ -86,7 +86,7 @@ defmodule Pleroma.Web.MastoFEView do
"video\/mp4"
]
},
settings: user.settings || @default_settings,
settings: user.mastofe_settings || @default_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),