Fix remaining Rails/WhereExists cop violations, regenerate todo (#28892)
				
					
				
			This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
# This configuration was generated by
 | 
			
		||||
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
 | 
			
		||||
# using RuboCop version 1.59.0.
 | 
			
		||||
# using RuboCop version 1.60.2.
 | 
			
		||||
# The point is for the user to remove these configuration records
 | 
			
		||||
# one by one as the offenses are removed from the code base.
 | 
			
		||||
# Note that changes in the inspected code, or installation of new
 | 
			
		||||
@@ -70,21 +70,6 @@ Rails/UniqueValidationWithoutIndex:
 | 
			
		||||
    - 'app/models/identity.rb'
 | 
			
		||||
    - 'app/models/webauthn_credential.rb'
 | 
			
		||||
 | 
			
		||||
# This cop supports unsafe autocorrection (--autocorrect-all).
 | 
			
		||||
# Configuration parameters: EnforcedStyle.
 | 
			
		||||
# SupportedStyles: exists, where
 | 
			
		||||
Rails/WhereExists:
 | 
			
		||||
  Exclude:
 | 
			
		||||
    - 'app/controllers/activitypub/inboxes_controller.rb'
 | 
			
		||||
    - 'app/controllers/admin/email_domain_blocks_controller.rb'
 | 
			
		||||
    - 'app/policies/status_policy.rb'
 | 
			
		||||
    - 'app/serializers/rest/announcement_serializer.rb'
 | 
			
		||||
    - 'app/workers/move_worker.rb'
 | 
			
		||||
    - 'spec/models/account_spec.rb'
 | 
			
		||||
    - 'spec/services/activitypub/process_collection_service_spec.rb'
 | 
			
		||||
    - 'spec/services/purge_domain_service_spec.rb'
 | 
			
		||||
    - 'spec/services/unallow_domain_service_spec.rb'
 | 
			
		||||
 | 
			
		||||
# This cop supports unsafe autocorrection (--autocorrect-all).
 | 
			
		||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
 | 
			
		||||
# AllowedMethods: ==, equal?, eql?
 | 
			
		||||
 
 | 
			
		||||
@@ -24,7 +24,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
 | 
			
		||||
 | 
			
		||||
  def unknown_affected_account?
 | 
			
		||||
    json = Oj.load(body, mode: :strict)
 | 
			
		||||
    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists?
 | 
			
		||||
    json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.exists?(uri: json['actor'])
 | 
			
		||||
  rescue Oj::ParseError
 | 
			
		||||
    false
 | 
			
		||||
  end
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@ module Admin
 | 
			
		||||
          log_action :create, @email_domain_block
 | 
			
		||||
 | 
			
		||||
          (@email_domain_block.other_domains || []).uniq.each do |domain|
 | 
			
		||||
            next if EmailDomainBlock.where(domain: domain).exists?
 | 
			
		||||
            next if EmailDomainBlock.exists?(domain: domain)
 | 
			
		||||
 | 
			
		||||
            other_email_domain_block = EmailDomainBlock.create!(domain: domain, allow_with_approval: @email_domain_block.allow_with_approval, parent: @email_domain_block)
 | 
			
		||||
            log_action :create, other_email_domain_block
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,7 @@ class StatusPolicy < ApplicationPolicy
 | 
			
		||||
    if record.mentions.loaded?
 | 
			
		||||
      record.mentions.any? { |mention| mention.account_id == current_account.id }
 | 
			
		||||
    else
 | 
			
		||||
      record.mentions.where(account: current_account).exists?
 | 
			
		||||
      record.mentions.exists?(account: current_account)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -23,7 +23,7 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def read
 | 
			
		||||
    object.announcement_mutes.where(account: current_user.account).exists?
 | 
			
		||||
    object.announcement_mutes.exists?(account: current_user.account)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def content
 | 
			
		||||
 
 | 
			
		||||
@@ -123,7 +123,7 @@ class MoveWorker
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def add_account_note_if_needed!(account, id)
 | 
			
		||||
    unless AccountNote.where(account: account, target_account: @target_account).exists?
 | 
			
		||||
    unless AccountNote.exists?(account: account, target_account: @target_account)
 | 
			
		||||
      text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
 | 
			
		||||
        I18n.t(id, acct: @source_account.acct)
 | 
			
		||||
      end
 | 
			
		||||
 
 | 
			
		||||
@@ -265,7 +265,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
 | 
			
		||||
            anything
 | 
			
		||||
          )
 | 
			
		||||
 | 
			
		||||
          expect(Status.where(uri: 'https://example.com/users/bob/fake-status').exists?).to be false
 | 
			
		||||
          expect(Status.exists?(uri: 'https://example.com/users/bob/fake-status')).to be false
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user