1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-19 07:57:00 +00:00

Fix validations of reactions limit ()

This commit is contained in:
Eugen Rochko 2020-01-25 16:00:29 +01:00 committed by GitHub
parent fcd79a5584
commit ae2198bd95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 3 deletions

View file

@ -6,10 +6,10 @@ class ReactionValidator < ActiveModel::Validator
LIMIT = 8 LIMIT = 8
def validate(reaction) 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(: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 limit_reached?(reaction) reaction.errors.add(:base, I18n.t('reactions.errors.limit_reached')) if new_reaction?(reaction) && limit_reached?(reaction)
end end
private private
@ -18,6 +18,10 @@ class ReactionValidator < ActiveModel::Validator
SUPPORTED_EMOJIS.include?(name) SUPPORTED_EMOJIS.include?(name)
end end
def new_reaction?(reaction)
!reaction.announcement.announcement_reactions.where(name: reaction.name).exists?
end
def limit_reached?(reaction) def limit_reached?(reaction)
reaction.announcement.announcement_reactions.where.not(name: reaction.name).count('distinct name') >= LIMIT reaction.announcement.announcement_reactions.where.not(name: reaction.name).count('distinct name') >= LIMIT
end end

View file

@ -0,0 +1,42 @@
# frozen_string_literal: true
require 'rails_helper'
describe ReactionValidator do
let(:announcement) { Fabricate(:announcement) }
describe '#validate' do
it 'adds error when not a valid unicode emoji' do
reaction = announcement.announcement_reactions.build(name: 'F')
subject.validate(reaction)
expect(reaction.errors).to_not be_empty
end
it 'does not add error when non-unicode emoji is a custom emoji' do
custom_emoji = Fabricate(:custom_emoji)
reaction = announcement.announcement_reactions.build(name: custom_emoji.shortcode, custom_emoji_id: custom_emoji.id)
subject.validate(reaction)
expect(reaction.errors).to be_empty
end
it 'adds error when 8 reactions already exist' do
%w(🐘 ❤️ 🙉 😍 😋 😂 😞 👍).each do |name|
announcement.announcement_reactions.create!(name: name, account: Fabricate(:account))
end
reaction = announcement.announcement_reactions.build(name: '😘')
subject.validate(reaction)
expect(reaction.errors).to_not be_empty
end
it 'does not add error when new reaction is part of the existing ones' do
%w(🐘 ❤️ 🙉 😍 😋 😂 😞 👍).each do |name|
announcement.announcement_reactions.create!(name: name, account: Fabricate(:account))
end
reaction = announcement.announcement_reactions.build(name: '😋')
subject.validate(reaction)
expect(reaction.errors).to be_empty
end
end
end