Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove restriction on Go To Message on system messages from search #4614

Merged
merged 6 commits into from
Aug 5, 2023
Merged

Remove restriction on Go To Message on system messages from search #4614

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bda710
Remove restriction on go to message on system messages
Mm2PL May 9, 2023
6c75c3d
changelog
Mm2PL May 9, 2023
20b0464
Merge remote-tracking branch 'origin/master' into bugfix/remove_restr…
pajlada Aug 5, 2023
5715909
Change the changelog entry from a bugfix to minor
pajlada Aug 5, 2023
464ff55
Merge branch 'master' into bugfix/remove_restriction_on_goto_message_…
pajlada Aug 5, 2023
b3b8024
Merge branch 'master' into bugfix/remove_restriction_on_goto_message_…
pajlada Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Minor: 7TV badges now automatically update upon changing. (#4512)
- Minor: Stream status requests are now batched. (#4713)
- Minor: Added `/c2-theme-autoreload` command to automatically reload a custom theme. This is useful for when you're developing your own theme. (#4718)
- Minor: Remove restriction on Go To Message on system messages from search. (#4614)
- Minor: Show channel point redemptions without messages in usercard. (#4557)
- Bugfix: Increased amount of blocked users loaded from 100 to 1,000. (#4721)
- Bugfix: Fixed generation of crashdumps by the browser-extension process when the browser was closed. (#4667)
Expand Down
4 changes: 3 additions & 1 deletion src/widgets/helper/ChannelView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2671,7 +2671,9 @@ bool ChannelView::mayContainMessage(const MessagePtr &message)
case Channel::Type::Twitch:
case Channel::Type::TwitchWatching:
case Channel::Type::Irc:
return this->channel()->getName() == message->channelName;
// XXX: system messages may not have the channel set
return message->flags.has(MessageFlag::System) ||
this->channel()->getName() == message->channelName;
case Channel::Type::TwitchWhispers:
return message->flags.has(MessageFlag::Whisper);
case Channel::Type::TwitchMentions:
Expand Down
Loading