From 8c836fe46c6422d37f29c66ef37cdb9af353661a Mon Sep 17 00:00:00 2001 From: Matthias Kronberg Date: Sun, 26 Jan 2025 15:36:55 +0100 Subject: [PATCH] fix: Allow announcements to show up in /mentions (#5857) --- CHANGELOG.md | 1 + src/providers/twitch/IrcMessageHandler.cpp | 8 +++++++- tests/snapshots/IrcMessageHandler/announcement.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82deca12..5aa5a41f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Bugfix: Closing a usercard will no longer cause stop-logging messages to be generated in channel logs. (#5828) - Bugfix: Fixed tabs not scaling to the default scale when changing the scale from a non-default value. (#5794, #5833) - Bugfix: Fixed deleted messages not immediately disappearing when "Hide deleted messages" is enabled. (#5844, #5854) +- Bugfix: Fixed announcements not showing up in mentions tab. (#5857) - Dev: Highlight checks now use non-capturing groups for the boundaries. (#5784) - Dev: Updated Conan dependencies. (#5776) - Dev: Replaced usage of `parseTime` with `serverReceivedTime` for clearchat messages. (#5824, #5855) diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 6601fa12..6dde12c9 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/src/providers/twitch/IrcMessageHandler.cpp @@ -1094,7 +1094,13 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, if (isSub) { msg->flags.set(MessageFlag::Subscription); - msg->flags.unset(MessageFlag::Highlighted); + + if (tags.value("msg-id") != "announcement") + { + // Announcements are currently tagged as subscriptions, + // but we want them to be able to show up in mentions + msg->flags.unset(MessageFlag::Highlighted); + } } sink.applySimilarityFilters(msg); diff --git a/tests/snapshots/IrcMessageHandler/announcement.json b/tests/snapshots/IrcMessageHandler/announcement.json index e43b2099..25591253 100644 --- a/tests/snapshots/IrcMessageHandler/announcement.json +++ b/tests/snapshots/IrcMessageHandler/announcement.json @@ -151,7 +151,7 @@ "url": "" } ], - "flags": "Collapsed|Subscription", + "flags": "Highlighted|Collapsed|Subscription", "highlightColor": "#64c466ff", "id": "8c26e1ab-b50c-4d9d-bc11-3fd57a941d90", "localizedName": "",