OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Return domain block digests from admin domain blocks API (#29092)

pull/29062/head
Emelia Smith 2024-02-06 13:38:14 +01:00 committed by GitHub
parent dedefdc303
commit 4fb7f611de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/serializers/rest/admin/domain_block_serializer.rb
View File

@ -1,11 +1,15 @@
# frozen_string_literal: true # frozen_string_literal: true
class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
attributes :id, :domain, :created_at, :severity, attributes :id, :domain, :digest, :created_at, :severity,
:reject_media, :reject_reports, :reject_media, :reject_reports,
:private_comment, :public_comment, :obfuscate :private_comment, :public_comment, :obfuscate
def id def id
object.id.to_s object.id.to_s
end end
def digest
object.domain_digest
end
end end

3
spec/requests/api/v1/admin/domain_blocks_spec.rb
View File

@ -49,6 +49,7 @@ RSpec.describe 'Domain Blocks' do
{ {
id: domain_block.id.to_s, id: domain_block.id.to_s,
domain: domain_block.domain, domain: domain_block.domain,
digest: domain_block.domain_digest,
created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'), created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
severity: domain_block.severity.to_s, severity: domain_block.severity.to_s,
reject_media: domain_block.reject_media, reject_media: domain_block.reject_media,
@ -97,6 +98,7 @@ RSpec.describe 'Domain Blocks' do
{ {
id: domain_block.id.to_s, id: domain_block.id.to_s,
domain: domain_block.domain, domain: domain_block.domain,
digest: domain_block.domain_digest,
created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'), created_at: domain_block.created_at.strftime('%Y-%m-%dT%H:%M:%S.%LZ'),
severity: domain_block.severity.to_s, severity: domain_block.severity.to_s,
reject_media: domain_block.reject_media, reject_media: domain_block.reject_media,
@ -188,6 +190,7 @@ RSpec.describe 'Domain Blocks' do
{ {
id: domain_block.id.to_s, id: domain_block.id.to_s,
domain: domain_block.domain, domain: domain_block.domain,
digest: domain_block.domain_digest,
severity: 'suspend', severity: 'suspend',
} }
) )