From 0b72d8ad8c68e1e9db37f102f9bab2e0de951bc0 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Fri, 28 Apr 2023 12:34:14 +0900
Subject: [PATCH] Change rest api severity to severity_ex

---
 app/javascript/mastodon/features/about/index.jsx |  2 +-
 app/serializers/rest/domain_block_serializer.rb  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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 {
                     <div className='about__domain-blocks__domain' key={block.get('domain')}>
                       <div className='about__domain-blocks__domain__header'>
                         <h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6>
-                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity')].title)}</span>
+                        <span className='about__domain-blocks__domain__type' title={intl.formatMessage(severityMessages[block.get('severity')].explanation)}>{intl.formatMessage(severityMessages[block.get('severity_ex') || block.get('severity')].title)}</span>
                       </div>
 
                       <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>
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