diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/validators/reaction_validator.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb index be899c89d..494b6041b 100644 --- a/app/validators/reaction_validator.rb +++ b/app/validators/reaction_validator.rb @@ -6,10 +6,10 @@ class ReactionValidator < ActiveModel::Validator LIMIT = 8 def validate(reaction) - return if reaction.name.blank? || reaction.custom_emoji_id.present? + return if reaction.name.blank? - reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) unless unicode_emoji?(reaction.name) - reaction.errors.add(:base, I18n.t('reactions.errors.limit_reached')) if limit_reached?(reaction) + reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if reaction.custom_emoji_id.blank? && !unicode_emoji?(reaction.name) + reaction.errors.add(:base, I18n.t('reactions.errors.limit_reached')) if new_reaction?(reaction) && limit_reached?(reaction) end private @@ -18,6 +18,10 @@ class ReactionValidator < ActiveModel::Validator SUPPORTED_EMOJIS.include?(name) end + def new_reaction?(reaction) + !reaction.announcement.announcement_reactions.where(name: reaction.name).exists? + end + def limit_reached?(reaction) reaction.announcement.announcement_reactions.where.not(name: reaction.name).count('distinct name') >= LIMIT end |