techhub/mastodon
2
0
Fork 0
Code Activity

Add specs for Instance model scopes and add with_domain_follows scope (#28767)

Browse Source
This commit is contained in:
Matt Jankowski
2024-01-25 10:28:27 -05:00
committed by GitHub
parent 4cdf62e576
commit 42ab855b23
3 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/export_domain_blocks_controller.rb
View File

@@ -49,7 +49,7 @@ module Admin
next
end
@warning_domains = Instance.where(domain: @domain_blocks.map(&:domain)).where('EXISTS (SELECT 1 FROM follows JOIN accounts ON follows.account_id = accounts.id OR follows.target_account_id = accounts.id WHERE accounts.domain = instances.domain)').pluck(:domain)
@warning_domains = instances_from_imported_blocks.pluck(:domain)
rescue ActionController::ParameterMissing
flash.now[:alert] = I18n.t('admin.export_domain_blocks.no_file')
set_dummy_import!
@@ -58,6 +58,10 @@ module Admin
private
def instances_from_imported_blocks
Instance.with_domain_follows(@domain_blocks.map(&:domain))
end
def export_filename
'domain_blocks.csv'
end