Fix Twitch-Specific Filters Not Being Applied (#4529)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437)
 - Bugfix: Fixed search popup ignoring setting for message scrollback limit. (#4496)
 - Bugfix: Fixed a memory leak that occurred when loading message history. This was mostly noticeable with unstable internet connections where reconnections were frequent or long-running instances of Chatterino. (#4499)
+- Bugfix: Fixed Twitch channel-specific filters not being applied correctly. (#4529)
 - Bugfix: Fixed emote & badge tooltips not showing up when thumbnails were hidden. (#4509)
 - Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472)
 - Dev: Themes are now stored as JSON files in `resources/themes`. (#4471, #4533)

src/providers/twitch/TwitchChannel.cpp

@@ -575,7 +575,7 @@ void TwitchChannel::setRoomModes(const RoomModes &_roomModes)
 
 bool TwitchChannel::isLive() const
 {
-    return this->streamStatus_.access()->live;
+    return this->streamStatus_.accessConst()->live;
 }
 
 SharedAccessGuard<const TwitchChannel::StreamStatus>
@@ -911,21 +911,25 @@ int TwitchChannel::chatterCount()
 
 void TwitchChannel::setLive(bool newLiveStatus)
 {
-    bool gotNewLiveStatus = false;
     {
         auto guard = this->streamStatus_.access();
-        if (guard->live != newLiveStatus)
+        if (guard->live == newLiveStatus)
         {
-            gotNewLiveStatus = true;
+            return;
+        }
+        guard->live = newLiveStatus;
+    }
+
     if (newLiveStatus)
     {
-                if (getApp()->notifications->isChannelNotified(
+        if (getApp()->notifications->isChannelNotified(this->getName(),
-                        this->getName(), Platform::Twitch))
+                                                       Platform::Twitch))
         {
             if (Toasts::isEnabled())
             {
                 getApp()->toasts->sendChannelNotification(
-                            this->getName(), guard->title, Platform::Twitch);
+                    this->getName(), this->accessStreamStatus()->title,
+                    Platform::Twitch);
             }
             if (getSettings()->notificationPlaySound)
             {
@@ -944,8 +948,7 @@ void TwitchChannel::setLive(bool newLiveStatus)
 
         // Message in /live channel
         MessageBuilder builder2;
-                TwitchMessageBuilder::liveMessage(this->getDisplayName(),
+        TwitchMessageBuilder::liveMessage(this->getDisplayName(), &builder2);
-                                                  &builder2);
         getApp()->twitch->liveChannel->addMessage(builder2.release());
 
         // Notify on all channels with a ping sound
@@ -960,8 +963,8 @@ void TwitchChannel::setLive(bool newLiveStatus)
     {
         // Channel offline message
         MessageBuilder builder;
-                TwitchMessageBuilder::offlineSystemMessage(
+        TwitchMessageBuilder::offlineSystemMessage(this->getDisplayName(),
-                    this->getDisplayName(), &builder);
+                                                   &builder);
         this->addMessage(builder.release());
 
         // "delete" old 'CHANNEL is live' message
@@ -985,15 +988,9 @@ void TwitchChannel::setLive(bool newLiveStatus)
             }
         }
     }
-            guard->live = newLiveStatus;
-        }
-    }
 
-    if (gotNewLiveStatus)
-    {
     this->liveStatusChanged.invoke();
 }
-}
 
 void TwitchChannel::refreshTitle()
 {

src/widgets/helper/ChannelView.cpp

@@ -838,7 +838,7 @@ bool ChannelView::shouldIncludeMessage(const MessagePtr &m) const
                 m->loginName, Qt::CaseInsensitive) == 0)
             return true;
 
-        return this->channelFilters_->filter(m, this->channel_);
+        return this->channelFilters_->filter(m, this->underlyingChannel_);
     }
 
     return true;