Merge pull request #1266 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 7 insertions, 0 deletions

diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb
index de0f2c94b..be899c89d 100644
--- a/app/validators/reaction_validator.rb
+++ b/app/validators/reaction_validator.rb
@@ -3,10 +3,13 @@
 class ReactionValidator < ActiveModel::Validator
   SUPPORTED_EMOJIS = Oj.load(File.read(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json'))).keys.freeze
 
+  LIMIT = 8
+
   def validate(reaction)
     return if reaction.name.blank? || reaction.custom_emoji_id.present?
 
     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)
   end
 
   private
@@ -14,4 +17,8 @@ class ReactionValidator < ActiveModel::Validator
   def unicode_emoji?(name)
     SUPPORTED_EMOJIS.include?(name)
   end
+
+  def limit_reached?(reaction)
+    reaction.announcement.announcement_reactions.where.not(name: reaction.name).count('distinct name') >= LIMIT
+  end
 end