From 22bf008bdfb494a79931b25fb3cfbf79da090130 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 11:03:25 +0000 Subject: [PATCH 1/7] Update new settings library version --- lib/settings | 2 +- src/common/ChatterinoSetting.hpp | 2 +- src/main.cpp | 2 +- src/singletons/Settings.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/settings b/lib/settings index 29accdf9..0be7cf24 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 29accdf9dea05947d687112594ad06bf6001ee0a +Subproject commit 0be7cf24b80cb9b7c1063fde2798f05d735278dd diff --git a/src/common/ChatterinoSetting.hpp b/src/common/ChatterinoSetting.hpp index 22661038..370f5841 100644 --- a/src/common/ChatterinoSetting.hpp +++ b/src/common/ChatterinoSetting.hpp @@ -41,7 +41,7 @@ public: using pajlada::Settings::Setting::operator==; using pajlada::Settings::Setting::operator!=; - using pajlada::Settings::Setting::operator const Type; + using pajlada::Settings::Setting::operator Type; }; using BoolSetting = ChatterinoSetting; diff --git a/src/main.cpp b/src/main.cpp index aa7e53ac..9be01412 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,7 +128,7 @@ int runGui(QApplication &a, int argc, char *argv[]) QFile::remove(runningPath); // Save settings - pajlada::Settings::SettingManager::save(); + pajlada::Settings::SettingManager::gSave(); // Deinitialize NetworkManager (stop thread and wait for finish, should be instant) chatterino::NetworkManager::deinit(); diff --git a/src/singletons/Settings.cpp b/src/singletons/Settings.cpp index d2c1718c..79398197 100644 --- a/src/singletons/Settings.cpp +++ b/src/singletons/Settings.cpp @@ -35,7 +35,7 @@ void Settings::load() { QString settingsPath = getPaths()->settingsDirectory + "/settings.json"; - pajlada::Settings::SettingManager::load(qPrintable(settingsPath)); + pajlada::Settings::SettingManager::gLoad(qPrintable(settingsPath)); } void Settings::saveSnapshot() From fc5186a4993712e911c2b79edee8b60cd712affe Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 11:03:41 +0000 Subject: [PATCH 2/7] Remove invalid warning for gcc --- chatterino.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatterino.pro b/chatterino.pro index a7450cc8..1a3cd6d4 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -452,7 +452,6 @@ win32-msvc* { QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-private-field # Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing @@ -461,6 +460,7 @@ win32-msvc* { equals(QMAKE_CXX, "clang++") { QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-private-field } else { QMAKE_CXXFLAGS_WARN_ON += -Wno-class-memaccess } From c995e2bf0de6512356f28f4f60074706ad6686e1 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 11:10:23 +0000 Subject: [PATCH 3/7] Remove unused code --- src/providers/twitch/TwitchMessageBuilder.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index 73defdf4..de5c4003 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -216,11 +216,6 @@ MessagePtr TwitchMessageBuilder::build() // Actually just text QString linkString = this->matchLink(string); - auto fontStyle = FontStyle::ChatMedium; - - if (string.startsWith('@') && app->settings->enableUsernameBold) { - fontStyle = FontStyle::ChatMediumBold; - } Link link; From bfe6b90877c01dcdb94c8933c60c2b2d88092f0b Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 11:56:04 +0000 Subject: [PATCH 4/7] update settings and signals library versions --- lib/settings | 2 +- lib/signals | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/settings b/lib/settings index 0be7cf24..7fdd1db2 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 0be7cf24b80cb9b7c1063fde2798f05d735278dd +Subproject commit 7fdd1db22ff18cb0cb0d82e70ea1e26a596beef2 diff --git a/lib/signals b/lib/signals index 3f6645c6..e03c868e 160000 --- a/lib/signals +++ b/lib/signals @@ -1 +1 @@ -Subproject commit 3f6645c615ff7bf412c05fe322e589cbdd34ff9b +Subproject commit e03c868ec922027a0e672b64388808beb1297816 From f1af162dabee0617ef4e549429013aac0e47dbaa Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 12:03:41 +0000 Subject: [PATCH 5/7] clean up some includes --- src/singletons/Fonts.cpp | 8 ++++---- src/singletons/NativeMessaging.cpp | 2 +- src/singletons/Resources.cpp | 8 ++++++-- src/singletons/Theme.cpp | 2 +- src/singletons/WindowManager.cpp | 5 ++--- src/singletons/WindowManager.hpp | 3 +-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/singletons/Fonts.cpp b/src/singletons/Fonts.cpp index 2760723e..70aaa93b 100644 --- a/src/singletons/Fonts.cpp +++ b/src/singletons/Fonts.cpp @@ -1,12 +1,12 @@ #include "singletons/Fonts.hpp" +#include "Application.hpp" +#include "debug/AssertInGuiThread.hpp" +#include "singletons/WindowManager.hpp" + #include #include -#include "Application.hpp" -#include "WindowManager.hpp" -#include "debug/AssertInGuiThread.hpp" - #ifdef Q_OS_WIN32 #define DEFAULT_FONT_FAMILY "Segoe UI" #define DEFAULT_FONT_SIZE 10 diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp index 60226433..805f0f38 100644 --- a/src/singletons/NativeMessaging.cpp +++ b/src/singletons/NativeMessaging.cpp @@ -1,4 +1,4 @@ -#include "NativeMessaging.hpp" +#include "singletons/NativeMessaging.hpp" #include "Application.hpp" #include "providers/twitch/TwitchServer.hpp" diff --git a/src/singletons/Resources.cpp b/src/singletons/Resources.cpp index fdbbf9bb..4b05b718 100644 --- a/src/singletons/Resources.cpp +++ b/src/singletons/Resources.cpp @@ -1,8 +1,12 @@ -#include "Resources.hpp" -#include "common/UrlFetch.hpp" +#include "singletons/Resources.hpp" +#include "common/NetworkRequest.hpp" + +#include #include +#include #include +#include namespace chatterino { diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp index 38c864c3..b20a7987 100644 --- a/src/singletons/Theme.cpp +++ b/src/singletons/Theme.cpp @@ -1,6 +1,6 @@ #define LOOKUP_COLOR_COUNT 360 -#include "Theme.hpp" +#include "singletons/Theme.hpp" #include diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 7dc3b742..2e43f7d1 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -1,4 +1,4 @@ -#include "WindowManager.hpp" +#include "singletons/WindowManager.hpp" #include "Application.hpp" #include "debug/AssertInGuiThread.hpp" @@ -11,12 +11,11 @@ #include "widgets/AccountSwitchPopupWidget.hpp" #include "widgets/dialogs/SettingsDialog.hpp" +#include #include #include #include -#include - #define SETTINGS_FILENAME "/window-layout.json" namespace chatterino { diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp index 217bf737..93a58607 100644 --- a/src/singletons/WindowManager.hpp +++ b/src/singletons/WindowManager.hpp @@ -1,7 +1,6 @@ #pragma once -#include - +#include "common/Singleton.hpp" #include "widgets/Window.hpp" #include "widgets/splits/SplitContainer.hpp" From f60d649f5eba89c2856cd07fda7a0f56e0369361 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 12:11:46 +0000 Subject: [PATCH 6/7] Remove UrlFetch file --- chatterino.pro | 1 - src/common/UrlFetch.hpp | 36 -------------------------- src/messages/Image.cpp | 3 +-- src/providers/bttv/BttvEmotes.cpp | 2 +- src/providers/ffz/FfzEmotes.cpp | 2 +- src/providers/twitch/TwitchAccount.cpp | 1 - src/providers/twitch/TwitchChannel.cpp | 5 ++-- src/providers/twitch/TwitchEmotes.cpp | 2 +- src/widgets/dialogs/LoginDialog.cpp | 2 +- src/widgets/dialogs/UserInfoPopup.cpp | 7 +++-- src/widgets/splits/Split.cpp | 3 ++- src/widgets/splits/SplitHeader.cpp | 5 +--- src/widgets/splits/SplitInput.cpp | 1 - 13 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 src/common/UrlFetch.hpp diff --git a/chatterino.pro b/chatterino.pro index 1a3cd6d4..82c4f5db 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -256,7 +256,6 @@ HEADERS += \ src/common/ProviderId.hpp \ src/common/SerializeCustom.hpp \ src/common/SignalVectorModel.hpp \ - src/common/UrlFetch.hpp \ src/common/Version.hpp \ src/controllers/accounts/Account.hpp \ src/controllers/accounts/AccountController.hpp \ diff --git a/src/common/UrlFetch.hpp b/src/common/UrlFetch.hpp deleted file mode 100644 index 5e27fd3d..00000000 --- a/src/common/UrlFetch.hpp +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "common/NetworkRequest.hpp" - -#include -#include - -namespace chatterino { - -// Not sure if I like these, but I'm trying them out - -static NetworkRequest makeGetChannelRequest(const QString &channelId, - const QObject *caller = nullptr) -{ - QString url("https://api.twitch.tv/kraken/channels/" + channelId); - - auto request = NetworkRequest::twitchRequest(url); - - request.setCaller(caller); - - return request; -} - -static NetworkRequest makeGetStreamRequest(const QString &channelId, - const QObject *caller = nullptr) -{ - QString url("https://api.twitch.tv/kraken/streams/" + channelId); - - auto request = NetworkRequest::twitchRequest(url); - - request.setCaller(caller); - - return request; -} - -} // namespace chatterino diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp index 44b20432..11cd4525 100644 --- a/src/messages/Image.cpp +++ b/src/messages/Image.cpp @@ -1,8 +1,7 @@ #include "messages/Image.hpp" #include "Application.hpp" -#include "common/NetworkManager.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "debug/Log.hpp" #include "singletons/Emotes.hpp" #include "singletons/WindowManager.hpp" diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp index 8252ffe3..391be6e6 100644 --- a/src/providers/bttv/BttvEmotes.cpp +++ b/src/providers/bttv/BttvEmotes.cpp @@ -1,6 +1,6 @@ #include "providers/bttv/BttvEmotes.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "debug/Log.hpp" #include "messages/Image.hpp" diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp index 25fef15e..9fe7ac5c 100644 --- a/src/providers/ffz/FfzEmotes.cpp +++ b/src/providers/ffz/FfzEmotes.cpp @@ -1,6 +1,6 @@ #include "providers/ffz/FfzEmotes.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "debug/Log.hpp" #include "messages/Image.hpp" diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp index 695bc369..d5908166 100644 --- a/src/providers/twitch/TwitchAccount.cpp +++ b/src/providers/twitch/TwitchAccount.cpp @@ -1,7 +1,6 @@ #include "providers/twitch/TwitchAccount.hpp" #include "common/NetworkRequest.hpp" -#include "common/UrlFetch.hpp" #include "debug/Log.hpp" #include "providers/twitch/PartialTwitchUser.hpp" #include "providers/twitch/TwitchCommon.hpp" diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index 4c1285f6..5092caf0 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -1,7 +1,7 @@ #include "providers/twitch/TwitchChannel.hpp" #include "common/Common.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "controllers/accounts/AccountController.hpp" #include "debug/Log.hpp" #include "messages/Message.hpp" @@ -336,7 +336,8 @@ void TwitchChannel::refreshLiveStatus() std::weak_ptr weak = this->shared_from_this(); - auto request = makeGetStreamRequest(this->roomID, QThread::currentThread()); + auto request = NetworkRequest::twitchRequest(url); + request.setCaller(QThread::currentThread()); request.onSuccess([weak](auto result) { auto d = result.parseRapidJson(); diff --git a/src/providers/twitch/TwitchEmotes.cpp b/src/providers/twitch/TwitchEmotes.cpp index d067f320..3f94a80b 100644 --- a/src/providers/twitch/TwitchEmotes.cpp +++ b/src/providers/twitch/TwitchEmotes.cpp @@ -1,6 +1,6 @@ #include "providers/twitch/TwitchEmotes.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "debug/Benchmark.hpp" #include "debug/Log.hpp" #include "messages/Image.hpp" diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp index 14fa58dc..bee0e87b 100644 --- a/src/widgets/dialogs/LoginDialog.cpp +++ b/src/widgets/dialogs/LoginDialog.cpp @@ -1,7 +1,7 @@ #include "widgets/dialogs/LoginDialog.hpp" #include "common/Common.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "controllers/accounts/AccountController.hpp" #include "providers/twitch/PartialTwitchUser.hpp" diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index 02ae8670..edddede5 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -1,7 +1,7 @@ #include "UserInfoPopup.hpp" #include "Application.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "controllers/accounts/AccountController.hpp" #include "providers/twitch/PartialTwitchUser.hpp" #include "providers/twitch/TwitchChannel.hpp" @@ -250,7 +250,10 @@ void UserInfoPopup::updateUserData() this->userId_ = id; - auto request = makeGetChannelRequest(id, this); + QString url("https://api.twitch.tv/kraken/channels/" + id); + + auto request = NetworkRequest::twitchRequest(url); + request.setCaller(this); request.onSuccess([this](auto result) { auto obj = result.parseJson(); diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp index efa6fbc7..1ccdf63e 100644 --- a/src/widgets/splits/Split.cpp +++ b/src/widgets/splits/Split.cpp @@ -2,7 +2,7 @@ #include "Application.hpp" #include "common/Common.hpp" -#include "common/UrlFetch.hpp" +#include "common/NetworkRequest.hpp" #include "providers/twitch/EmoteValue.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchMessageBuilder.hpp" @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index e3793830..78251a30 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -1,7 +1,6 @@ #include "widgets/splits/SplitHeader.hpp" #include "Application.hpp" -#include "common/UrlFetch.hpp" #include "controllers/accounts/AccountController.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchServer.hpp" @@ -80,9 +79,7 @@ SplitHeader::SplitHeader(Split *_split) // dropdown->setScaleIndependantSize(23, 23); this->addDropdownItems(dropdown.getElement()); QObject::connect(dropdown.getElement(), &RippleEffectButton::leftMousePress, this, [this] { - QTimer::singleShot(80, [&, this] { - this->dropdownMenu_.popup(QCursor::pos()); - }); + QTimer::singleShot(80, [&, this] { this->dropdownMenu_.popup(QCursor::pos()); }); }); } diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp index 70efdd77..113a05d7 100644 --- a/src/widgets/splits/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -1,7 +1,6 @@ #include "widgets/splits/SplitInput.hpp" #include "Application.hpp" -#include "common/UrlFetch.hpp" #include "controllers/commands/CommandController.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchServer.hpp" From 9bfbdefd2f0972a738230d5b95a009f73b1dd933 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 15 Jul 2018 14:30:04 +0000 Subject: [PATCH 7/7] Update settings library version --- lib/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/settings b/lib/settings index 7fdd1db2..7f0db95f 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 7fdd1db22ff18cb0cb0d82e70ea1e26a596beef2 +Subproject commit 7f0db95f245fb726e756ecde15a800c0928b054b