chatterino2
Code Issues

Remove global third party emotes from TwitchChannel class (#3000)

Browse Source 
Those are still accessible under getApp()->twitch2 instance.
This commit is contained in:
Paweł
2021-07-13 13:23:50 +02:00
committed by GitHub
parent 8c113c2311
commit c8c28d7f55
6 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/EmotePopup.cpp
+3 -2
View File
@@ -7,6 +7,7 @@
#include "messages/Message.hpp"
#include "messages/MessageBuilder.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/WindowManager.hpp"
#include "util/Shortcut.hpp"
@@ -229,9 +230,9 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
*globalChannel, *subChannel, _channel->getName());
// global
addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
addEmotes(*globalChannel, *getApp()->twitch2->getBttvEmotes().emotes(),
"BetterTTV", MessageElementFlag::BttvEmote);
addEmotes(*globalChannel, *twitchChannel->globalFfz().emotes(),
addEmotes(*globalChannel, *getApp()->twitch2->getFfzEmotes().emotes(),
"FrankerFaceZ", MessageElementFlag::FfzEmote);
// channel