gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Merge"

Browse source 
This reverts commit 84eae6fac9.
This commit is contained in:
KMY（雪あすか） 2023-10-18 11:10:21 +09:00
parent 84eae6fac9
commit 9972dfae61
32 changed files with 591 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/mastodon/cli/domains.rb
View file

@ -125,7 +125,7 @@ module Mastodon::CLI
failed = Concurrent::AtomicFixnum.new(0)
start_at = Time.now.to_f
seed = start ? [start] : Instance.pluck(:domain)
blocked_domains = /\.?(#{Regexp.union(domain_block_suspended_domains).source})$/
blocked_domains = /\.?(#{DomainBlock.where(severity: 1).pluck(:domain).map { |domain| Regexp.escape(domain) }.join('|')})$/
progress = create_progress_bar
pool = Concurrent::ThreadPoolExecutor.new(min_threads: 0, max_threads: options[:concurrency], idletime: 10, auto_terminate: true, max_queue: 0)
@ -189,10 +189,6 @@ module Mastodon::CLI
private
def domain_block_suspended_domains
DomainBlock.suspend.pluck(:domain)
end
def stats_to_summary(stats, processed, failed, start_at)
stats.compact!