From 77c61215039ce888642e76baa66d74822f2a2ef8 Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 13 Jun 2023 18:27:28 +0900 Subject: [PATCH] Add disable custom emoji validation on emoji_reaction --- app/validators/emoji_reaction_validator.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/validators/emoji_reaction_validator.rb b/app/validators/emoji_reaction_validator.rb index 38ccde80af..9d1ff556a6 100644 --- a/app/validators/emoji_reaction_validator.rb +++ b/app/validators/emoji_reaction_validator.rb @@ -7,6 +7,7 @@ class EmojiReactionValidator < ActiveModel::Validator return if emoji_reaction.name.blank? emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.blank? && !unicode_emoji?(emoji_reaction.name) + emoji_reaction.errors.add(:name, I18n.t('reactions.errors.unrecognized_emoji')) if emoji_reaction.custom_emoji_id.present? && disabled_custom_emoji?(emoji_reaction.custom_emoji) end private @@ -14,4 +15,8 @@ class EmojiReactionValidator < ActiveModel::Validator def unicode_emoji?(name) SUPPORTED_EMOJIS.include?(name) end + + def disabled_custom_emoji?(custom_emoji) + custom_emoji.nil? ? false : custom_emoji.disabled + end end