noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

added twitch emotes to colon emote menu

Browse source
This commit is contained in:
fourtf 2020-08-15 21:14:07 +02:00
parent 235b67f9da
commit a23b1c7988
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/widgets/splits/EmoteInputPopup.cpp
View file

@ -1,10 +1,12 @@
#include "EmoteInputPopup.hpp" #include "EmoteInputPopup.hpp"
#include "Application.hpp" #include "Application.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "messages/Emote.hpp" #include "messages/Emote.hpp"
#include "providers/bttv/BttvEmotes.hpp" #include "providers/bttv/BttvEmotes.hpp"
#include "providers/ffz/FfzEmotes.hpp" #include "providers/ffz/FfzEmotes.hpp"
#include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/Emotes.hpp" #include "singletons/Emotes.hpp"
#include "util/LayoutCreator.hpp" #include "util/LayoutCreator.hpp"
#include "widgets/listview/GenericListView.hpp" #include "widgets/listview/GenericListView.hpp"
@ -72,6 +74,12 @@ void EmoteInputPopup::updateEmotes(const QString &text, ChannelPtr channel)
if (auto tc = dynamic_cast<TwitchChannel *>(channel.get())) if (auto tc = dynamic_cast<TwitchChannel *>(channel.get()))
{ {
if (auto user = getApp()->accounts->twitch.getCurrent())
{
auto twitch = user->accessEmotes();
addEmotes(emotes, twitch->emotes, text, "Twitch Emote");
}
// TODO extract "Channel BetterTTV" text into a #define. // TODO extract "Channel BetterTTV" text into a #define.
if (auto bttv = tc->bttvEmotes()) if (auto bttv = tc->bttvEmotes())
addEmotes(emotes, *bttv, text, "Channel BetterTTV"); addEmotes(emotes, *bttv, text, "Channel BetterTTV");