chatterino2
Code Issues

Use addChat instead of re-implementing the same code (thanks hemirt)

Browse Source 
Some refactoring

Updated settings library version
This commit is contained in:
Rasmus Karlsson
2017-07-02 13:10:06 +02:00
parent d2d65b9cb5
commit c5c2718dc0
5 changed files with 144 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ircmanager.cpp
+18 -22
View File
@@ -137,24 +137,24 @@ void IrcManager::refreshTwitchEmotes(const QString &username, const QString &oau
"/emotes?oauth_token=" + oauthToken + "&client_id=" + oauthClient);
if (true) {
util::urlFetchJSONTimeout(url,
[=](QJsonObject &root) {
// nextLink =
// root.value("_links").toObject().value("next").toString();
util::urlFetchJSONTimeout(
url,
[=](QJsonObject &root) {
// nextLink =
// root.value("_links").toObject().value("next").toString();
auto blocks = root.value("blocks").toArray();
auto blocks = root.value("blocks").toArray();
_twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user = block.toObject().value("user").toObject();
// display_name
_twitchBlockedUsers.insert(
user.value("name").toString().toLower(), true);
}
_twitchBlockedUsersMutex.unlock();
qDebug() << "XD";
},
3000, &this->_accessManager);
_twitchBlockedUsersMutex.lock();
for (QJsonValue block : blocks) {
QJsonObject user = block.toObject().value("user").toObject();
// display_name
_twitchBlockedUsers.insert(user.value("name").toString().toLower(), true);
}
_twitchBlockedUsersMutex.unlock();
qDebug() << "XD";
},
3000, &this->networkAccessManager);
}
}
@@ -341,7 +341,7 @@ bool IrcManager::tryAddIgnoredUser(QString const &username, QString &errorMessag
"&client_id=" + _account.getOAuthClient());
QNetworkRequest request(url);
auto reply = _accessManager.put(request, QByteArray());
auto reply = this->networkAccessManager.put(request, QByteArray());
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
@@ -373,7 +373,7 @@ bool IrcManager::tryRemoveIgnoredUser(QString const &username, QString &errorMes
"&client_id=" + _account.getOAuthClient());
QNetworkRequest request(url);
auto reply = _accessManager.deleteResource(request);
auto reply = this->networkAccessManager.deleteResource(request);
reply->waitForReadyRead(10000);
if (reply->error() == QNetworkReply::NoError) {
@@ -398,8 +398,4 @@ void IrcManager::removeIgnoredUser(QString const &username)
}
}
QNetworkAccessManager &IrcManager::getAccessManager()
{
return _accessManager;
}
} // namespace chatterino