alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change `closed_registrations_message` to `message` and add Markdown (#19486)

rebase/4.0.0rc1
Eugen Rochko 2022-10-27 19:17:48 +02:00 committed by GitHub
parent 371d969403
commit 09f04d710d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/serializers/rest/instance_serializer.rb
View File

@ -83,7 +83,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
{ {
enabled: registrations_enabled?, enabled: registrations_enabled?,
approval_required: Setting.registrations_mode == 'approved', approval_required: Setting.registrations_mode == 'approved',
closed_registrations_message: registrations_enabled? ? nil : Setting.closed_registrations_message, message: registrations_enabled? ? nil : registrations_message,
} }
end end
@ -92,4 +92,16 @@ class REST::InstanceSerializer < ActiveModel::Serializer
def registrations_enabled? def registrations_enabled?
Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
end end
def registrations_message
if Setting.closed_registrations_message.present?
markdown.render(Setting.closed_registrations_message)
else
nil
end
end
def markdown
@markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
end
end end