mirror of
https://github.com/mastodon/mastodon.git
synced 2025-05-07 20:26:15 +00:00
Merge 290f6d428d
into 8b34daf254
This commit is contained in:
commit
acaac11c77
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Api::V2::InstancesController < Api::BaseController
|
class Api::V2::InstancesController < Api::BaseController
|
||||||
skip_before_action :require_authenticated_user!, unless: :limited_federation_mode?
|
skip_before_action :require_authenticated_user!
|
||||||
skip_around_action :set_locale
|
skip_around_action :set_locale
|
||||||
|
|
||||||
vary_by ''
|
vary_by ''
|
||||||
|
|
|
@ -49,7 +49,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
||||||
def usage
|
def usage
|
||||||
{
|
{
|
||||||
users: {
|
users: {
|
||||||
active_month: object.active_user_count(4),
|
active_month: limited_federation? ? 0 : object.active_user_count(4),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -99,6 +99,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
||||||
translation: {
|
translation: {
|
||||||
enabled: TranslationService.configured?,
|
enabled: TranslationService.configured?,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
closed_federation: limited_federation?,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -127,6 +129,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
|
||||||
markdown.render(Setting.closed_registrations_message) if Setting.closed_registrations_message.present?
|
markdown.render(Setting.closed_registrations_message) if Setting.closed_registrations_message.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def limited_federation?
|
||||||
|
Rails.configuration.x.limited_federation_mode
|
||||||
|
end
|
||||||
|
|
||||||
def markdown
|
def markdown
|
||||||
@markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
|
@markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user