diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-11 18:12:42 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-11 18:12:42 +0200 |
commit | 45fce0e496727cd1579c630c22592638341f78c6 (patch) | |
tree | ff72ae5b3482e4df7885e1e5a38c982529fd11c4 /app/serializers/initial_state_serializer.rb | |
parent | 34142ab29c33104793afe3199f102d84b83b9b57 (diff) | |
parent | 352bae8c3ef2aca41de4aacb85d5e036a1d2bace (diff) |
Merge branch 'master' into glitch-soc/merge
Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
Diffstat (limited to 'app/serializers/initial_state_serializer.rb')
-rw-r--r-- | app/serializers/initial_state_serializer.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 1d17e2b0a..eefd853ff 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -2,19 +2,15 @@ class InitialStateSerializer < ActiveModel::Serializer attributes :meta, :compose, :accounts, - :media_attachments, :settings, :push_subscription, + :media_attachments, :settings :max_toot_chars - has_many :custom_emojis, serializer: REST::CustomEmojiSerializer + has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer def max_toot_chars StatusLengthValidator::MAX_CHARS end - def custom_emojis - CustomEmoji.local.where(disabled: false) - end - def meta store = { streaming_api_base_url: Rails.configuration.x.streaming_api_base_url, |