diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 14:47:48 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 15:02:59 +0200 |
commit | ddd875ad9940c4c7ef53a31af23cd5fe89fcf0c9 (patch) | |
tree | 7926abdec378339ee622a1f09b9a52178f4d0600 /app/serializers/rest/instance_serializer.rb | |
parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder
Diffstat (limited to 'app/serializers/rest/instance_serializer.rb')
-rw-r--r-- | app/serializers/rest/instance_serializer.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 98c53c84a..e913f0c64 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -3,9 +3,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer include RoutingHelper - attributes :uri, :title, :description, :email, + attributes :uri, :title, :short_description, :description, :email, :version, :urls, :stats, :thumbnail, :max_toot_chars, :poll_limits, - :languages, :registrations + :languages, :registrations, :approval_required has_one :contact_account, serializer: REST::AccountSerializer @@ -19,6 +19,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer Setting.site_title end + def short_description + Setting.site_short_description + end + def description Setting.site_description end @@ -68,6 +72,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode end + def approval_required + Setting.registrations_mode == 'approved' + end + private def instance_presenter |