diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-14 12:02:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 12:02:41 +0100 |
| commit | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (patch) | |
| tree | 7dc7fd15721c8c376a8cd1f33f6db5067cf3526d /lib | |
| parent | b0ef980aa17868f18089233060900aa5d5632863 (diff) | |
| parent | ccc01559de06ca46319abe4f09856e267812c7ba (diff) | |
Merge pull request #2007 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/domains_cli.rb | 2 |
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) |