Add limit of 8 different reaction types per announcement (#12950)
This commit is contained in:
		
							parent
							
								
									76f1ed834e
								
							
						
					
					
						commit
						f816da9c64
					
				
					 3 changed files with 9 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -265,7 +265,7 @@ class ReactionsBar extends ImmutablePureComponent {
 | 
			
		|||
          />
 | 
			
		||||
        ))}
 | 
			
		||||
 | 
			
		||||
        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={<Icon id='plus' />} />
 | 
			
		||||
        {visibleReactions.size < 8 && <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={<Icon id='plus' />} />}
 | 
			
		||||
      </div>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -951,6 +951,7 @@ en:
 | 
			
		|||
    public_timelines: Public timelines
 | 
			
		||||
  reactions:
 | 
			
		||||
    errors:
 | 
			
		||||
      limit_reached: Limit of different reactions reached
 | 
			
		||||
      unrecognized_emoji: is not a recognized emoji
 | 
			
		||||
  relationships:
 | 
			
		||||
    activity: Account activity
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue