From c8c28d7f5516cf92af9e03c11be128d199789195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82?= Date: Tue, 13 Jul 2021 13:23:50 +0200 Subject: [PATCH] Remove global third party emotes from TwitchChannel class (#3000) Those are still accessible under getApp()->twitch2 instance. --- src/common/CompletionModel.cpp | 4 ++-- src/providers/twitch/TwitchChannel.cpp | 15 +-------------- src/providers/twitch/TwitchChannel.hpp | 7 +------ src/providers/twitch/TwitchIrcServer.cpp | 4 ++-- src/widgets/dialogs/EmotePopup.cpp | 5 +++-- src/widgets/splits/InputCompletionPopup.cpp | 4 ++-- 6 files changed, 11 insertions(+), 28 deletions(-) diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp index 1f16e6a2..f2e590d2 100644 --- a/src/common/CompletionModel.cpp +++ b/src/common/CompletionModel.cpp @@ -148,13 +148,13 @@ void CompletionModel::refresh(const QString &prefix, bool isFirstWord) } // Bttv Global - for (auto &emote : *channel->globalBttv().emotes()) + for (auto &emote : *getApp()->twitch2->getBttvEmotes().emotes()) { addString(emote.first.string, TaggedString::Type::BTTVChannelEmote); } // Ffz Global - for (auto &emote : *channel->globalFfz().emotes()) + for (auto &emote : *getApp()->twitch2->getFfzEmotes().emotes()) { addString(emote.first.string, TaggedString::Type::FFZChannelEmote); } diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index 7cd5c95a..884d2014 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -144,8 +144,7 @@ namespace { } } // namespace -TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv, - FfzEmotes &ffz) +TwitchChannel::TwitchChannel(const QString &name) : Channel(name, Channel::Type::Twitch) , ChannelChatters(*static_cast(this)) , nameOptions{name, name} @@ -153,8 +152,6 @@ TwitchChannel::TwitchChannel(const QString &name, BttvEmotes &bttv, , channelUrl_("https://twitch.tv/" + name) , popoutPlayerUrl_("https://player.twitch.tv/?parent=twitch.tv&channel=" + name) - , globalBttv_(bttv) - , globalFfz_(ffz) , bttvEmotes_(std::make_shared()) , ffzEmotes_(std::make_shared()) , mod_(false) @@ -499,16 +496,6 @@ SharedAccessGuard return this->streamStatus_.accessConst(); } -const BttvEmotes &TwitchChannel::globalBttv() const -{ - return this->globalBttv_; -} - -const FfzEmotes &TwitchChannel::globalFfz() const -{ - return this->globalFfz_; -} - boost::optional TwitchChannel::bttvEmote(const EmoteName &name) const { auto emotes = this->bttvEmotes_.get(); diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp index 6b6daa3c..1b3ef5a3 100644 --- a/src/providers/twitch/TwitchChannel.hpp +++ b/src/providers/twitch/TwitchChannel.hpp @@ -87,8 +87,6 @@ public: SharedAccessGuard accessStreamStatus() const; // Emotes - const BttvEmotes &globalBttv() const; - const FfzEmotes &globalFfz() const; boost::optional bttvEmote(const EmoteName &name) const; boost::optional ffzEmote(const EmoteName &name) const; std::shared_ptr bttvEmotes() const; @@ -127,8 +125,7 @@ private: } nameOptions; protected: - explicit TwitchChannel(const QString &channelName, BttvEmotes &globalBttv, - FfzEmotes &globalFfz); + explicit TwitchChannel(const QString &channelName); private: // Methods @@ -162,8 +159,6 @@ private: UniqueAccess roomModes_; protected: - BttvEmotes &globalBttv_; - FfzEmotes &globalFfz_; Atomic> bttvEmotes_; Atomic> ffzEmotes_; Atomic> ffzCustomModBadge_; diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index fdefd32d..5d91ac98 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -90,8 +90,8 @@ void TwitchIrcServer::initializeConnection(IrcConnection *connection, std::shared_ptr TwitchIrcServer::createChannel( const QString &channelName) { - auto channel = std::shared_ptr( - new TwitchChannel(channelName, this->bttv, this->ffz)); + auto channel = + std::shared_ptr(new TwitchChannel(channelName)); channel->initialize(); channel->sendMessageSignal.connect( diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp index 3ca63ca1..d76a0102 100644 --- a/src/widgets/dialogs/EmotePopup.cpp +++ b/src/widgets/dialogs/EmotePopup.cpp @@ -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 diff --git a/src/widgets/splits/InputCompletionPopup.cpp b/src/widgets/splits/InputCompletionPopup.cpp index e8781197..b1714a5d 100644 --- a/src/widgets/splits/InputCompletionPopup.cpp +++ b/src/widgets/splits/InputCompletionPopup.cpp @@ -104,9 +104,9 @@ void InputCompletionPopup::updateEmotes(const QString &text, ChannelPtr channel) if (auto ffz = tc->ffzEmotes()) addEmotes(emotes, *ffz, text, "Channel FrankerFaceZ"); - if (auto bttvG = tc->globalBttv().emotes()) + if (auto bttvG = getApp()->twitch2->getBttvEmotes().emotes()) addEmotes(emotes, *bttvG, text, "Global BetterTTV"); - if (auto ffzG = tc->globalFfz().emotes()) + if (auto ffzG = getApp()->twitch2->getFfzEmotes().emotes()) addEmotes(emotes, *ffzG, text, "Global FrankerFaceZ"); }