Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix remaining Rails/WhereExists cop violations, regenerate todo (#28892)

Browse source
This commit is contained in:
Matt Jankowski 2024-01-25 07:37:07 -05:00 • committed by GitHub
parent 1a565e4bea
commit 7c9c6c7f80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/activitypub/inboxes_controller.rb
View file

@ -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

2
app/controllers/admin/email_domain_blocks_controller.rb
View file

@ -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