post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Change rest api severity to severity_ex

Browse source
This commit is contained in:
KMY 2023-04-28 12:34:14 +09:00
parent 00b51cc4e2
commit 0b72d8ad8c
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/about/index.jsx
View file

@ -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' key={block.get('domain')}>
<div className='about__domain-blocks__domain__header'> <div className='about__domain-blocks__domain__header'>
<h6><span title={`SHA-256: ${block.get('digest')}`}>{block.get('domain')}</span></h6> <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> </div>
<p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p> <p>{(block.get('comment') || '').length > 0 ? block.get('comment') : <FormattedMessage id='about.domain_blocks.no_reason_available' defaultMessage='Reason not available' />}</p>

10
app/serializers/rest/domain_block_serializer.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class REST::DomainBlockSerializer < ActiveModel::Serializer class REST::DomainBlockSerializer < ActiveModel::Serializer
attributes :domain, :digest, :severity, :comment attributes :domain, :digest, :severity, :severity_ex, :comment
def domain def domain
object.public_domain object.public_domain
@ -11,6 +11,14 @@ class REST::DomainBlockSerializer < ActiveModel::Serializer
object.domain_digest object.domain_digest
end end
def severity
object.severity == 'noop' ? 'silence' : object.severity
end
def severity_ex
object.severity
end
def comment def comment
object.public_comment if instance_options[:with_comment] object.public_comment if instance_options[:with_comment]
end end