Allow highlights to be excluded from /mentions (#2036)

src/messages/Message.hpp

@@ -37,6 +37,7 @@ enum class MessageFlag : uint32_t {
     Similar = (1 << 19),
     RedeemedHighlight = (1 << 20),
     RedeemedChannelPointReward = (1 << 21),
+    ShowInMentions = (1 << 22),
 };
 using MessageFlags = FlagsEnum<MessageFlag>;
 

src/messages/SharedMessageBuilder.cpp

@@ -208,6 +208,11 @@ void SharedMessageBuilder::parseHighlights()
         this->message().flags.set(MessageFlag::Highlighted);
         this->message().highlightColor = userHighlight.getColor();
 
+        if (userHighlight.showInMentions())
+        {
+            this->message().flags.set(MessageFlag::ShowInMentions);
+        }
+
         if (userHighlight.hasAlert())
         {
             this->highlightAlert_ = true;
@@ -252,7 +257,8 @@ void SharedMessageBuilder::parseHighlights()
     if (getSettings()->enableSelfHighlight && currentUsername.size() > 0)
     {
         HighlightPhrase selfHighlight(
-            currentUsername, getSettings()->enableSelfHighlightTaskbar,
+            currentUsername, getSettings()->showSelfHighlightInMentions,
+            getSettings()->enableSelfHighlightTaskbar,
             getSettings()->enableSelfHighlightSound, false, false,
             getSettings()->selfHighlightSoundUrl.getValue(),
             ColorProvider::instance().color(ColorType::SelfHighlight));
@@ -270,6 +276,11 @@ void SharedMessageBuilder::parseHighlights()
         this->message().flags.set(MessageFlag::Highlighted);
         this->message().highlightColor = highlight.getColor();
 
+        if (highlight.showInMentions())
+        {
+            this->message().flags.set(MessageFlag::ShowInMentions);
+        }
+
         if (highlight.hasAlert())
         {
             this->highlightAlert_ = true;