diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
| commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
| tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /app/serializers | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) | |
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index e22059182..c8da6e725 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -34,6 +34,7 @@ class InitialStateSerializer < ActiveModel::Serializer invites_enabled: Setting.min_invite_role == 'user', mascot: instance_presenter.mascot&.file&.url, profile_directory: Setting.profile_directory, + trends: Setting.trends, } if object.current_account @@ -50,6 +51,7 @@ class InitialStateSerializer < ActiveModel::Serializer store[:use_blurhash] = object.current_account.user.setting_use_blurhash store[:use_pending_items] = object.current_account.user.setting_use_pending_items store[:is_staff] = object.current_account.user.staff? + store[:trends] = Setting.trends && object.current_account.user.setting_trends store[:default_content_type] = object.current_account.user.setting_default_content_type end |