From 34b5fa661fb68581236b3a677295b68f5723c95e Mon Sep 17 00:00:00 2001 From: nerix Date: Sun, 16 Oct 2022 14:29:28 +0200 Subject: [PATCH] fix: missing global emotes in popup (#4062) --- CHANGELOG.md | 2 +- src/widgets/dialogs/EmotePopup.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5499ebfe..7b17741e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Major: Added support for Twitch's Chat Replies. [Wiki Page](https://wiki.chatterino.com/Features/#message-replies) (#3722, #3989, #4041, #4047, #4055) - Major: Added multi-channel searching to search dialog via keyboard shortcut. (Ctrl+Shift+F by default) (#3694, #3875) -- Major: Added support for emotes and badges from [7TV](https://7tv.app). [Wiki Page](https://wiki.chatterino.com/Third_party_services/#7tv) (#4002) +- Major: Added support for emotes and badges from [7TV](https://7tv.app). [Wiki Page](https://wiki.chatterino.com/Third_party_services/#7tv) (#4002, #4062) - Minor: Added highlights for `Elevated Messages`. (#4016) - Minor: Removed total views from the usercard, as Twitch no longer updates the number. (#3792) - Minor: Load missing messages from Recent Messages API upon reconnecting (#3878, #3932) diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp index fb08ca62..456b8c00 100644 --- a/src/widgets/dialogs/EmotePopup.cpp +++ b/src/widgets/dialogs/EmotePopup.cpp @@ -454,6 +454,11 @@ void EmotePopup::filterTwitchEmotes(std::shared_ptr searchChannel, if (ffzGlobalEmotes->size() > 0) addEmotes(*searchChannel, *ffzGlobalEmotes, "FrankerFaceZ (Global)", MessageElementFlag::FfzEmote); + if (!seventvGlobalEmotes->empty()) + { + addEmotes(*searchChannel, *seventvGlobalEmotes, "SevenTV (Global)", + MessageElementFlag::SevenTVEmote); + } if (!this->twitchChannel_) {