From f816da9c6474ddf437681fbf7f5346672436ccdf Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Jan 2020 05:23:33 +0100
Subject: [PATCH] Add limit of 8 different reaction types per announcement
(#12950)
---
.../features/getting_started/components/announcements.js | 2 +-
app/validators/reaction_validator.rb | 7 +++++++
config/locales/en.yml | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js
index 18b1de127..975db0265 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@@ -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>
);
}
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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bb9084b32..0ba573020 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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