refactoring
This commit is contained in:
fourtf
+154
-109
@@ -1,8 +1,9 @@
|
||||
#include "channel.h"
|
||||
#include "emotes.h"
|
||||
#include "emotemanager.h"
|
||||
#include "logging/loggingmanager.h"
|
||||
#include "messages/message.h"
|
||||
#include "windows.h"
|
||||
#include "util/urlfetch.h"
|
||||
#include "windowmanager.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
@@ -14,133 +15,177 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
using namespace chatterino::messages;
|
||||
|
||||
namespace chatterino {
|
||||
|
||||
Channel::Channel(const QString &channel)
|
||||
: messages()
|
||||
, name((channel.length() > 0 && channel[0] == '#') ? channel.mid(1)
|
||||
: channel)
|
||||
, bttvChannelEmotes()
|
||||
, ffzChannelEmotes()
|
||||
, subLink("https://www.twitch.tv/" + name +
|
||||
"/subscribe?ref=in_chat_subscriber_link")
|
||||
, channelLink("https://twitch.tv/" + name)
|
||||
, popoutPlayerLink("https://player.twitch.tv/?channel=" + name)
|
||||
, loggingChannel(logging::get(name))
|
||||
: _messages()
|
||||
, _name((channel.length() > 0 && channel[0] == '#') ? channel.mid(1) : channel)
|
||||
, _bttvChannelEmotes()
|
||||
, _ffzChannelEmotes()
|
||||
, _subLink("https://www.twitch.tv/" + _name + "/subscribe?ref=in_chat_subscriber_link")
|
||||
, _channelLink("https://twitch.tv/" + _name)
|
||||
, _popoutPlayerLink("https://player.twitch.tv/?channel=" + _name)
|
||||
//, _loggingChannel(logging::get(_name))
|
||||
{
|
||||
reloadChannelEmotes();
|
||||
}
|
||||
|
||||
void
|
||||
Channel::reloadBttvEmotes()
|
||||
//
|
||||
// properties
|
||||
//
|
||||
ConcurrentMap<QString, messages::LazyLoadedImage *> &Channel::getBttvChannelEmotes()
|
||||
{
|
||||
// bttv
|
||||
QNetworkAccessManager *manager = new QNetworkAccessManager();
|
||||
|
||||
QUrl url("https://api.betterttv.net/2/channels/" + this->name);
|
||||
QNetworkRequest request(url);
|
||||
|
||||
QNetworkReply *reply = manager->get(request);
|
||||
|
||||
QObject::connect(reply, &QNetworkReply::finished, [=] {
|
||||
if (reply->error() == QNetworkReply::NetworkError::NoError) {
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
|
||||
QJsonObject root = jsonDoc.object();
|
||||
|
||||
auto emotes = root.value("emotes").toArray();
|
||||
|
||||
QString _template = "https:" + root.value("urlTemplate").toString();
|
||||
|
||||
for (const QJsonValue &emote : emotes) {
|
||||
QString id = emote.toObject().value("id").toString();
|
||||
QString code = emote.toObject().value("code").toString();
|
||||
// emote.value("imageType").toString();
|
||||
|
||||
QString tmp = _template;
|
||||
tmp.detach();
|
||||
QString url =
|
||||
tmp.replace("{{id}}", id).replace("{{image}}", "1x");
|
||||
|
||||
this->getBttvChannelEmotes().insert(
|
||||
code, Emotes::getBttvChannelEmoteFromCaches().getOrAdd(
|
||||
id, [&code, &url] {
|
||||
return new messages::LazyLoadedImage(
|
||||
url, 1, code,
|
||||
code + "\nChannel Bttv Emote");
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
reply->deleteLater();
|
||||
manager->deleteLater();
|
||||
});
|
||||
return _bttvChannelEmotes;
|
||||
}
|
||||
|
||||
void
|
||||
Channel::reloadFfzEmotes()
|
||||
ConcurrentMap<QString, messages::LazyLoadedImage *> &Channel::getFfzChannelEmotes()
|
||||
{
|
||||
QNetworkAccessManager *manager = new QNetworkAccessManager();
|
||||
|
||||
QUrl url("http://api.frankerfacez.com/v1/room/" + this->name);
|
||||
QNetworkRequest request(url);
|
||||
|
||||
QNetworkReply *reply = manager->get(request);
|
||||
|
||||
QObject::connect(reply, &QNetworkReply::finished, [=] {
|
||||
if (reply->error() == QNetworkReply::NetworkError::NoError) {
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
|
||||
QJsonObject root = jsonDoc.object();
|
||||
|
||||
auto sets = root.value("sets").toObject();
|
||||
|
||||
for (const QJsonValue &set : sets) {
|
||||
auto emoticons = set.toObject().value("emoticons").toArray();
|
||||
|
||||
for (const QJsonValue &emote : emoticons) {
|
||||
QJsonObject object = emote.toObject();
|
||||
|
||||
// margins
|
||||
|
||||
int id = object.value("id").toInt();
|
||||
QString code = object.value("name").toString();
|
||||
|
||||
QJsonObject urls = object.value("urls").toObject();
|
||||
QString url1 = "http:" + urls.value("1").toString();
|
||||
|
||||
this->getFfzChannelEmotes().insert(
|
||||
code, Emotes::getFfzChannelEmoteFromCaches().getOrAdd(
|
||||
id, [&code, &url1] {
|
||||
return new messages::LazyLoadedImage(
|
||||
url1, 1, code,
|
||||
code + "\nGlobal Ffz Emote");
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
reply->deleteLater();
|
||||
manager->deleteLater();
|
||||
});
|
||||
return _ffzChannelEmotes;
|
||||
}
|
||||
|
||||
void
|
||||
Channel::addMessage(std::shared_ptr<messages::Message> message)
|
||||
bool Channel::isEmpty() const
|
||||
{
|
||||
std::shared_ptr<messages::Message> deleted;
|
||||
return _name.isEmpty();
|
||||
}
|
||||
|
||||
if (this->loggingChannel.get() != nullptr) {
|
||||
this->loggingChannel->append(message);
|
||||
}
|
||||
const QString &Channel::getName() const
|
||||
{
|
||||
return _name;
|
||||
}
|
||||
|
||||
if (this->messages.appendItem(message, deleted)) {
|
||||
this->messageRemovedFromStart(deleted);
|
||||
int Channel::getRoomID() const
|
||||
{
|
||||
return _roomID;
|
||||
}
|
||||
|
||||
const QString &Channel::getSubLink() const
|
||||
{
|
||||
return _subLink;
|
||||
}
|
||||
|
||||
const QString &Channel::getChannelLink() const
|
||||
{
|
||||
return _channelLink;
|
||||
}
|
||||
|
||||
const QString &Channel::getPopoutPlayerLink() const
|
||||
{
|
||||
return _popoutPlayerLink;
|
||||
}
|
||||
|
||||
bool Channel::getIsLive() const
|
||||
{
|
||||
return _isLive;
|
||||
}
|
||||
|
||||
int Channel::getStreamViewerCount() const
|
||||
{
|
||||
return _streamViewerCount;
|
||||
}
|
||||
|
||||
const QString &Channel::getStreamStatus() const
|
||||
{
|
||||
return _streamStatus;
|
||||
}
|
||||
|
||||
const QString &Channel::getStreamGame() const
|
||||
{
|
||||
return _streamGame;
|
||||
}
|
||||
|
||||
messages::LimitedQueueSnapshot<messages::SharedMessage> Channel::getMessageSnapshot()
|
||||
{
|
||||
return _messages.getSnapshot();
|
||||
}
|
||||
|
||||
//
|
||||
// methods
|
||||
//
|
||||
void Channel::addMessage(std::shared_ptr<Message> message)
|
||||
{
|
||||
std::shared_ptr<Message> deleted;
|
||||
|
||||
// if (_loggingChannel.get() != nullptr) {
|
||||
// _loggingChannel->append(message);
|
||||
// }
|
||||
|
||||
if (_messages.appendItem(message, deleted)) {
|
||||
messageRemovedFromStart(deleted);
|
||||
}
|
||||
|
||||
this->messageAppended(message);
|
||||
|
||||
Windows::repaintVisibleChatWidgets(this);
|
||||
WindowManager::repaintVisibleChatWidgets(this);
|
||||
}
|
||||
|
||||
// private methods
|
||||
void Channel::reloadChannelEmotes()
|
||||
{
|
||||
reloadBttvEmotes();
|
||||
reloadFfzEmotes();
|
||||
}
|
||||
|
||||
void Channel::reloadBttvEmotes()
|
||||
{
|
||||
util::urlJsonFetch(
|
||||
"https://api.betterttv.net/2/channels/" + _name, [this](QJsonObject &rootNode) {
|
||||
auto emotesNode = rootNode.value("emotes").toArray();
|
||||
|
||||
QString linkTemplate = "https:" + rootNode.value("urlTemplate").toString();
|
||||
|
||||
for (const QJsonValue &emoteNode : emotesNode) {
|
||||
QJsonObject emoteObject = emoteNode.toObject();
|
||||
|
||||
QString id = emoteObject.value("id").toString();
|
||||
QString code = emoteObject.value("code").toString();
|
||||
// emoteObject.value("imageType").toString();
|
||||
|
||||
QString link = linkTemplate;
|
||||
link.detach();
|
||||
|
||||
link = link.replace("{{id}}", id).replace("{{image}}", "1x");
|
||||
|
||||
auto emote = EmoteManager::getInstance().getBttvChannelEmoteFromCaches().getOrAdd(
|
||||
id, [&code, &link] {
|
||||
return new LazyLoadedImage(link, 1, code, code + "\nChannel Bttv Emote");
|
||||
});
|
||||
|
||||
this->getBttvChannelEmotes().insert(code, emote);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void Channel::reloadFfzEmotes()
|
||||
{
|
||||
util::urlJsonFetch("http://api.frankerfacez.com/v1/room/" + _name, [this](
|
||||
QJsonObject &rootNode) {
|
||||
auto setsNode = rootNode.value("sets").toObject();
|
||||
|
||||
for (const QJsonValue &setNode : setsNode) {
|
||||
auto emotesNode = setNode.toObject().value("emoticons").toArray();
|
||||
|
||||
for (const QJsonValue &emoteNode : emotesNode) {
|
||||
QJsonObject emoteObject = emoteNode.toObject();
|
||||
|
||||
// margins
|
||||
|
||||
int id = emoteObject.value("id").toInt();
|
||||
QString code = emoteObject.value("name").toString();
|
||||
|
||||
QJsonObject urls = emoteObject.value("urls").toObject();
|
||||
QString url1 = "http:" + urls.value("1").toString();
|
||||
|
||||
auto emote = EmoteManager::getInstance().getFfzChannelEmoteFromCaches().getOrAdd(
|
||||
id, [&code, &url1] {
|
||||
return new LazyLoadedImage(url1, 1, code, code + "\nGlobal Ffz Emote");
|
||||
});
|
||||
|
||||
getFfzChannelEmotes().insert(code, emote);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
} // namespace chatterino
|
||||
|
||||
Reference in New Issue
Block a user