From 801779b87298560078193e0216cb73cca3de1262 Mon Sep 17 00:00:00 2001 From: apa420 Date: Thu, 12 Jul 2018 10:52:18 +0200 Subject: [PATCH] fixed stuff for PR --- .../commands/CommandController.cpp | 16 +++--- src/providers/twitch/TwitchApi.cpp | 52 +++++++++++++++++++ .../twitch/{twitchapi.hpp => TwitchApi.hpp} | 4 +- src/providers/twitch/twitchapi.cpp | 37 ------------- 4 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 src/providers/twitch/TwitchApi.cpp rename src/providers/twitch/{twitchapi.hpp => TwitchApi.hpp} (60%) delete mode 100644 src/providers/twitch/twitchapi.cpp diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp index 9e570fd39..d56e8ce6d 100644 --- a/src/controllers/commands/CommandController.cpp +++ b/src/controllers/commands/CommandController.cpp @@ -212,16 +212,17 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel, auto user = app->accounts->twitch.getCurrent(); auto target = words.at(1); + if (user->isAnon()) { channel->addMessage( Message::createSystemMessage("You must be logged in to follow someone")); - return ""; } - TwitchApi::FindUserId(target, [user, channel, target](QString userId) { + + TwitchApi::findUserId(target, [user, channel, target](QString userId) { if (userId.isEmpty()) { - channel->addMessage( - Message::createSystemMessage("User " + target + " was not found!")); + channel->addMessage(Message::createSystemMessage( + "User " + target + " could not be followed!")); return; } user->followUser(userId, [channel, target]() { @@ -236,16 +237,17 @@ QString CommandController::execCommand(const QString &text, ChannelPtr channel, auto user = app->accounts->twitch.getCurrent(); auto target = words.at(1); + if (user->isAnon()) { channel->addMessage( Message::createSystemMessage("You must be logged in to follow someone")); return ""; } - TwitchApi::FindUserId(target, [user, channel, target](QString userId) { + TwitchApi::findUserId(target, [user, channel, target](QString userId) { if (userId.isEmpty()) { - channel->addMessage( - Message::createSystemMessage("User " + target + " was not found!")); + channel->addMessage(Message::createSystemMessage( + "User " + target + " could not be followed!")); return; } user->unfollowUser(userId, [channel, target]() { diff --git a/src/providers/twitch/TwitchApi.cpp b/src/providers/twitch/TwitchApi.cpp new file mode 100644 index 000000000..06c3380fa --- /dev/null +++ b/src/providers/twitch/TwitchApi.cpp @@ -0,0 +1,52 @@ +#include "providers/twitch/twitchapi.hpp" + +#include "common/NetworkRequest.hpp" +#include "debug/Log.hpp" +#include "providers/twitch/TwitchCommon.hpp" + +#include + +namespace chatterino { + +void TwitchApi::findUserId(const QString user, std::function successCallback) +{ + QString requestUrl("https://api.twitch.tv/kraken/users?login=" + user); + + NetworkRequest request(requestUrl); + request.setCaller(QThread::currentThread()); + request.makeAuthorizedV5(getDefaultClientID()); + request.setTimeout(30000); + request.onSuccess([successCallback](auto result) mutable { + auto root = result.parseJson(); + if (!root.value("users").isArray()) { + Log("API Error while getting user id, users is not an array"); + successCallback(""); + return true; + } + auto users = root.value("users").toArray(); + if (users.size() != 1) { + Log("API Error while getting user id, users array size is not 1"); + successCallback(""); + return true; + } + if (!users[0].isObject()) { + Log("API Error while getting user id, first user is not an object"); + successCallback(""); + return true; + } + auto firstUser = users[0].toObject(); + auto id = firstUser.value("_id"); + if (!id.isString()) { + Log("API Error: while getting user id, first user object `_id` key is not a " + "string"); + successCallback(""); + return true; + } + successCallback(id.toString()); + return true; + }); + + request.execute(); +} + +} // namespace chatterino diff --git a/src/providers/twitch/twitchapi.hpp b/src/providers/twitch/TwitchApi.hpp similarity index 60% rename from src/providers/twitch/twitchapi.hpp rename to src/providers/twitch/TwitchApi.hpp index 9e38bd2cb..00b8ff4d7 100644 --- a/src/providers/twitch/twitchapi.hpp +++ b/src/providers/twitch/TwitchApi.hpp @@ -1,7 +1,5 @@ #pragma once -#include "common/Singleton.hpp" - #include namespace chatterino { @@ -9,7 +7,7 @@ namespace chatterino { class TwitchApi { public: - static void FindUserId(const QString user, std::function callback); + static void findUserId(const QString user, std::function callback); private: }; diff --git a/src/providers/twitch/twitchapi.cpp b/src/providers/twitch/twitchapi.cpp deleted file mode 100644 index 153778369..000000000 --- a/src/providers/twitch/twitchapi.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "providers/twitch/twitchapi.hpp" - -#include "Application.hpp" -#include "common/UrlFetch.hpp" -#include "controllers/accounts/AccountController.hpp" -#include "providers/twitch/TwitchCommon.hpp" - -#include -#include - -namespace chatterino { - -void TwitchApi::FindUserId(const QString user, std::function callback) -{ - QString requestUrl("https://api.twitch.tv/kraken/users?login=" + user + - "&api_version=5&client_id=" + getDefaultClientID()); - NetworkRequest request(requestUrl); - request.setCaller(QThread::currentThread()); - request.setTimeout(30000); - request.onSuccess([callback](auto result) mutable { - QString userId; - - auto root = result.parseJson(); - if (root.value("users").toArray().isEmpty()) { - callback(""); - return true; - } - userId = root.value("users").toArray()[0].toObject().value("_id").toString(); - callback(userId); - return true; - }); - - request.execute(); - return; -} - -} // namespace chatterino