noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use login name when parsing highlights (#5295)

Browse source
This commit is contained in:
nerix 2024-04-02 21:59:59 +02:00 committed by GitHub
parent 92e75784fc
commit 8db0bb464d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -123,6 +123,7 @@
- Bugfix: Truncated IRC messages to be at most 512 bytes. (#5246) - Bugfix: Truncated IRC messages to be at most 512 bytes. (#5246)
- Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771) - Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771)
- Bugfix: Fixed messages not immediately disappearing when clearing the chat. (#5282) - Bugfix: Fixed messages not immediately disappearing when clearing the chat. (#5282)
- Bugfix: Fixed highlights triggering for ignored users in announcements. (#5295)
- Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978) - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
- Dev: Change clang-format from v14 to v16. (#4929) - Dev: Change clang-format from v14 to v16. (#4929)
- Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791) - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)

4
src/messages/SharedMessageBuilder.cpp
View file

@ -150,7 +150,7 @@ void SharedMessageBuilder::parseUsername()
void SharedMessageBuilder::parseHighlights() void SharedMessageBuilder::parseHighlights()
{ {
if (getSettings()->isBlacklistedUser(this->ircMessage->nick())) if (getSettings()->isBlacklistedUser(this->message().loginName))
{ {
// Do nothing. We ignore highlights from this user. // Do nothing. We ignore highlights from this user.
return; return;
@ -158,7 +158,7 @@ void SharedMessageBuilder::parseHighlights()
auto badges = SharedMessageBuilder::parseBadgeTag(this->tags); auto badges = SharedMessageBuilder::parseBadgeTag(this->tags);
auto [highlighted, highlightResult] = getIApp()->getHighlights()->check( auto [highlighted, highlightResult] = getIApp()->getHighlights()->check(
this->args, badges, this->ircMessage->nick(), this->originalMessage_, this->args, badges, this->message().loginName, this->originalMessage_,
this->message().flags); this->message().flags);
if (!highlighted) if (!highlighted)