Communicate streams that went offline through /live (Chatterino#2880)

Co-authored-by: pajlada <[email protected]>
SevenTV · Jun 19, 2021 · 74960bf · 74960bf
1 parent f605221
commit 74960bf
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Major: Added username autocompletion popup menu when typing usernames with an @ prefix. (#1979, #2866)
 - Major: Added ability to toggle visibility of Channel Tabs - This can be done by right-clicking the tab area or pressing the keyboard shortcut (default: Ctrl+U). (#2600)
+- Minor: The /live split now shows channels going offline. (#2880)
 - Minor: Restore automod functionality for moderators (#2817, #2887)
 - Minor: Add setting for username style (#2889, #2891)
 - Minor: Searching for users in the viewer list now searches anywhere in the user's name. (#2861)

diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
@@ -607,10 +607,32 @@ void TwitchChannel::setLive(bool newLiveStatus)
             }
             else
             {
+                // Channel offline message
                 MessageBuilder builder;
                 TwitchMessageBuilder::offlineSystemMessage(
                     this->getDisplayName(), &builder);
                 this->addMessage(builder.release());
+
+                // "delete" old 'CHANNEL is live' message
+                LimitedQueueSnapshot<MessagePtr> snapshot =
+                    getApp()->twitch2->liveChannel->getMessageSnapshot();
+                int snapshotLength = snapshot.size();
+
+                // MSVC hates this code if the parens are not there
+                int end = (std::max)(0, snapshotLength - 200);
+                auto liveMessageSearchText =
+                    QString("%1 is live!").arg(this->getDisplayName());
+
+                for (int i = snapshotLength - 1; i >= end; --i)
+                {
+                    auto &s = snapshot[i];
+
+                    if (s->messageText == liveMessageSearchText)
+                    {
+                        s->flags.set(MessageFlag::Disabled);
+                        break;
+                    }
+                }
             }
             guard->live = newLiveStatus;
         }

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -1309,6 +1309,9 @@ void TwitchMessageBuilder::liveMessage(const QString &channelName,
         ->setLink({Link::UserInfo, channelName});
     builder->emplace<TextElement>("is live!", MessageElementFlag::Text,
                                   MessageColor::Text);
+    auto text = channelName + " is live!";
+    builder->message().searchText = text;
+    builder->message().messageText = text;
 }
 
 void TwitchMessageBuilder::liveSystemMessage(const QString &channelName,