Fix highlights not showing in mentions (#3801)

2022-06-06 15:36:53 +02:00
parent d29243a2a5
commit 9219647b6a
5 changed files with 116 additions and 8 deletions
@@ -170,11 +170,9 @@ void rebuildUserHighlights(Settings &settings,
                }

                return HighlightResult{
-                    highlight.hasAlert(),
-                    highlight.hasSound(),
-                    highlightSoundUrl,
-                    highlight.getColor(),
-                    false,  // showInMentions
+                    highlight.hasAlert(),       highlight.hasSound(),
+                    highlightSoundUrl,          highlight.getColor(),
+                    highlight.showInMentions(),
                };
            }});
    }
@@ -344,6 +342,14 @@ std::pair<bool, HighlightResult> HighlightController::check(
                }
            }

+            if (checkResult->showInMentions)
+            {
+                if (!result.showInMentions)
+                {
+                    result.showInMentions = checkResult->showInMentions;
+                }
+            }
+
            if (result.full())
            {
                // The final highlight result does not have room to add any more parameters, early out