mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `Rails/WhereExists` cop in app/validators (#28854)

pull/2583/head
Matt Jankowski 2024-01-23 04:06:53 -05:00 committed by GitHub
parent e2d9635074
commit 67f54c4e75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop_todo.yml
View File

@ -88,8 +88,6 @@ Rails/WhereExists:
- 'app/serializers/rest/announcement_serializer.rb' - 'app/serializers/rest/announcement_serializer.rb'
- 'app/services/activitypub/fetch_remote_status_service.rb' - 'app/services/activitypub/fetch_remote_status_service.rb'
- 'app/services/vote_service.rb' - 'app/services/vote_service.rb'
- 'app/validators/reaction_validator.rb'
- 'app/validators/vote_validator.rb'
- 'app/workers/move_worker.rb' - 'app/workers/move_worker.rb'
- 'lib/tasks/tests.rake' - 'lib/tasks/tests.rake'
- 'spec/models/account_spec.rb' - 'spec/models/account_spec.rb'

2
app/validators/reaction_validator.rb
View File

@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
end end
def new_reaction?(reaction) def new_reaction?(reaction)
!reaction.announcement.announcement_reactions.where(name: reaction.name).exists? !reaction.announcement.announcement_reactions.exists?(name: reaction.name)
end end
def limit_reached?(reaction) def limit_reached?(reaction)

2
app/validators/vote_validator.rb
View File

@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
if vote.persisted? if vote.persisted?
account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists? account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
else else
account_votes_on_same_poll(vote).where(choice: vote.choice).exists? account_votes_on_same_poll(vote).exists?(choice: vote.choice)
end end
end end