A platform for community discussion. Free, open, simple.
UX: Reactions default improvements (#38776)
Martin Brennan3f3dfa611755
diff --git a/plugins/discourse-reactions/config/locales/server.en.yml b/plugins/discourse-reactions/config/locales/server.en.ymlindex 6756a441350..d5bd9ab930d 100644--- a/plugins/discourse-reactions/config/locales/server.en.yml+++ b/plugins/discourse-reactions/config/locales/server.en.yml@@ -9,7 +9,7 @@ en:discourse_reactions_like_sync_enabled: "If this is enabled, historical reactions will have their matching Like records created, except those reactions defined in `discourse_reactions_excluded_from_like`. This sync will happen on a regular basis in the background, and also when you change `discourse_reactions_excluded_from_like`."discourse_reactions_allow_any_emoji: "If this is enabled, will add a button allowing users to select any emoji in the reactions picker. Members will be allowed to choose any emoji, including custom emoji, for reactions. To limit available reactions, use the `emoji_deny_list` site setting."errors:- invalid_excluded_emoji: "You cannot exclude emojis that are not in 'discourse reactions enabled reactions' and you cannot exclude the emoji used for 'discourse reactions reaction for like'."+ invalid_excluded_emoji: "You cannot exclude emojis that are not in 'discourse reactions enabled reactions' (except built-in default exclusions), and you cannot exclude the emoji used for 'discourse reactions reaction for like'."badges:first_reaction:name: First Reactiondiff --git a/plugins/discourse-reactions/config/settings.yml b/plugins/discourse-reactions/config/settings.ymlindex 4361d3732a1..baabe9e7078 100644--- a/plugins/discourse-reactions/config/settings.yml+++ b/plugins/discourse-reactions/config/settings.yml@@ -20,11 +20,12 @@ discourse_reactions:client: truediscourse_reactions_excluded_from_like:type: emoji_list- default: "-1"+ default: "-1|poop|face_with_symbols_on_mouth|enraged_face|face_vomiting|nauseated_face|angry|kitchen_knife|water_pistol|bomb|clown_face|unamused_face|roll_eyes|confused|smirking_face|disappointed_face|pensive_face|lying_face|weary_face|tired_face|confounded_face|persevering_face|smiling_face_with_horns|angry_face_with_horns|cigarette|person_gesturing_no|prohibited|no_entry|dagger|cross_mark"validator: "ReactionsExcludedFromLikeSiteSettingValidator"area: "emojis"discourse_reactions_like_sync_enabled:default: true+ hidden: truediscourse_reactions_allow_any_emoji:default: falseclient: truediff --git a/plugins/discourse-reactions/lib/reactions_excluded_from_like_site_setting_validator.rb b/plugins/discourse-reactions/lib/reactions_excluded_from_like_site_setting_validator.rbindex 5d0b8d84560..f6322b0bfc6 100644--- a/plugins/discourse-reactions/lib/reactions_excluded_from_like_site_setting_validator.rb+++ b/plugins/discourse-reactions/lib/reactions_excluded_from_like_site_setting_validator.rb@@ -16,10 +16,10 @@ class ReactionsExcludedFromLikeSiteSettingValidatordef valid_emojis?(val)emojis = val.to_s.split("|")enabled_reaction_emojis = SiteSetting.discourse_reactions_enabled_reactions.to_s.split("|")+ default_excluded = SiteSetting.defaults[:discourse_reactions_excluded_from_like].to_s.split("|")!emojis.include?(SiteSetting.discourse_reactions_reaction_for_like) &&emojis.all? do |emoji|- enabled_reaction_emojis.include?(emoji) ||- emoji == SiteSetting.defaults[:discourse_reactions_excluded_from_like]+ enabled_reaction_emojis.include?(emoji) || default_excluded.include?(emoji)endendenddiff --git a/plugins/discourse-reactions/spec/lib/reactions_excluded_from_like_site_setting_validator_spec.rb b/plugins/discourse-reactions/spec/lib/reactions_excluded_from_like_site_setting_validator_spec.rbindex 92bcf9a46e3..8fdeeeae779 100644--- a/plugins/discourse-reactions/spec/lib/reactions_excluded_from_like_site_setting_validator_spec.rb+++ b/plugins/discourse-reactions/spec/lib/reactions_excluded_from_like_site_setting_validator_spec.rb@@ -6,11 +6,12 @@ RSpec.describe ReactionsExcludedFromLikeSiteSettingValidator doexpect(described_class.new.valid_value?("clap")).to eq(true)end- it "does not allow any emojis not in discourse_reactions_enabled_reactions to be used except the default" do+ it "does not allow any emojis not in discourse_reactions_enabled_reactions to be used except default exclusions" doSiteSetting.discourse_reactions_enabled_reactions = "laughing|open_mouth"expect(described_class.new.valid_value?("clap")).to eq(false)expect(described_class.new.valid_value?("laughing")).to eq(true)expect(described_class.new.valid_value?("-1")).to eq(true)expect(described_class.new.valid_value?("-1|laughing")).to eq(true)+ expect(described_class.new.valid_value?("poop")).to eq(true)endend