From 9554b83c1a98a6e33bef70e3ddf85ee93b60a63a Mon Sep 17 00:00:00 2001 From: nerix Date: Fri, 30 Sep 2022 22:59:52 +0200 Subject: [PATCH] fix: Show Emoji Completion in IRC Channels (#4021) --- CHANGELOG.md | 1 + src/widgets/splits/InputCompletionPopup.cpp | 4 ++-- src/widgets/splits/SplitInput.cpp | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 379755750..decfa7cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ - Bugfix: Fixed an issue where Anonymous gift messages appeared larger than normal gift messages. (#3888) - Bugfix: Fixed crash related to logging IRC channels (#3918) - Bugfix: Mentions of "You" in timeouts will link to your own user now instead of the user "You". (#3922) +- Bugfix: Fixed emoji popup not being shown in IRC channels (#4021) - 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/widgets/splits/InputCompletionPopup.cpp b/src/widgets/splits/InputCompletionPopup.cpp index 1cf8fee5e..d20b9f88d 100644 --- a/src/widgets/splits/InputCompletionPopup.cpp +++ b/src/widgets/splits/InputCompletionPopup.cpp @@ -110,10 +110,10 @@ void InputCompletionPopup::updateEmotes(const QString &text, ChannelPtr channel) addEmotes(emotes, *bttvG, text, "Global BetterTTV"); if (auto ffzG = getApp()->twitch->getFfzEmotes().emotes()) addEmotes(emotes, *ffzG, text, "Global FrankerFaceZ"); - - addEmojis(emotes, getApp()->emotes->emojis.emojis, text); } + addEmojis(emotes, getApp()->emotes->emojis.emojis, text); + // if there is an exact match, put that emote first for (size_t i = 1; i < emotes.size(); i++) { diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp index ab635bd3d..f78ce2746 100644 --- a/src/widgets/splits/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -661,8 +661,7 @@ void SplitInput::updateCompletionPopup() { auto channel = this->split_->getChannel().get(); auto tc = dynamic_cast(channel); - bool showEmoteCompletion = - channel->isTwitchChannel() && getSettings()->emoteCompletionWithColon; + bool showEmoteCompletion = getSettings()->emoteCompletionWithColon; bool showUsernameCompletion = tc && getSettings()->showUsernameCompletionMenu; if (!showEmoteCompletion && !showUsernameCompletion)