Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

This commit is contained in:
KMY 2025-05-13 07:37:34 +09:00
commit 04070aa608
50 changed files with 2139 additions and 2333 deletions

View file

@ -51,7 +51,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
def usage
{
users: {
active_month: object.active_user_count(4),
active_month: limited_federation? ? 0 : object.active_user_count(4),
},
}
end
@ -123,6 +123,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
search: {
enabled: Chewy.enabled?,
},
limited_federation: limited_federation?,
}
end
@ -152,6 +154,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
markdown.render(Setting.closed_registrations_message) if Setting.closed_registrations_message.present?
end
def limited_federation?
Rails.configuration.x.limited_federation_mode
end
def markdown
@markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
end