aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-13 20:02:32 +0100
committerGitHub <noreply@github.com>2022-12-13 20:02:32 +0100
commit55b210b3e599fa51186a646572056cda7aa3f23c (patch)
treecf38a342fdafcf739603be6fbe290ba1ee8dcfc4
parent52a50c5e43a78f21a1054869352db31b4fa3aba0 (diff)
downloadmastodon-55b210b3e599fa51186a646572056cda7aa3f23c.tar
mastodon-55b210b3e599fa51186a646572056cda7aa3f23c.tar.gz
mastodon-55b210b3e599fa51186a646572056cda7aa3f23c.tar.bz2
mastodon-55b210b3e599fa51186a646572056cda7aa3f23c.zip
Fix crash and incorrect behavior in tootctl domains crawl (#19004)
-rw-r--r--lib/mastodon/domains_cli.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
index a7c78c4a7..77364ffbb 100644
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@@ -97,7 +97,7 @@ module Mastodon
failed = Concurrent::AtomicFixnum.new(0)
start_at = Time.now.to_f
seed = start ? [start] : Instance.pluck(:domain)
- blocked_domains = Regexp.new('\\.?' + DomainBlock.where(severity: 1).pluck(:domain).join('|') + '$')
+ 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)