chatterino2
Code Issues

changed notation

Browse Source
This commit is contained in:
fourtf
2017-01-18 04:33:30 +01:00
parent 552e4c957a
commit 10e4a0f785
61 changed files with 1214 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ircmanager.cpp
+61 -59
View File
@@ -13,14 +13,14 @@
#include <future>
Account *IrcManager::account = nullptr;
IrcConnection *IrcManager::m_connection = NULL;
QMutex IrcManager::m_connectionMutex;
long IrcManager::m_connectionIteration = 0;
IrcConnection *IrcManager::connection = NULL;
QMutex IrcManager::connectionMutex;
long IrcManager::connectionGeneration = 0;
const QString IrcManager::defaultClientId = "7ue61iz46fz11y3cugd0l3tawb4taal";
QNetworkAccessManager IrcManager::m_accessManager;
QNetworkAccessManager IrcManager::accessManager;
QMap<QString, bool> IrcManager::m_twitchBlockedUsers;
QMutex IrcManager::m_twitchBlockedUsersMutex;
QMap<QString, bool> IrcManager::twitchBlockedUsers;
QMutex IrcManager::twitchBlockedUsersMutex;
IrcManager::IrcManager()
{
@@ -37,9 +37,9 @@ IrcManager::connect()
void
IrcManager::beginConnecting()
{
IrcManager::account = const_cast<Account *>(Account::anon());
IrcManager::account = const_cast<Account *>(Account::getAnon());
int iteration = ++m_connectionIteration;
int generation = ++IrcManager::connectionGeneration;
auto c = new IrcConnection();
@@ -49,9 +49,9 @@ IrcManager::beginConnecting()
if (account->isAnon()) {
// fetch ignored users
QString username = account->username();
QString oauthClient = account->oauthClient();
QString oauthToken = account->oauthToken();
QString username = account->getUsername();
QString oauthClient = account->getOauthClient();
QString oauthToken = account->getOauthToken();
{
QString nextLink = "https://api.twitch.tv/kraken/users/" +
@@ -59,12 +59,12 @@ IrcManager::beginConnecting()
"&client_id=" + oauthClient;
QNetworkRequest req(QUrl(nextLink + "&oauth_token=" + oauthToken));
QNetworkReply *reply = m_accessManager.get(req);
QNetworkReply *reply = IrcManager::accessManager.get(req);
QObject::connect(reply, &QNetworkReply::finished, [=] {
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.clear();
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsers.clear();
IrcManager::twitchBlockedUsersMutex.unlock();
QByteArray data = reply->readAll();
QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
@@ -75,15 +75,15 @@ IrcManager::beginConnecting()
auto blocks = root.value("blocks").toArray();
m_twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user =
block.toObject().value("user").toObject();
// display_name
m_twitchBlockedUsers.insert(
IrcManager::twitchBlockedUsers.insert(
user.value("name").toString().toLower(), true);
}
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.unlock();
});
}
@@ -92,7 +92,7 @@ IrcManager::beginConnecting()
QNetworkRequest req(QUrl("https://api.twitch.tv/kraken/users/" +
username + "/emotes?oauth_token=" +
oauthToken + "&client_id=" + oauthClient));
QNetworkReply *reply = m_accessManager.get(req);
QNetworkReply *reply = IrcManager::accessManager.get(req);
QObject::connect(reply, &QNetworkReply::finished, [=] {
QByteArray data = reply->readAll();
@@ -104,15 +104,15 @@ IrcManager::beginConnecting()
auto blocks = root.value("blocks").toArray();
m_twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user =
block.toObject().value("user").toObject();
// display_name
m_twitchBlockedUsers.insert(
IrcManager::twitchBlockedUsers.insert(
user.value("name").toString().toLower(), true);
}
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.unlock();
});
}
}
@@ -129,48 +129,48 @@ IrcManager::beginConnecting()
c->open();
m_connectionMutex.lock();
if (iteration == m_connectionIteration) {
delete m_connection;
IrcManager::connectionMutex.lock();
if (generation == IrcManager::connectionGeneration) {
delete IrcManager::connection;
c->moveToThread(QCoreApplication::instance()->thread());
m_connection = c;
IrcManager::connection = c;
} else {
delete c;
}
m_connectionMutex.unlock();
IrcManager::connectionMutex.unlock();
}
void
IrcManager::disconnect()
{
m_connectionMutex.lock();
IrcManager::connectionMutex.lock();
if (m_connection != NULL) {
delete m_connection;
m_connection = NULL;
if (IrcManager::connection != NULL) {
delete IrcManager::connection;
IrcManager::connection = NULL;
}
m_connectionMutex.unlock();
IrcManager::connectionMutex.unlock();
}
void
IrcManager::joinChannel(const QString &channel)
{
m_connectionMutex.lock();
if (m_connection != NULL) {
m_connection->sendRaw("JOIN #" + channel);
IrcManager::connectionMutex.lock();
if (IrcManager::connection != NULL) {
IrcManager::connection->sendRaw("JOIN #" + channel);
}
m_connectionMutex.unlock();
IrcManager::connectionMutex.unlock();
}
void
IrcManager::partChannel(const QString &channel)
{
m_connectionMutex.lock();
if (m_connection != NULL) {
m_connection->sendRaw("PART #" + channel);
IrcManager::connectionMutex.lock();
if (IrcManager::connection != NULL) {
IrcManager::connection->sendRaw("PART #" + channel);
}
m_connectionMutex.unlock();
IrcManager::connectionMutex.unlock();
}
void
@@ -204,34 +204,35 @@ IrcManager::privateMessageReceived(IrcPrivateMessage *message)
bool
IrcManager::isTwitchBlockedUser(QString const &username)
{
m_twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsersMutex.lock();
auto iterator = m_twitchBlockedUsers.find(username);
auto iterator = IrcManager::twitchBlockedUsers.find(username);
if (iterator == m_twitchBlockedUsers.end()) {
m_twitchBlockedUsersMutex.unlock();
if (iterator == IrcManager::twitchBlockedUsers.end()) {
IrcManager::twitchBlockedUsersMutex.unlock();
return false;
}
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.unlock();
return true;
}
bool
IrcManager::tryAddIgnoredUser(QString const &username, QString &errorMessage)
{
QUrl url("https://api.twitch.tv/kraken/users/" + account->username() +
"/blocks/" + username + "?oauth_token=" + account->oauthToken() +
"&client_id=" + account->oauthClient());
QUrl url("https://api.twitch.tv/kraken/users/" + account->getUsername() +
"/blocks/" + username +
"?oauth_token=" + account->getOauthToken() +
"&client_id=" + account->getOauthClient());
QNetworkRequest request(url);
auto reply = m_accessManager.put(request, QByteArray());
auto reply = IrcManager::accessManager.put(request, QByteArray());
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.insert(username, true);
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsers.insert(username, true);
IrcManager::twitchBlockedUsersMutex.unlock();
delete reply;
return true;
@@ -254,18 +255,19 @@ IrcManager::addIgnoredUser(QString const &username)
bool
IrcManager::tryRemoveIgnoredUser(QString const &username, QString &errorMessage)
{
QUrl url("https://api.twitch.tv/kraken/users/" + account->username() +
"/blocks/" + username + "?oauth_token=" + account->oauthToken() +
"&client_id=" + account->oauthClient());
QUrl url("https://api.twitch.tv/kraken/users/" + account->getUsername() +
"/blocks/" + username +
"?oauth_token=" + account->getOauthToken() +
"&client_id=" + account->getOauthClient());
QNetworkRequest request(url);
auto reply = m_accessManager.deleteResource(request);
auto reply = IrcManager::accessManager.deleteResource(request);
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
m_twitchBlockedUsersMutex.lock();
m_twitchBlockedUsers.remove(username);
m_twitchBlockedUsersMutex.unlock();
IrcManager::twitchBlockedUsersMutex.lock();
IrcManager::twitchBlockedUsers.remove(username);
IrcManager::twitchBlockedUsersMutex.unlock();
delete reply;
return true;