diff --git a/chatterino.pro b/chatterino.pro index 63cd4c90f..dafca10d3 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -206,6 +206,7 @@ SOURCES += \ src/widgets/splits/ClosedSplits.cpp \ src/providers/ffz/FfzModBadge.cpp \ src/widgets/settingspages/GeneralPage.cpp \ + src/providers/twitch/ChatroomChannel.cpp HEADERS += \ src/Application.hpp \ @@ -385,7 +386,8 @@ HEADERS += \ src/widgets/splits/ClosedSplits.hpp \ src/providers/ffz/FfzModBadge.hpp \ src/widgets/settingspages/GeneralPage.hpp \ - src/messages/HistoricMessageAppearance.hpp + src/messages/HistoricMessageAppearance.hpp \ + src/providers/twitch/ChatroomChannel.hpp RESOURCES += \ resources/resources.qrc \ diff --git a/src/providers/twitch/ChatroomChannel.cpp b/src/providers/twitch/ChatroomChannel.cpp new file mode 100644 index 000000000..d3d43f96d --- /dev/null +++ b/src/providers/twitch/ChatroomChannel.cpp @@ -0,0 +1,44 @@ +#include "ChatroomChannel.hpp" + +#include +#include "TwitchApi.hpp" +#include "common/Common.hpp" +#include "messages\Emote.hpp" +#include "providers/bttv/BttvEmotes.hpp" +#include "providers/bttv/LoadBttvChannelEmote.hpp" +#include "singletons/Emotes.hpp" + +namespace chatterino { + +ChatroomChannel::ChatroomChannel(const QString &channelName, + TwitchBadges &globalTwitchBadges, + BttvEmotes &globalBttv, FfzEmotes &globalFfz) + : TwitchChannel(channelName, globalTwitchBadges, globalBttv, globalFfz) +{ + auto list = channelName.split(":"); + if (list.size() > 2) + { + this->chatroomOwnerId = list[1]; + } +} + +void ChatroomChannel::refreshChannelEmotes() +{ + TwitchApi::findUserName( + this->chatroomOwnerId, + [this, weak = weakOf(this)](QString username) { + qDebug() << username; + BttvEmotes::loadChannel(username, [this, weak](auto &&emoteMap) { + if (auto shared = weak.lock()) + this->bttvEmotes_.set( + std::make_shared(std::move(emoteMap))); + }); + FfzEmotes::loadChannel(username, [this, weak](auto &&emoteMap) { + if (auto shared = weak.lock()) + this->ffzEmotes_.set( + std::make_shared(std::move(emoteMap))); + }); + }); +} + +} // namespace chatterino diff --git a/src/providers/twitch/ChatroomChannel.hpp b/src/providers/twitch/ChatroomChannel.hpp new file mode 100644 index 000000000..c3d6cff67 --- /dev/null +++ b/src/providers/twitch/ChatroomChannel.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "TwitchChannel.hpp" + +#include +#include + +namespace chatterino { + +class ChatroomChannel : public TwitchChannel +{ +protected: + explicit ChatroomChannel(const QString &channelName, + TwitchBadges &globalTwitchBadges, + BttvEmotes &globalBttv, FfzEmotes &globalFfz); + virtual void refreshChannelEmotes() override; + + QString chatroomOwnerId; + + friend class TwitchServer; + friend class TwitchMessageBuilder; + friend class IrcMessageHandler; +}; + +} // namespace chatterino diff --git a/src/providers/twitch/TwitchApi.cpp b/src/providers/twitch/TwitchApi.cpp index f06cb1173..81ecbb6e9 100644 --- a/src/providers/twitch/TwitchApi.cpp +++ b/src/providers/twitch/TwitchApi.cpp @@ -57,4 +57,31 @@ void TwitchApi::findUserId(const QString user, request.execute(); } +void TwitchApi::findUserName(const QString userid, + std::function successCallback) +{ + QString requestUrl("https://api.twitch.tv/kraken/users/" + userid); + + NetworkRequest request(requestUrl); + request.setCaller(QThread::currentThread()); + request.makeAuthorizedV5(getDefaultClientID()); + request.setTimeout(30000); + request.onSuccess([successCallback](auto result) mutable -> Outcome { + auto root = result.parseJson(); + auto name = root.value("name"); + if (!name.isString()) + { + log("API Error: while getting user id, first user object `_id` key " + "is not a " + "string"); + successCallback(""); + return Failure; + } + successCallback(name.toString()); + return Success; + }); + + request.execute(); +} + } // namespace chatterino diff --git a/src/providers/twitch/TwitchApi.hpp b/src/providers/twitch/TwitchApi.hpp index fd7ad599c..8b1b85c13 100644 --- a/src/providers/twitch/TwitchApi.hpp +++ b/src/providers/twitch/TwitchApi.hpp @@ -10,6 +10,8 @@ class TwitchApi public: static void findUserId(const QString user, std::function callback); + static void findUserName(const QString userid, + std::function callback); private: }; diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp index 15ec0c476..0383cd43d 100644 --- a/src/providers/twitch/TwitchChannel.hpp +++ b/src/providers/twitch/TwitchChannel.hpp @@ -32,7 +32,7 @@ class BttvEmotes; class TwitchServer; -class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder +class TwitchChannel : public Channel, pajlada::Signals::SignalHolder { public: struct StreamStatus { @@ -82,7 +82,7 @@ public: std::shared_ptr bttvEmotes() const; std::shared_ptr ffzEmotes() const; - void refreshChannelEmotes(); + virtual void refreshChannelEmotes(); // Badges boost::optional ffzCustomModBadge() const; @@ -104,10 +104,12 @@ private: QString localizedName; }; +protected: explicit TwitchChannel(const QString &channelName, TwitchBadges &globalTwitchBadges, BttvEmotes &globalBttv, FfzEmotes &globalFfz); +private: // Methods void refreshLiveStatus(); Outcome parseLiveStatus(const rapidjson::Document &document); @@ -134,11 +136,14 @@ private: // Emotes TwitchBadges &globalTwitchBadges_; + +protected: BttvEmotes &globalBttv_; FfzEmotes &globalFfz_; Atomic> bttvEmotes_; Atomic> ffzEmotes_; +private: // Badges UniqueAccess>> badgeSets_; // "subscribers": { "0": ... "3": ... "6": ... diff --git a/src/providers/twitch/TwitchServer.cpp b/src/providers/twitch/TwitchServer.cpp index d10c4d367..86b4cf931 100644 --- a/src/providers/twitch/TwitchServer.cpp +++ b/src/providers/twitch/TwitchServer.cpp @@ -6,6 +6,7 @@ #include "controllers/highlights/HighlightController.hpp" #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" +#include "providers/twitch/ChatroomChannel.hpp" #include "providers/twitch/IrcMessageHandler.hpp" #include "providers/twitch/PubsubClient.hpp" #include "providers/twitch/TwitchAccount.hpp" @@ -92,8 +93,18 @@ void TwitchServer::initializeConnection(IrcConnection *connection, bool isRead, std::shared_ptr TwitchServer::createChannel(const QString &channelName) { - auto channel = std::shared_ptr(new TwitchChannel( - channelName, this->twitchBadges, this->bttv, this->ffz)); + std::shared_ptr channel; + if (channelName.left(9).toLower() == "chatrooms") + { + channel = std::static_pointer_cast( + std::shared_ptr(new ChatroomChannel( + channelName, this->twitchBadges, this->bttv, this->ffz))); + } + else + { + channel = std::shared_ptr(new TwitchChannel( + channelName, this->twitchBadges, this->bttv, this->ffz)); + } channel->initialize(); channel->sendMessageSignal.connect(