Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
This commit is contained in:
Claire committed 2024-01-24 20:42:53 +01:00
commit 22cfab0ebf
63 files changed
+291 -88

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ class ReactionValidator < ActiveModel::Validator
end
def new_reaction?(reaction)
!reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
!reaction.announcement.announcement_reactions.exists?(name: reaction.name)
end
def limit_reached?(reaction)
+1 -1
View File
@@ -35,7 +35,7 @@ class VoteValidator < ActiveModel::Validator
if vote.persisted?
account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
else
account_votes_on_same_poll(vote).where(choice: vote.choice).exists?
account_votes_on_same_poll(vote).exists?(choice: vote.choice)
end
end