diff --git a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb index 289069adfaf..3ccbb62bf3e 100644 --- a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb +++ b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb @@ -12,7 +12,7 @@ class DiscourseReactions::CustomReactionsController < ApplicationController reaction = params[:reaction] invalid_reaction = - if SiteSetting.discourse_reactions_experimental_allow_any_emoji + if SiteSetting.discourse_reactions_allow_any_emoji !Emoji.exists?(reaction) else DiscourseReactions::Reaction.valid_reactions.exclude?(params[:reaction]) diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs index 58c55c1c501..26702774aff 100644 --- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs +++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs @@ -89,7 +89,7 @@ export default class DiscourseReactionsPicker extends Component { get optimalColsCount() { let count = this.reactionInfo.length; - if (this.siteSettings.discourse_reactions_experimental_allow_any_emoji) { + if (this.siteSettings.discourse_reactions_allow_any_emoji) { count += 1; } @@ -181,9 +181,7 @@ export default class DiscourseReactionsPicker extends Component { {{emoji reaction.id}} {{/each}} - {{#if - this.siteSettings.discourse_reactions_experimental_allow_any_emoji - }} + {{#if this.siteSettings.discourse_reactions_allow_any_emoji}}