tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix validations of reactions limit (#12955)

Browse Source
This commit is contained in:
Eugen Rochko
2020-01-25 16:00:29 +01:00
committed by GitHub
parent fcd79a5584
commit ae2198bd95
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/validators/reaction_validator.rb
View File

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