chatterino2
Code Issues

refactor: Move Emotes to Application (#5120)

Browse Source
This commit is contained in:
pajlada
2024-01-21 14:20:21 +01:00
committed by GitHub
parent 65d3e73c5d
commit 5628605de4
14 changed files with 152 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/completion/sources/EmoteSource.cpp
+6 -3
View File
@@ -3,7 +3,10 @@
#include "Application.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/completion/sources/Helpers.hpp"
#include "providers/bttv/BttvEmotes.hpp"
#include "providers/emoji/Emojis.hpp"
#include "providers/ffz/FfzEmotes.hpp"
#include "providers/seventv/SeventvEmotes.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
@@ -127,15 +130,15 @@ void EmoteSource::initializeFromChannel(const Channel *channel)
}
}
if (auto bttvG = app->getTwitch()->getBttvEmotes().emotes())
if (auto bttvG = app->getBttvEmotes()->emotes())
{
addEmotes(emotes, *bttvG, "Global BetterTTV");
}
if (auto ffzG = app->getTwitch()->getFfzEmotes().emotes())
if (auto ffzG = app->getFfzEmotes()->emotes())
{
addEmotes(emotes, *ffzG, "Global FrankerFaceZ");
}
if (auto seventvG = app->getTwitch()->getSeventvEmotes().globalEmotes())
if (auto seventvG = app->getSeventvEmotes()->globalEmotes())
{
addEmotes(emotes, *seventvG, "Global 7TV");
}