From 7f938855184fe7423a5a2b532277e6345af0b534 Mon Sep 17 00:00:00 2001 From: Felanbird <41973452+Felanbird@users.noreply.github.com> Date: Thu, 6 Oct 2022 18:42:41 -0400 Subject: [PATCH] Remove trailing whitespace from Usernames in User Highlights (#4051) --- CHANGELOG.md | 3 ++- src/controllers/highlights/UserHighlightModel.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa1b7f78..3752b1d54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,6 @@ - Minor: Added information about the user's operating system in the About page. (#3663) - Minor: Adjusted large stream thumbnail to 16:9 (#3655) - Minor: Prevented user from entering incorrect characters in Live Notifications channels list. (#3715, #3730) -- Minor: Added whitespace trim to username field in nicknames (#3946) - Minor: Sorted usernames in /vips message to be case-insensitive. (#3696) - Minor: Streamer mode now automatically detects if XSplit, PRISM Live Studio, Twitch Studio, or vMix are running. (#3740) - Minor: Fixed automod caught message notice appearing twice for mods. (#3717) @@ -86,6 +85,8 @@ - Bugfix: Fixed emoji popup not being shown in IRC channels (#4021) - Bugfix: Display sent IRC messages like received ones (#4027) - Bugfix: Fixed non-global FrankerFaceZ emotes from being loaded as global emotes. (#3921) +- Bugfix: Fixed trailing spaces from preventing Nicknames from working correctly. (#3946) +- Bugfix: Fixed trailing spaces from preventing User Highlights from working correctly. (#4051) - Dev: Removed official support for QMake. (#3839, #3883) - Dev: Rewrote LimitedQueue (#3798) - Dev: Overhauled highlight system by moving all checks into a Controller allowing for easier tests. (#3399, #3801, #3835) diff --git a/src/controllers/highlights/UserHighlightModel.cpp b/src/controllers/highlights/UserHighlightModel.cpp index cde9c4965..8a6596a74 100644 --- a/src/controllers/highlights/UserHighlightModel.cpp +++ b/src/controllers/highlights/UserHighlightModel.cpp @@ -26,7 +26,7 @@ HighlightPhrase UserHighlightModel::getItemFromRow( row[Column::Color]->data(Qt::DecorationRole).value(); return HighlightPhrase{ - row[Column::Pattern]->data(Qt::DisplayRole).toString(), + row[Column::Pattern]->data(Qt::DisplayRole).toString().trimmed(), row[Column::ShowInMentions]->data(Qt::CheckStateRole).toBool(), row[Column::FlashTaskbar]->data(Qt::CheckStateRole).toBool(), row[Column::PlaySound]->data(Qt::CheckStateRole).toBool(),