diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-20 12:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 12:09:11 +0200 |
| commit | bce46f2057b06e78958a42821f3ce18c945de88d (patch) | |
| tree | d2ac3d5fc7bfcf13f1dc19a91d42feb8c6a945da /app/serializers/initial_state_serializer.rb | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | fae9e34484e7f68b59e7738edfe7344d3790ddfe (diff) | |
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/initial_state_serializer.rb')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index c8f6bec7a..d40fe3380 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -26,6 +26,7 @@ class InitialStateSerializer < ActiveModel::Serializer access_token: object.token, locale: I18n.locale, domain: Rails.configuration.x.local_domain, + title: instance_presenter.site_title, admin: object.admin&.id&.to_s, search_enabled: Chewy.enabled?, repository: Mastodon::Version.repository, @@ -54,6 +55,11 @@ class InitialStateSerializer < ActiveModel::Serializer store[:trends] = Setting.trends && object.current_account.user.setting_trends store[:default_content_type] = object.current_account.user.setting_default_content_type store[:system_emoji_font] = object.current_account.user.setting_system_emoji_font + else + store[:auto_play_gif] = Setting.auto_play_gif + store[:display_media] = Setting.display_media + store[:reduce_motion] = Setting.reduce_motion + store[:use_blurhash] = Setting.use_blurhash end store |