diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx index 55af53f118..47d88fcf6c 100644 --- a/app/javascript/mastodon/features/about/index.jsx +++ b/app/javascript/mastodon/features/about/index.jsx @@ -193,7 +193,7 @@ class About extends React.PureComponent {
{block.get('domain')}
- {intl.formatMessage(severityMessages[block.get('severity')].title)} + {intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}

{(block.get('comment') || '').length > 0 ? block.get('comment') : }

diff --git a/app/serializers/rest/domain_block_serializer.rb b/app/serializers/rest/domain_block_serializer.rb index 678463e13b..ad352db619 100644 --- a/app/serializers/rest/domain_block_serializer.rb +++ b/app/serializers/rest/domain_block_serializer.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class REST::DomainBlockSerializer < ActiveModel::Serializer - attributes :domain, :digest, :severity, :comment + attributes :domain, :digest, :severity, :severity_ex, :comment def domain object.public_domain @@ -11,6 +11,14 @@ class REST::DomainBlockSerializer < ActiveModel::Serializer object.domain_digest end + def severity + object.severity == 'noop' ? 'silence' : object.severity + end + + def severity_ex + object.severity + end + def comment object.public_comment if instance_options[:with_comment] end