~cytrogen/masto-fe

80c7de998427d6c77b95ec297b84736eeecb6861 — Matt Jankowski 2 years ago b7b96ef
Fix Rails/WhereExists cop in CLI (#25123)

2 files changed, 2 insertions(+), 3 deletions(-)

M .rubocop_todo.yml
M lib/mastodon/cli/email_domain_blocks.rb
M .rubocop_todo.yml => .rubocop_todo.yml +0 -1
@@ 890,7 890,6 @@ Rails/WhereExists:
    - 'app/validators/vote_validator.rb'
    - 'app/workers/move_worker.rb'
    - 'db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb'
    - 'lib/mastodon/cli/email_domain_blocks.rb'
    - 'lib/tasks/tests.rake'
    - 'spec/controllers/api/v1/accounts/notes_controller_spec.rb'
    - 'spec/controllers/api/v1/tags_controller_spec.rb'

M lib/mastodon/cli/email_domain_blocks.rb => lib/mastodon/cli/email_domain_blocks.rb +2 -2
@@ 39,7 39,7 @@ module Mastodon::CLI
      processed = 0

      domains.each do |domain|
        if EmailDomainBlock.where(domain: domain).exists?
        if EmailDomainBlock.exists?(domain: domain)
          say("#{domain} is already blocked.", :yellow)
          skipped += 1
          next


@@ 60,7 60,7 @@ module Mastodon::CLI
        (email_domain_block.other_domains || []).uniq.each do |hostname|
          another_email_domain_block = EmailDomainBlock.new(domain: hostname, parent: email_domain_block)

          if EmailDomainBlock.where(domain: hostname).exists?
          if EmailDomainBlock.exists?(domain: hostname)
            say("#{hostname} is already blocked.", :yellow)
            skipped += 1
            next