improving TwitchChannel
This commit is contained in:
fourtf
+1
-1
@@ -15,7 +15,7 @@ BreakBeforeBraces: Custom
|
|||||||
AccessModifierOffset: -4
|
AccessModifierOffset: -4
|
||||||
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||||
AllowShortFunctionsOnASingleLine: false
|
AllowShortFunctionsOnASingleLine: false
|
||||||
AllowShortIfStatementsOnASingleLine: false
|
AllowShortIfStatementsOnASingleLine: true
|
||||||
AllowShortLoopsOnASingleLine: false
|
AllowShortLoopsOnASingleLine: false
|
||||||
DerivePointerBinding: false
|
DerivePointerBinding: false
|
||||||
BraceWrapping: {
|
BraceWrapping: {
|
||||||
|
|||||||
+480
-478
@@ -1,478 +1,480 @@
|
|||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
#
|
#
|
||||||
# Project created by QtCreator 2016-12-28T18:23:35
|
# Project created by QtCreator 2016-12-28T18:23:35
|
||||||
#
|
#
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
message(----)
|
message(----)
|
||||||
|
|
||||||
QT += widgets core gui network multimedia svg
|
QT += widgets core gui network multimedia svg
|
||||||
CONFIG += communi
|
CONFIG += communi
|
||||||
COMMUNI += core model util
|
COMMUNI += core model util
|
||||||
CONFIG += c++14
|
CONFIG += c++14
|
||||||
INCLUDEPATH += src/
|
INCLUDEPATH += src/
|
||||||
TARGET = chatterino
|
TARGET = chatterino
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
DEFINES += QT_DEPRECATED_WARNINGS
|
DEFINES += QT_DEPRECATED_WARNINGS
|
||||||
PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
|
PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
|
||||||
CONFIG += precompile_header
|
CONFIG += precompile_header
|
||||||
|
|
||||||
useBreakpad {
|
useBreakpad {
|
||||||
LIBS += -L$$PWD/lib/qBreakpad/handler/build
|
LIBS += -L$$PWD/lib/qBreakpad/handler/build
|
||||||
include(lib/qBreakpad/qBreakpad.pri)
|
include(lib/qBreakpad/qBreakpad.pri)
|
||||||
DEFINES += C_USE_BREAKPAD
|
DEFINES += C_USE_BREAKPAD
|
||||||
}
|
}
|
||||||
|
|
||||||
# https://bugreports.qt.io/browse/QTBUG-27018
|
# https://bugreports.qt.io/browse/QTBUG-27018
|
||||||
equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") {
|
equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") {
|
||||||
TARGET = bin/chatterino
|
TARGET = bin/chatterino
|
||||||
}
|
}
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
macx:ICON = resources/images/chatterino2.icns
|
macx:ICON = resources/images/chatterino2.icns
|
||||||
win32:RC_FILE = resources/windows.rc
|
win32:RC_FILE = resources/windows.rc
|
||||||
|
|
||||||
|
|
||||||
macx {
|
macx {
|
||||||
LIBS += -L/usr/local/lib
|
LIBS += -L/usr/local/lib
|
||||||
}
|
}
|
||||||
|
|
||||||
# Submodules
|
# Submodules
|
||||||
include(dependencies/rapidjson.pri)
|
include(dependencies/rapidjson.pri)
|
||||||
include(dependencies/settings.pri)
|
include(dependencies/settings.pri)
|
||||||
include(dependencies/signals.pri)
|
include(dependencies/signals.pri)
|
||||||
include(dependencies/humanize.pri)
|
include(dependencies/humanize.pri)
|
||||||
include(dependencies/fmt.pri)
|
include(dependencies/fmt.pri)
|
||||||
DEFINES += IRC_NAMESPACE=Communi
|
DEFINES += IRC_NAMESPACE=Communi
|
||||||
include(dependencies/libcommuni.pri)
|
include(dependencies/libcommuni.pri)
|
||||||
include(dependencies/websocketpp.pri)
|
include(dependencies/websocketpp.pri)
|
||||||
include(dependencies/openssl.pri)
|
include(dependencies/openssl.pri)
|
||||||
include(dependencies/boost.pri)
|
include(dependencies/boost.pri)
|
||||||
|
|
||||||
# Optional feature: QtWebEngine
|
# Optional feature: QtWebEngine
|
||||||
#exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) {
|
#exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) {
|
||||||
# message(Using QWebEngine)
|
# message(Using QWebEngine)
|
||||||
# QT += webenginewidgets
|
# QT += webenginewidgets
|
||||||
# DEFINES += "USEWEBENGINE"
|
# DEFINES += "USEWEBENGINE"
|
||||||
#}
|
#}
|
||||||
|
|
||||||
linux {
|
linux {
|
||||||
LIBS += -lrt
|
LIBS += -lrt
|
||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
LIBS += -luser32
|
LIBS += -luser32
|
||||||
}
|
}
|
||||||
|
|
||||||
# OSX include directory
|
# OSX include directory
|
||||||
macx {
|
macx {
|
||||||
INCLUDEPATH += /usr/local/include
|
INCLUDEPATH += /usr/local/include
|
||||||
}
|
}
|
||||||
|
|
||||||
# Optional dependency on Windows SDK 7
|
# Optional dependency on Windows SDK 7
|
||||||
!contains(QMAKE_TARGET.arch, x86_64) {
|
!contains(QMAKE_TARGET.arch, x86_64) {
|
||||||
win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) {
|
win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) {
|
||||||
LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \
|
LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \
|
||||||
-ldwmapi
|
-ldwmapi
|
||||||
|
|
||||||
DEFINES += "USEWINSDK"
|
DEFINES += "USEWINSDK"
|
||||||
message(Using Windows SDK 7)
|
message(Using Windows SDK 7)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Optional dependency on Windows SDK 10
|
# Optional dependency on Windows SDK 10
|
||||||
contains(QMAKE_TARGET.arch, x86_64) {
|
contains(QMAKE_TARGET.arch, x86_64) {
|
||||||
WIN_SDK_VERSION = $$(WindowsSDKVersion)
|
WIN_SDK_VERSION = $$(WindowsSDKVersion)
|
||||||
!isEmpty(WIN_SDK_VERSION) {
|
!isEmpty(WIN_SDK_VERSION) {
|
||||||
!equals(WIN_SDK_VERSION, "\\") {
|
!equals(WIN_SDK_VERSION, "\\") {
|
||||||
DEFINES += "USEWINSDK"
|
DEFINES += "USEWINSDK"
|
||||||
message(Using Windows SDK 10)
|
message(Using Windows SDK 10)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
werr {
|
werr {
|
||||||
QMAKE_CXXFLAGS += -Werror
|
QMAKE_CXXFLAGS += -Werror
|
||||||
|
|
||||||
message("Enabling error on warning")
|
message("Enabling error on warning")
|
||||||
}
|
}
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
src/Application.cpp \
|
src/Application.cpp \
|
||||||
src/common/Channel.cpp \
|
src/common/Channel.cpp \
|
||||||
src/common/CompletionModel.cpp \
|
src/common/CompletionModel.cpp \
|
||||||
src/common/Emotemap.cpp \
|
src/common/Emotemap.cpp \
|
||||||
src/common/NetworkData.cpp \
|
src/common/NetworkData.cpp \
|
||||||
src/common/NetworkManager.cpp \
|
src/common/NetworkManager.cpp \
|
||||||
src/common/NetworkRequest.cpp \
|
src/common/NetworkRequest.cpp \
|
||||||
src/common/NetworkResult.cpp \
|
src/common/NetworkResult.cpp \
|
||||||
src/common/NetworkTimer.cpp \
|
src/common/NetworkTimer.cpp \
|
||||||
src/controllers/accounts/Account.cpp \
|
src/controllers/accounts/Account.cpp \
|
||||||
src/controllers/accounts/AccountController.cpp \
|
src/controllers/accounts/AccountController.cpp \
|
||||||
src/controllers/accounts/AccountModel.cpp \
|
src/controllers/accounts/AccountModel.cpp \
|
||||||
src/controllers/commands/Command.cpp \
|
src/controllers/commands/Command.cpp \
|
||||||
src/controllers/commands/CommandController.cpp \
|
src/controllers/commands/CommandController.cpp \
|
||||||
src/controllers/commands/CommandModel.cpp \
|
src/controllers/commands/CommandModel.cpp \
|
||||||
src/controllers/highlights/HighlightController.cpp \
|
src/controllers/highlights/HighlightController.cpp \
|
||||||
src/controllers/highlights/HighlightModel.cpp \
|
src/controllers/highlights/HighlightModel.cpp \
|
||||||
src/controllers/highlights/HighlightBlacklistModel.cpp \
|
src/controllers/highlights/HighlightBlacklistModel.cpp \
|
||||||
src/controllers/highlights/UserHighlightModel.cpp \
|
src/controllers/highlights/UserHighlightModel.cpp \
|
||||||
src/controllers/ignores/IgnoreController.cpp \
|
src/controllers/ignores/IgnoreController.cpp \
|
||||||
src/controllers/ignores/IgnoreModel.cpp \
|
src/controllers/ignores/IgnoreModel.cpp \
|
||||||
src/controllers/taggedusers/TaggedUser.cpp \
|
src/controllers/taggedusers/TaggedUser.cpp \
|
||||||
src/controllers/taggedusers/TaggedUsersController.cpp \
|
src/controllers/taggedusers/TaggedUsersController.cpp \
|
||||||
src/controllers/taggedusers/TaggedUsersModel.cpp \
|
src/controllers/taggedusers/TaggedUsersModel.cpp \
|
||||||
src/main.cpp \
|
src/main.cpp \
|
||||||
src/messages/Image.cpp \
|
src/messages/Image.cpp \
|
||||||
src/messages/layouts/MessageLayout.cpp \
|
src/messages/layouts/MessageLayout.cpp \
|
||||||
src/messages/layouts/MessageLayoutContainer.cpp \
|
src/messages/layouts/MessageLayoutContainer.cpp \
|
||||||
src/messages/layouts/MessageLayoutElement.cpp \
|
src/messages/layouts/MessageLayoutElement.cpp \
|
||||||
src/messages/Link.cpp \
|
src/messages/Link.cpp \
|
||||||
src/messages/Message.cpp \
|
src/messages/Message.cpp \
|
||||||
src/messages/MessageBuilder.cpp \
|
src/messages/MessageBuilder.cpp \
|
||||||
src/messages/MessageColor.cpp \
|
src/messages/MessageColor.cpp \
|
||||||
src/messages/MessageElement.cpp \
|
src/messages/MessageElement.cpp \
|
||||||
src/providers/bttv/BttvEmotes.cpp \
|
src/providers/bttv/BttvEmotes.cpp \
|
||||||
src/providers/emoji/Emojis.cpp \
|
src/providers/emoji/Emojis.cpp \
|
||||||
src/providers/ffz/FfzEmotes.cpp \
|
src/providers/ffz/FfzEmotes.cpp \
|
||||||
src/providers/irc/AbstractIrcServer.cpp \
|
src/providers/irc/AbstractIrcServer.cpp \
|
||||||
src/providers/irc/IrcAccount.cpp \
|
src/providers/irc/IrcAccount.cpp \
|
||||||
src/providers/irc/IrcChannel2.cpp \
|
src/providers/irc/IrcChannel2.cpp \
|
||||||
src/providers/irc/IrcConnection2.cpp \
|
src/providers/irc/IrcConnection2.cpp \
|
||||||
src/providers/irc/IrcServer.cpp \
|
src/providers/irc/IrcServer.cpp \
|
||||||
src/providers/twitch/IrcMessageHandler.cpp \
|
src/providers/twitch/IrcMessageHandler.cpp \
|
||||||
src/providers/twitch/PartialTwitchUser.cpp \
|
src/providers/twitch/PartialTwitchUser.cpp \
|
||||||
src/providers/twitch/PubsubActions.cpp \
|
src/providers/twitch/PubsubActions.cpp \
|
||||||
src/providers/twitch/PubsubHelpers.cpp \
|
src/providers/twitch/PubsubHelpers.cpp \
|
||||||
src/providers/twitch/TwitchAccount.cpp \
|
src/providers/twitch/TwitchAccount.cpp \
|
||||||
src/providers/twitch/TwitchAccountManager.cpp \
|
src/providers/twitch/TwitchAccountManager.cpp \
|
||||||
src/providers/twitch/TwitchChannel.cpp \
|
src/providers/twitch/TwitchChannel.cpp \
|
||||||
src/providers/twitch/TwitchEmotes.cpp \
|
src/providers/twitch/TwitchEmotes.cpp \
|
||||||
src/providers/twitch/TwitchHelpers.cpp \
|
src/providers/twitch/TwitchHelpers.cpp \
|
||||||
src/providers/twitch/TwitchMessageBuilder.cpp \
|
src/providers/twitch/TwitchMessageBuilder.cpp \
|
||||||
src/providers/twitch/TwitchServer.cpp \
|
src/providers/twitch/TwitchServer.cpp \
|
||||||
src/providers/twitch/TwitchUser.cpp \
|
src/providers/twitch/TwitchUser.cpp \
|
||||||
src/common/ChatterinoSetting.cpp \
|
src/common/ChatterinoSetting.cpp \
|
||||||
src/singletons/helper/GifTimer.cpp \
|
src/singletons/helper/GifTimer.cpp \
|
||||||
src/singletons/helper/LoggingChannel.cpp \
|
src/singletons/helper/LoggingChannel.cpp \
|
||||||
src/controllers/moderationactions/ModerationAction.cpp \
|
src/controllers/moderationactions/ModerationAction.cpp \
|
||||||
src/singletons/WindowManager.cpp \
|
src/singletons/WindowManager.cpp \
|
||||||
src/util/DebugCount.cpp \
|
src/util/DebugCount.cpp \
|
||||||
src/util/RapidjsonHelpers.cpp \
|
src/util/RapidjsonHelpers.cpp \
|
||||||
src/util/StreamLink.cpp \
|
src/util/StreamLink.cpp \
|
||||||
src/util/WindowsHelper.cpp \
|
src/util/WindowsHelper.cpp \
|
||||||
src/widgets/AccountSwitchPopupWidget.cpp \
|
src/widgets/AccountSwitchPopupWidget.cpp \
|
||||||
src/widgets/AccountSwitchWidget.cpp \
|
src/widgets/AccountSwitchWidget.cpp \
|
||||||
src/widgets/AttachedWindow.cpp \
|
src/widgets/AttachedWindow.cpp \
|
||||||
src/widgets/BaseWidget.cpp \
|
src/widgets/BaseWidget.cpp \
|
||||||
src/widgets/BaseWindow.cpp \
|
src/widgets/BaseWindow.cpp \
|
||||||
src/widgets/dialogs/EmotePopup.cpp \
|
src/widgets/dialogs/EmotePopup.cpp \
|
||||||
src/widgets/dialogs/LastRunCrashDialog.cpp \
|
src/widgets/dialogs/LastRunCrashDialog.cpp \
|
||||||
src/widgets/dialogs/LoginDialog.cpp \
|
src/widgets/dialogs/LoginDialog.cpp \
|
||||||
src/widgets/dialogs/LogsPopup.cpp \
|
src/widgets/dialogs/LogsPopup.cpp \
|
||||||
src/widgets/dialogs/NotificationPopup.cpp \
|
src/widgets/dialogs/NotificationPopup.cpp \
|
||||||
src/widgets/dialogs/QualityPopup.cpp \
|
src/widgets/dialogs/QualityPopup.cpp \
|
||||||
src/widgets/dialogs/SelectChannelDialog.cpp \
|
src/widgets/dialogs/SelectChannelDialog.cpp \
|
||||||
src/widgets/dialogs/SettingsDialog.cpp \
|
src/widgets/dialogs/SettingsDialog.cpp \
|
||||||
src/widgets/dialogs/TextInputDialog.cpp \
|
src/widgets/dialogs/TextInputDialog.cpp \
|
||||||
src/widgets/dialogs/UserInfoPopup.cpp \
|
src/widgets/dialogs/UserInfoPopup.cpp \
|
||||||
src/widgets/dialogs/WelcomeDialog.cpp \
|
src/widgets/dialogs/WelcomeDialog.cpp \
|
||||||
src/widgets/helper/ChannelView.cpp \
|
src/widgets/helper/ChannelView.cpp \
|
||||||
src/widgets/helper/ComboBoxItemDelegate.cpp \
|
src/widgets/helper/ComboBoxItemDelegate.cpp \
|
||||||
src/widgets/helper/DebugPopup.cpp \
|
src/widgets/helper/DebugPopup.cpp \
|
||||||
src/widgets/helper/EditableModelView.cpp \
|
src/widgets/helper/EditableModelView.cpp \
|
||||||
src/widgets/helper/NotebookButton.cpp \
|
src/widgets/helper/NotebookButton.cpp \
|
||||||
src/widgets/helper/NotebookTab.cpp \
|
src/widgets/helper/NotebookTab.cpp \
|
||||||
src/widgets/helper/ResizingTextEdit.cpp \
|
src/widgets/helper/ResizingTextEdit.cpp \
|
||||||
src/widgets/helper/RippleEffectButton.cpp \
|
src/widgets/helper/RippleEffectButton.cpp \
|
||||||
src/widgets/helper/RippleEffectLabel.cpp \
|
src/widgets/helper/RippleEffectLabel.cpp \
|
||||||
src/widgets/helper/ScrollbarHighlight.cpp \
|
src/widgets/helper/ScrollbarHighlight.cpp \
|
||||||
src/widgets/helper/SearchPopup.cpp \
|
src/widgets/helper/SearchPopup.cpp \
|
||||||
src/widgets/helper/SettingsDialogTab.cpp \
|
src/widgets/helper/SettingsDialogTab.cpp \
|
||||||
src/widgets/helper/SignalLabel.cpp \
|
src/widgets/helper/SignalLabel.cpp \
|
||||||
src/widgets/helper/TitlebarButton.cpp \
|
src/widgets/helper/TitlebarButton.cpp \
|
||||||
src/widgets/Label.cpp \
|
src/widgets/Label.cpp \
|
||||||
src/widgets/Notebook.cpp \
|
src/widgets/Notebook.cpp \
|
||||||
src/widgets/Scrollbar.cpp \
|
src/widgets/Scrollbar.cpp \
|
||||||
src/widgets/settingspages/AboutPage.cpp \
|
src/widgets/settingspages/AboutPage.cpp \
|
||||||
src/widgets/settingspages/AccountsPage.cpp \
|
src/widgets/settingspages/AccountsPage.cpp \
|
||||||
src/widgets/settingspages/BrowserExtensionPage.cpp \
|
src/widgets/settingspages/BrowserExtensionPage.cpp \
|
||||||
src/widgets/settingspages/CommandPage.cpp \
|
src/widgets/settingspages/CommandPage.cpp \
|
||||||
src/widgets/settingspages/EmotesPage.cpp \
|
src/widgets/settingspages/EmotesPage.cpp \
|
||||||
src/widgets/settingspages/ExternalToolsPage.cpp \
|
src/widgets/settingspages/ExternalToolsPage.cpp \
|
||||||
src/widgets/settingspages/HighlightingPage.cpp \
|
src/widgets/settingspages/HighlightingPage.cpp \
|
||||||
src/widgets/settingspages/KeyboardSettingsPage.cpp \
|
src/widgets/settingspages/KeyboardSettingsPage.cpp \
|
||||||
src/widgets/settingspages/LogsPage.cpp \
|
src/widgets/settingspages/LogsPage.cpp \
|
||||||
src/widgets/settingspages/ModerationPage.cpp \
|
src/widgets/settingspages/ModerationPage.cpp \
|
||||||
src/widgets/settingspages/SettingsPage.cpp \
|
src/widgets/settingspages/SettingsPage.cpp \
|
||||||
src/widgets/settingspages/SpecialChannelsPage.cpp \
|
src/widgets/settingspages/SpecialChannelsPage.cpp \
|
||||||
src/widgets/splits/Split.cpp \
|
src/widgets/splits/Split.cpp \
|
||||||
src/widgets/splits/SplitContainer.cpp \
|
src/widgets/splits/SplitContainer.cpp \
|
||||||
src/widgets/splits/SplitHeader.cpp \
|
src/widgets/splits/SplitHeader.cpp \
|
||||||
src/widgets/splits/SplitInput.cpp \
|
src/widgets/splits/SplitInput.cpp \
|
||||||
src/widgets/splits/SplitOverlay.cpp \
|
src/widgets/splits/SplitOverlay.cpp \
|
||||||
src/widgets/StreamView.cpp \
|
src/widgets/StreamView.cpp \
|
||||||
src/widgets/TooltipWidget.cpp \
|
src/widgets/TooltipWidget.cpp \
|
||||||
src/widgets/Window.cpp \
|
src/widgets/Window.cpp \
|
||||||
src/common/LinkParser.cpp \
|
src/common/LinkParser.cpp \
|
||||||
src/controllers/moderationactions/ModerationActions.cpp \
|
src/controllers/moderationactions/ModerationActions.cpp \
|
||||||
src/singletons/NativeMessaging.cpp \
|
src/singletons/NativeMessaging.cpp \
|
||||||
src/singletons/Emotes.cpp \
|
src/singletons/Emotes.cpp \
|
||||||
src/singletons/Fonts.cpp \
|
src/singletons/Fonts.cpp \
|
||||||
src/singletons/Logging.cpp \
|
src/singletons/Logging.cpp \
|
||||||
src/singletons/Paths.cpp \
|
src/singletons/Paths.cpp \
|
||||||
src/singletons/Resources.cpp \
|
src/singletons/Resources.cpp \
|
||||||
src/singletons/Settings.cpp \
|
src/singletons/Settings.cpp \
|
||||||
src/singletons/Updates.cpp \
|
src/singletons/Updates.cpp \
|
||||||
src/singletons/Theme.cpp \
|
src/singletons/Theme.cpp \
|
||||||
src/controllers/moderationactions/ModerationActionModel.cpp \
|
src/controllers/moderationactions/ModerationActionModel.cpp \
|
||||||
src/widgets/settingspages/LookPage.cpp \
|
src/widgets/settingspages/LookPage.cpp \
|
||||||
src/widgets/settingspages/FeelPage.cpp \
|
src/widgets/settingspages/FeelPage.cpp \
|
||||||
src/util/InitUpdateButton.cpp \
|
src/util/InitUpdateButton.cpp \
|
||||||
src/widgets/dialogs/UpdateDialog.cpp \
|
src/widgets/dialogs/UpdateDialog.cpp \
|
||||||
src/widgets/settingspages/IgnoresPage.cpp \
|
src/widgets/settingspages/IgnoresPage.cpp \
|
||||||
src/providers/twitch/PubsubClient.cpp \
|
src/providers/twitch/PubsubClient.cpp \
|
||||||
src/providers/twitch/TwitchApi.cpp
|
src/providers/twitch/TwitchApi.cpp \
|
||||||
|
src/common/uniqueaccess.cpp
|
||||||
HEADERS += \
|
|
||||||
src/Application.hpp \
|
HEADERS += \
|
||||||
src/common/Channel.hpp \
|
src/Application.hpp \
|
||||||
src/common/Common.hpp \
|
src/common/Channel.hpp \
|
||||||
src/common/CompletionModel.hpp \
|
src/common/Common.hpp \
|
||||||
src/common/Emotemap.hpp \
|
src/common/CompletionModel.hpp \
|
||||||
src/common/FlagsEnum.hpp \
|
src/common/Emotemap.hpp \
|
||||||
src/common/LockedObject.hpp \
|
src/common/FlagsEnum.hpp \
|
||||||
src/common/MutexValue.hpp \
|
src/common/LockedObject.hpp \
|
||||||
src/common/NetworkCommon.hpp \
|
src/common/MutexValue.hpp \
|
||||||
src/common/NetworkData.hpp \
|
src/common/NetworkCommon.hpp \
|
||||||
src/common/NetworkManager.hpp \
|
src/common/NetworkData.hpp \
|
||||||
src/common/NetworkRequest.hpp \
|
src/common/NetworkManager.hpp \
|
||||||
src/common/NetworkRequester.hpp \
|
src/common/NetworkRequest.hpp \
|
||||||
src/common/NetworkResult.hpp \
|
src/common/NetworkRequester.hpp \
|
||||||
src/common/NetworkTimer.hpp \
|
src/common/NetworkResult.hpp \
|
||||||
src/common/NetworkWorker.hpp \
|
src/common/NetworkTimer.hpp \
|
||||||
src/common/NullablePtr.hpp \
|
src/common/NetworkWorker.hpp \
|
||||||
src/common/Property.hpp \
|
src/common/NullablePtr.hpp \
|
||||||
src/common/ProviderId.hpp \
|
src/common/Property.hpp \
|
||||||
src/common/SerializeCustom.hpp \
|
src/common/ProviderId.hpp \
|
||||||
src/common/SignalVectorModel.hpp \
|
src/common/SerializeCustom.hpp \
|
||||||
src/common/UrlFetch.hpp \
|
src/common/SignalVectorModel.hpp \
|
||||||
src/common/Version.hpp \
|
src/common/UrlFetch.hpp \
|
||||||
src/controllers/accounts/Account.hpp \
|
src/common/Version.hpp \
|
||||||
src/controllers/accounts/AccountController.hpp \
|
src/controllers/accounts/Account.hpp \
|
||||||
src/controllers/accounts/AccountModel.hpp \
|
src/controllers/accounts/AccountController.hpp \
|
||||||
src/controllers/commands/Command.hpp \
|
src/controllers/accounts/AccountModel.hpp \
|
||||||
src/controllers/commands/CommandController.hpp \
|
src/controllers/commands/Command.hpp \
|
||||||
src/controllers/commands/CommandModel.hpp \
|
src/controllers/commands/CommandController.hpp \
|
||||||
src/controllers/highlights/HighlightController.hpp \
|
src/controllers/commands/CommandModel.hpp \
|
||||||
src/controllers/highlights/HighlightModel.hpp \
|
src/controllers/highlights/HighlightController.hpp \
|
||||||
src/controllers/highlights/HighlightBlacklistModel.hpp \
|
src/controllers/highlights/HighlightModel.hpp \
|
||||||
src/controllers/highlights/HighlightPhrase.hpp \
|
src/controllers/highlights/HighlightBlacklistModel.hpp \
|
||||||
src/controllers/highlights/HighlightBlacklistUser.hpp \
|
src/controllers/highlights/HighlightPhrase.hpp \
|
||||||
src/controllers/highlights/UserHighlightModel.hpp \
|
src/controllers/highlights/HighlightBlacklistUser.hpp \
|
||||||
src/controllers/ignores/IgnoreController.hpp \
|
src/controllers/highlights/UserHighlightModel.hpp \
|
||||||
src/controllers/ignores/IgnoreModel.hpp \
|
src/controllers/ignores/IgnoreController.hpp \
|
||||||
src/controllers/ignores/IgnorePhrase.hpp \
|
src/controllers/ignores/IgnoreModel.hpp \
|
||||||
src/controllers/taggedusers/TaggedUser.hpp \
|
src/controllers/ignores/IgnorePhrase.hpp \
|
||||||
src/controllers/taggedusers/TaggedUsersController.hpp \
|
src/controllers/taggedusers/TaggedUser.hpp \
|
||||||
src/controllers/taggedusers/TaggedUsersModel.hpp \
|
src/controllers/taggedusers/TaggedUsersController.hpp \
|
||||||
src/debug/AssertInGuiThread.hpp \
|
src/controllers/taggedusers/TaggedUsersModel.hpp \
|
||||||
src/debug/Benchmark.hpp \
|
src/debug/AssertInGuiThread.hpp \
|
||||||
src/debug/Log.hpp \
|
src/debug/Benchmark.hpp \
|
||||||
src/messages/Image.hpp \
|
src/debug/Log.hpp \
|
||||||
src/messages/layouts/MessageLayout.hpp \
|
src/messages/Image.hpp \
|
||||||
src/messages/layouts/MessageLayoutContainer.hpp \
|
src/messages/layouts/MessageLayout.hpp \
|
||||||
src/messages/layouts/MessageLayoutElement.hpp \
|
src/messages/layouts/MessageLayoutContainer.hpp \
|
||||||
src/messages/LimitedQueue.hpp \
|
src/messages/layouts/MessageLayoutElement.hpp \
|
||||||
src/messages/LimitedQueueSnapshot.hpp \
|
src/messages/LimitedQueue.hpp \
|
||||||
src/messages/Link.hpp \
|
src/messages/LimitedQueueSnapshot.hpp \
|
||||||
src/messages/Message.hpp \
|
src/messages/Link.hpp \
|
||||||
src/messages/MessageBuilder.hpp \
|
src/messages/Message.hpp \
|
||||||
src/messages/MessageColor.hpp \
|
src/messages/MessageBuilder.hpp \
|
||||||
src/messages/MessageElement.hpp \
|
src/messages/MessageColor.hpp \
|
||||||
src/messages/MessageParseArgs.hpp \
|
src/messages/MessageElement.hpp \
|
||||||
src/messages/Selection.hpp \
|
src/messages/MessageParseArgs.hpp \
|
||||||
src/PrecompiledHeader.hpp \
|
src/messages/Selection.hpp \
|
||||||
src/providers/bttv/BttvEmotes.hpp \
|
src/PrecompiledHeader.hpp \
|
||||||
src/providers/emoji/Emojis.hpp \
|
src/providers/bttv/BttvEmotes.hpp \
|
||||||
src/providers/ffz/FfzEmotes.hpp \
|
src/providers/emoji/Emojis.hpp \
|
||||||
src/providers/irc/AbstractIrcServer.hpp \
|
src/providers/ffz/FfzEmotes.hpp \
|
||||||
src/providers/irc/IrcAccount.hpp \
|
src/providers/irc/AbstractIrcServer.hpp \
|
||||||
src/providers/irc/IrcChannel2.hpp \
|
src/providers/irc/IrcAccount.hpp \
|
||||||
src/providers/irc/IrcConnection2.hpp \
|
src/providers/irc/IrcChannel2.hpp \
|
||||||
src/providers/irc/IrcServer.hpp \
|
src/providers/irc/IrcConnection2.hpp \
|
||||||
src/providers/twitch/EmoteValue.hpp \
|
src/providers/irc/IrcServer.hpp \
|
||||||
src/providers/twitch/IrcMessageHandler.hpp \
|
src/providers/twitch/EmoteValue.hpp \
|
||||||
src/providers/twitch/PartialTwitchUser.hpp \
|
src/providers/twitch/IrcMessageHandler.hpp \
|
||||||
src/providers/twitch/PubsubActions.hpp \
|
src/providers/twitch/PartialTwitchUser.hpp \
|
||||||
src/providers/twitch/PubsubHelpers.hpp \
|
src/providers/twitch/PubsubActions.hpp \
|
||||||
src/providers/twitch/TwitchAccount.hpp \
|
src/providers/twitch/PubsubHelpers.hpp \
|
||||||
src/providers/twitch/TwitchAccountManager.hpp \
|
src/providers/twitch/TwitchAccount.hpp \
|
||||||
src/providers/twitch/TwitchChannel.hpp \
|
src/providers/twitch/TwitchAccountManager.hpp \
|
||||||
src/providers/twitch/TwitchEmotes.hpp \
|
src/providers/twitch/TwitchChannel.hpp \
|
||||||
src/providers/twitch/TwitchHelpers.hpp \
|
src/providers/twitch/TwitchEmotes.hpp \
|
||||||
src/providers/twitch/TwitchMessageBuilder.hpp \
|
src/providers/twitch/TwitchHelpers.hpp \
|
||||||
src/providers/twitch/TwitchServer.hpp \
|
src/providers/twitch/TwitchMessageBuilder.hpp \
|
||||||
src/providers/twitch/TwitchUser.hpp \
|
src/providers/twitch/TwitchServer.hpp \
|
||||||
src/common/ChatterinoSetting.hpp \
|
src/providers/twitch/TwitchUser.hpp \
|
||||||
src/singletons/helper/GifTimer.hpp \
|
src/common/ChatterinoSetting.hpp \
|
||||||
src/singletons/helper/LoggingChannel.hpp \
|
src/singletons/helper/GifTimer.hpp \
|
||||||
src/controllers/moderationactions/ModerationAction.hpp \
|
src/singletons/helper/LoggingChannel.hpp \
|
||||||
src/singletons/WindowManager.hpp \
|
src/controllers/moderationactions/ModerationAction.hpp \
|
||||||
src/util/Clamp.hpp \
|
src/singletons/WindowManager.hpp \
|
||||||
src/util/CombinePath.hpp \
|
src/util/Clamp.hpp \
|
||||||
src/util/ConcurrentMap.hpp \
|
src/util/CombinePath.hpp \
|
||||||
src/util/DebugCount.hpp \
|
src/util/ConcurrentMap.hpp \
|
||||||
src/util/DistanceBetweenPoints.hpp \
|
src/util/DebugCount.hpp \
|
||||||
src/util/Helpers.hpp \
|
src/util/DistanceBetweenPoints.hpp \
|
||||||
src/util/IrcHelpers.hpp \
|
src/util/Helpers.hpp \
|
||||||
src/util/LayoutCreator.hpp \
|
src/util/IrcHelpers.hpp \
|
||||||
src/util/PostToThread.hpp \
|
src/util/LayoutCreator.hpp \
|
||||||
src/util/QStringHash.hpp \
|
src/util/PostToThread.hpp \
|
||||||
src/util/RapidjsonHelpers.hpp \
|
src/util/QStringHash.hpp \
|
||||||
src/util/RemoveScrollAreaBackground.hpp \
|
src/util/RapidjsonHelpers.hpp \
|
||||||
src/util/SharedPtrElementLess.hpp \
|
src/util/RemoveScrollAreaBackground.hpp \
|
||||||
src/util/StandardItemHelper.hpp \
|
src/util/SharedPtrElementLess.hpp \
|
||||||
src/util/StreamLink.hpp \
|
src/util/StandardItemHelper.hpp \
|
||||||
src/util/WindowsHelper.hpp \
|
src/util/StreamLink.hpp \
|
||||||
src/widgets/AccountSwitchPopupWidget.hpp \
|
src/util/WindowsHelper.hpp \
|
||||||
src/widgets/AccountSwitchWidget.hpp \
|
src/widgets/AccountSwitchPopupWidget.hpp \
|
||||||
src/widgets/AttachedWindow.hpp \
|
src/widgets/AccountSwitchWidget.hpp \
|
||||||
src/widgets/BaseWidget.hpp \
|
src/widgets/AttachedWindow.hpp \
|
||||||
src/widgets/BaseWindow.hpp \
|
src/widgets/BaseWidget.hpp \
|
||||||
src/widgets/dialogs/EmotePopup.hpp \
|
src/widgets/BaseWindow.hpp \
|
||||||
src/widgets/dialogs/LastRunCrashDialog.hpp \
|
src/widgets/dialogs/EmotePopup.hpp \
|
||||||
src/widgets/dialogs/LoginDialog.hpp \
|
src/widgets/dialogs/LastRunCrashDialog.hpp \
|
||||||
src/widgets/dialogs/LogsPopup.hpp \
|
src/widgets/dialogs/LoginDialog.hpp \
|
||||||
src/widgets/dialogs/NotificationPopup.hpp \
|
src/widgets/dialogs/LogsPopup.hpp \
|
||||||
src/widgets/dialogs/QualityPopup.hpp \
|
src/widgets/dialogs/NotificationPopup.hpp \
|
||||||
src/widgets/dialogs/SelectChannelDialog.hpp \
|
src/widgets/dialogs/QualityPopup.hpp \
|
||||||
src/widgets/dialogs/SettingsDialog.hpp \
|
src/widgets/dialogs/SelectChannelDialog.hpp \
|
||||||
src/widgets/dialogs/TextInputDialog.hpp \
|
src/widgets/dialogs/SettingsDialog.hpp \
|
||||||
src/widgets/dialogs/UserInfoPopup.hpp \
|
src/widgets/dialogs/TextInputDialog.hpp \
|
||||||
src/widgets/dialogs/WelcomeDialog.hpp \
|
src/widgets/dialogs/UserInfoPopup.hpp \
|
||||||
src/widgets/helper/ChannelView.hpp \
|
src/widgets/dialogs/WelcomeDialog.hpp \
|
||||||
src/widgets/helper/ComboBoxItemDelegate.hpp \
|
src/widgets/helper/ChannelView.hpp \
|
||||||
src/widgets/helper/DebugPopup.hpp \
|
src/widgets/helper/ComboBoxItemDelegate.hpp \
|
||||||
src/widgets/helper/EditableModelView.hpp \
|
src/widgets/helper/DebugPopup.hpp \
|
||||||
src/widgets/helper/Line.hpp \
|
src/widgets/helper/EditableModelView.hpp \
|
||||||
src/widgets/helper/NotebookButton.hpp \
|
src/widgets/helper/Line.hpp \
|
||||||
src/widgets/helper/NotebookTab.hpp \
|
src/widgets/helper/NotebookButton.hpp \
|
||||||
src/widgets/helper/ResizingTextEdit.hpp \
|
src/widgets/helper/NotebookTab.hpp \
|
||||||
src/widgets/helper/RippleEffectButton.hpp \
|
src/widgets/helper/ResizingTextEdit.hpp \
|
||||||
src/widgets/helper/RippleEffectLabel.hpp \
|
src/widgets/helper/RippleEffectButton.hpp \
|
||||||
src/widgets/helper/ScrollbarHighlight.hpp \
|
src/widgets/helper/RippleEffectLabel.hpp \
|
||||||
src/widgets/helper/SearchPopup.hpp \
|
src/widgets/helper/ScrollbarHighlight.hpp \
|
||||||
src/widgets/helper/SettingsDialogTab.hpp \
|
src/widgets/helper/SearchPopup.hpp \
|
||||||
src/widgets/helper/Shortcut.hpp \
|
src/widgets/helper/SettingsDialogTab.hpp \
|
||||||
src/widgets/helper/SignalLabel.hpp \
|
src/widgets/helper/Shortcut.hpp \
|
||||||
src/widgets/helper/TitlebarButton.hpp \
|
src/widgets/helper/SignalLabel.hpp \
|
||||||
src/widgets/Label.hpp \
|
src/widgets/helper/TitlebarButton.hpp \
|
||||||
src/widgets/Notebook.hpp \
|
src/widgets/Label.hpp \
|
||||||
src/widgets/Scrollbar.hpp \
|
src/widgets/Notebook.hpp \
|
||||||
src/widgets/settingspages/AboutPage.hpp \
|
src/widgets/Scrollbar.hpp \
|
||||||
src/widgets/settingspages/AccountsPage.hpp \
|
src/widgets/settingspages/AboutPage.hpp \
|
||||||
src/widgets/settingspages/BrowserExtensionPage.hpp \
|
src/widgets/settingspages/AccountsPage.hpp \
|
||||||
src/widgets/settingspages/CommandPage.hpp \
|
src/widgets/settingspages/BrowserExtensionPage.hpp \
|
||||||
src/widgets/settingspages/EmotesPage.hpp \
|
src/widgets/settingspages/CommandPage.hpp \
|
||||||
src/widgets/settingspages/ExternalToolsPage.hpp \
|
src/widgets/settingspages/EmotesPage.hpp \
|
||||||
src/widgets/settingspages/HighlightingPage.hpp \
|
src/widgets/settingspages/ExternalToolsPage.hpp \
|
||||||
src/widgets/settingspages/KeyboardSettingsPage.hpp \
|
src/widgets/settingspages/HighlightingPage.hpp \
|
||||||
src/widgets/settingspages/LogsPage.hpp \
|
src/widgets/settingspages/KeyboardSettingsPage.hpp \
|
||||||
src/widgets/settingspages/ModerationPage.hpp \
|
src/widgets/settingspages/LogsPage.hpp \
|
||||||
src/widgets/settingspages/SettingsPage.hpp \
|
src/widgets/settingspages/ModerationPage.hpp \
|
||||||
src/widgets/settingspages/SpecialChannelsPage.hpp \
|
src/widgets/settingspages/SettingsPage.hpp \
|
||||||
src/widgets/splits/Split.hpp \
|
src/widgets/settingspages/SpecialChannelsPage.hpp \
|
||||||
src/widgets/splits/SplitContainer.hpp \
|
src/widgets/splits/Split.hpp \
|
||||||
src/widgets/splits/SplitHeader.hpp \
|
src/widgets/splits/SplitContainer.hpp \
|
||||||
src/widgets/splits/SplitInput.hpp \
|
src/widgets/splits/SplitHeader.hpp \
|
||||||
src/widgets/splits/SplitOverlay.hpp \
|
src/widgets/splits/SplitInput.hpp \
|
||||||
src/widgets/StreamView.hpp \
|
src/widgets/splits/SplitOverlay.hpp \
|
||||||
src/widgets/TooltipWidget.hpp \
|
src/widgets/StreamView.hpp \
|
||||||
src/widgets/Window.hpp \
|
src/widgets/TooltipWidget.hpp \
|
||||||
src/providers/twitch/TwitchCommon.hpp \
|
src/widgets/Window.hpp \
|
||||||
src/util/IsBigEndian.hpp \
|
src/providers/twitch/TwitchCommon.hpp \
|
||||||
src/common/LinkParser.hpp \
|
src/util/IsBigEndian.hpp \
|
||||||
src/controllers/moderationactions/ModerationActions.hpp \
|
src/common/LinkParser.hpp \
|
||||||
src/singletons/Emotes.hpp \
|
src/controllers/moderationactions/ModerationActions.hpp \
|
||||||
src/singletons/Fonts.hpp \
|
src/singletons/Emotes.hpp \
|
||||||
src/singletons/Logging.hpp \
|
src/singletons/Fonts.hpp \
|
||||||
src/singletons/Paths.hpp \
|
src/singletons/Logging.hpp \
|
||||||
src/singletons/Resources.hpp \
|
src/singletons/Paths.hpp \
|
||||||
src/singletons/Settings.hpp \
|
src/singletons/Resources.hpp \
|
||||||
src/singletons/Updates.hpp \
|
src/singletons/Settings.hpp \
|
||||||
src/singletons/NativeMessaging.hpp \
|
src/singletons/Updates.hpp \
|
||||||
src/singletons/Theme.hpp \
|
src/singletons/NativeMessaging.hpp \
|
||||||
src/common/SimpleSignalVector.hpp \
|
src/singletons/Theme.hpp \
|
||||||
src/common/SignalVector.hpp \
|
src/common/SimpleSignalVector.hpp \
|
||||||
src/widgets/dialogs/LogsPopup.hpp \
|
src/common/SignalVector.hpp \
|
||||||
src/common/Singleton.hpp \
|
src/widgets/dialogs/LogsPopup.hpp \
|
||||||
src/controllers/moderationactions/ModerationActionModel.hpp \
|
src/common/Singleton.hpp \
|
||||||
src/widgets/settingspages/LookPage.hpp \
|
src/controllers/moderationactions/ModerationActionModel.hpp \
|
||||||
src/widgets/settingspages/FeelPage.hpp \
|
src/widgets/settingspages/LookPage.hpp \
|
||||||
src/util/InitUpdateButton.hpp \
|
src/widgets/settingspages/FeelPage.hpp \
|
||||||
src/widgets/dialogs/UpdateDialog.hpp \
|
src/util/InitUpdateButton.hpp \
|
||||||
src/widgets/settingspages/IgnoresPage.hpp \
|
src/widgets/dialogs/UpdateDialog.hpp \
|
||||||
src/providers/twitch/PubsubClient.hpp \
|
src/widgets/settingspages/IgnoresPage.hpp \
|
||||||
src/providers/twitch/TwitchApi.hpp
|
src/providers/twitch/PubsubClient.hpp \
|
||||||
|
src/providers/twitch/TwitchApi.hpp \
|
||||||
RESOURCES += \
|
src/common/uniqueaccess.hpp
|
||||||
resources/resources.qrc \
|
|
||||||
|
RESOURCES += \
|
||||||
DISTFILES +=
|
resources/resources.qrc \
|
||||||
|
|
||||||
FORMS +=
|
DISTFILES +=
|
||||||
|
|
||||||
# Define warning flags for Chatterino
|
FORMS +=
|
||||||
win32-msvc* {
|
|
||||||
QMAKE_CXXFLAGS_WARN_ON = /W4
|
# Define warning flags for Chatterino
|
||||||
# 4714 - function marked as __forceinline not inlined
|
win32-msvc* {
|
||||||
# 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
|
QMAKE_CXXFLAGS_WARN_ON = /W4
|
||||||
# These functions may have a different preferred name, may be insecure or have
|
# 4714 - function marked as __forceinline not inlined
|
||||||
# a more secure variant, or may be obsolete.
|
# 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
|
||||||
# 4505 - unreferenced local version has been removed
|
# These functions may have a different preferred name, may be insecure or have
|
||||||
# 4127 - conditional expression is constant
|
# a more secure variant, or may be obsolete.
|
||||||
# 4503 - decorated name length exceeded, name was truncated
|
# 4505 - unreferenced local version has been removed
|
||||||
# 4100 - unreferences formal parameter
|
# 4127 - conditional expression is constant
|
||||||
# 4305 - possible truncation of data
|
# 4503 - decorated name length exceeded, name was truncated
|
||||||
# 4267 - possible loss of data in return
|
# 4100 - unreferences formal parameter
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4714
|
# 4305 - possible truncation of data
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4996
|
# 4267 - possible loss of data in return
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4505
|
QMAKE_CXXFLAGS_WARN_ON += /wd4714
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4127
|
QMAKE_CXXFLAGS_WARN_ON += /wd4996
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4503
|
QMAKE_CXXFLAGS_WARN_ON += /wd4505
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4100
|
QMAKE_CXXFLAGS_WARN_ON += /wd4127
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4305
|
QMAKE_CXXFLAGS_WARN_ON += /wd4503
|
||||||
QMAKE_CXXFLAGS_WARN_ON += /wd4267
|
QMAKE_CXXFLAGS_WARN_ON += /wd4100
|
||||||
|
QMAKE_CXXFLAGS_WARN_ON += /wd4305
|
||||||
} else {
|
QMAKE_CXXFLAGS_WARN_ON += /wd4267
|
||||||
QMAKE_CXXFLAGS_WARN_ON = -Wall
|
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
} else {
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
|
QMAKE_CXXFLAGS_WARN_ON = -Wall
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-switch
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-private-field
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
||||||
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
||||||
# Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-private-field
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing
|
|
||||||
|
# Disabling strict-aliasing warnings for now, although we probably want to re-enable this in the future
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Werror=return-type
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing
|
||||||
|
|
||||||
equals(QMAKE_CXX, "clang++") {
|
QMAKE_CXXFLAGS_WARN_ON += -Werror=return-type
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef
|
|
||||||
} else {
|
equals(QMAKE_CXX, "clang++") {
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-class-memaccess
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef
|
||||||
}
|
} else {
|
||||||
}
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-class-memaccess
|
||||||
|
}
|
||||||
# do not use windows min/max macros
|
}
|
||||||
#win32 {
|
|
||||||
# DEFINES += NOMINMAX
|
# do not use windows min/max macros
|
||||||
#}
|
#win32 {
|
||||||
|
# DEFINES += NOMINMAX
|
||||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
#}
|
||||||
|
|
||||||
linux {
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
QMAKE_LFLAGS += -lrt
|
|
||||||
}
|
linux {
|
||||||
|
QMAKE_LFLAGS += -lrt
|
||||||
|
}
|
||||||
|
|||||||
@@ -215,4 +215,9 @@ void Channel::onConnected()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::weak_ptr<Channel> Channel::weak_from_this()
|
||||||
|
{
|
||||||
|
return std::weak_ptr<Channel>(this->shared_from_this());
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace chatterino
|
} // namespace chatterino
|
||||||
|
|||||||
@@ -65,6 +65,9 @@ public:
|
|||||||
|
|
||||||
CompletionModel completionModel;
|
CompletionModel completionModel;
|
||||||
|
|
||||||
|
// pre c++17 polyfill
|
||||||
|
std::weak_ptr<Channel> weak_from_this();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void onConnected();
|
virtual void onConnected();
|
||||||
|
|
||||||
|
|||||||
@@ -27,14 +27,14 @@ const Qt::KeyboardModifiers showResizeHandlesModifiers = Qt::ControlModifier;
|
|||||||
|
|
||||||
static const char *ANONYMOUS_USERNAME_LABEL ATTR_UNUSED = " - anonymous - ";
|
static const char *ANONYMOUS_USERNAME_LABEL ATTR_UNUSED = " - anonymous - ";
|
||||||
|
|
||||||
#define return_if(x) \
|
#define return_if(condition) \
|
||||||
if ((x)) { \
|
if ((condition)) { \
|
||||||
return; \
|
return; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define return_unless(x) \
|
#define return_unless(condition) \
|
||||||
if (!(x)) { \
|
if (!(condition)) { \
|
||||||
return; \
|
return; \
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace chatterino
|
} // namespace chatterino
|
||||||
|
|||||||
@@ -212,9 +212,7 @@ void NetworkRequest::doRequest()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray readBytes = reply->readAll();
|
QByteArray bytes = reply->readAll();
|
||||||
QByteArray bytes;
|
|
||||||
bytes.setRawData(readBytes.data(), readBytes.size());
|
|
||||||
data->writeToCache(bytes);
|
data->writeToCache(bytes);
|
||||||
|
|
||||||
NetworkResult result(bytes);
|
NetworkResult result(bytes);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ QJsonObject NetworkResult::parseJson() const
|
|||||||
|
|
||||||
rapidjson::Document NetworkResult::parseRapidJson() const
|
rapidjson::Document NetworkResult::parseRapidJson() const
|
||||||
{
|
{
|
||||||
rapidjson::Document ret(rapidjson::kNullType);
|
rapidjson::Document ret(rapidjson::kObjectType);
|
||||||
|
|
||||||
rapidjson::ParseResult result = ret.Parse(this->data_.data(), this->data_.length());
|
rapidjson::ParseResult result = ret.Parse(this->data_.data(), this->data_.length());
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
#include "uniqueaccess.hpp"
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <mutex>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
namespace chatterino {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
class AccessGuard
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
AccessGuard(T &element, std::mutex &mutex)
|
||||||
|
: element_(element)
|
||||||
|
, mutex_(mutex)
|
||||||
|
{
|
||||||
|
this->mutex_.lock();
|
||||||
|
}
|
||||||
|
|
||||||
|
~AccessGuard()
|
||||||
|
{
|
||||||
|
this->mutex_.unlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
T *operator->() const
|
||||||
|
{
|
||||||
|
return &this->element_;
|
||||||
|
}
|
||||||
|
|
||||||
|
T &operator*() const
|
||||||
|
{
|
||||||
|
return this->element_;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T &element_;
|
||||||
|
std::mutex &mutex_;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
class UniqueAccess
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
template <typename std::enable_if<std::is_default_constructible<T>::value>::type * = 0>
|
||||||
|
UniqueAccess()
|
||||||
|
: element_(T())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UniqueAccess(const T &element)
|
||||||
|
: element_(element)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UniqueAccess(T &&element)
|
||||||
|
: element_(element)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UniqueAccess<T> &operator=(const T &element)
|
||||||
|
{
|
||||||
|
this->element_ = element;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
UniqueAccess<T> &operator=(T &&element)
|
||||||
|
{
|
||||||
|
this->element_ = element;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
AccessGuard<T> access()
|
||||||
|
{
|
||||||
|
return AccessGuard<T>(this->element_, this->mutex_);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T element_;
|
||||||
|
std::mutex mutex_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace chatterino
|
||||||
@@ -85,18 +85,17 @@ void IrcMessageHandler::handleRoomStateMessage(Communi::IrcMessage *message)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
auto chan = app->twitch.server->getChannelOrEmpty(chanName);
|
auto chan = app->twitch.server->getChannelOrEmpty(chanName);
|
||||||
TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(chan.get());
|
|
||||||
|
|
||||||
if (twitchChannel) {
|
if (auto *twitchChannel = dynamic_cast<TwitchChannel *>(chan.get())) {
|
||||||
// room-id
|
// room-id
|
||||||
decltype(tags.find("xD")) it;
|
decltype(tags.find("xD")) it;
|
||||||
|
|
||||||
if ((it = tags.find("room-id")) != tags.end()) {
|
if ((it = tags.find("room-id")) != tags.end()) {
|
||||||
auto roomID = it.value().toString();
|
auto roomId = it.value().toString();
|
||||||
|
|
||||||
twitchChannel->setRoomID(roomID);
|
twitchChannel->setRoomID(roomId);
|
||||||
|
|
||||||
app->resources->loadChannelData(roomID);
|
app->resources->loadChannelData(roomId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Room modes
|
// Room modes
|
||||||
|
|||||||
@@ -513,7 +513,7 @@ void PubSub::listenToChannelModerationActions(const QString &channelID,
|
|||||||
assert(!channelID.isEmpty());
|
assert(!channelID.isEmpty());
|
||||||
assert(account != nullptr);
|
assert(account != nullptr);
|
||||||
QString userID = account->getUserId();
|
QString userID = account->getUserId();
|
||||||
assert(!userID.isEmpty());
|
if (userID.isEmpty()) return;
|
||||||
|
|
||||||
std::string topic(fS("chat_moderator_actions.{}.{}", userID, channelID));
|
std::string topic(fS("chat_moderator_actions.{}.{}", userID, channelID));
|
||||||
|
|
||||||
|
|||||||
@@ -31,78 +31,35 @@ TwitchChannel::TwitchChannel(const QString &channelName, Communi::IrcConnection
|
|||||||
{
|
{
|
||||||
Log("[TwitchChannel:{}] Opened", this->name);
|
Log("[TwitchChannel:{}] Opened", this->name);
|
||||||
|
|
||||||
this->startRefreshLiveStatusTimer(60 * 1000);
|
this->refreshChannelEmotes();
|
||||||
|
this->refreshViewerList();
|
||||||
|
|
||||||
auto app = getApp();
|
this->managedConnect(getApp()->accounts->twitch.currentUserChanged,
|
||||||
this->reloadChannelEmotes();
|
[=] { this->setMod(false); });
|
||||||
|
|
||||||
this->managedConnect(app->accounts->twitch.currentUserChanged,
|
// pubsub
|
||||||
[this]() { this->setMod(false); });
|
this->userStateChanged.connect([=] { this->refreshPubsub(); });
|
||||||
|
this->roomIDChanged.connect([=] { this->refreshPubsub(); });
|
||||||
|
this->managedConnect(getApp()->accounts->twitch.currentUserChanged,
|
||||||
|
[=] { this->refreshPubsub(); });
|
||||||
|
this->refreshPubsub();
|
||||||
|
|
||||||
auto refreshPubSubState = [=]() {
|
// room id loaded -> refresh live status
|
||||||
if (!this->hasModRights()) {
|
this->roomIDChanged.connect([this]() { this->refreshLiveStatus(); });
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->roomID.isEmpty()) {
|
// timers
|
||||||
return;
|
QObject::connect(&this->chattersListTimer_, &QTimer::timeout,
|
||||||
}
|
[=] { this->refreshViewerList(); });
|
||||||
|
this->chattersListTimer_.start(5 * 60 * 1000);
|
||||||
|
|
||||||
auto account = app->accounts->twitch.getCurrent();
|
QObject::connect(&this->liveStatusTimer_, &QTimer::timeout, [=] { this->refreshLiveStatus(); });
|
||||||
if (account && !account->getUserId().isEmpty()) {
|
this->liveStatusTimer_.start(60 * 1000);
|
||||||
app->twitch.pubsub->listenToChannelModerationActions(this->roomID, account);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
this->userStateChanged.connect(refreshPubSubState);
|
|
||||||
this->roomIDchanged.connect(refreshPubSubState);
|
|
||||||
this->managedConnect(app->accounts->twitch.currentUserChanged, refreshPubSubState);
|
|
||||||
refreshPubSubState();
|
|
||||||
|
|
||||||
this->fetchMessages.connect([this] {
|
|
||||||
this->fetchRecentMessages(); //
|
|
||||||
});
|
|
||||||
|
|
||||||
|
// --
|
||||||
this->messageSuffix_.append(' ');
|
this->messageSuffix_.append(' ');
|
||||||
this->messageSuffix_.append(QChar(0x206D));
|
this->messageSuffix_.append(QChar(0x206D));
|
||||||
|
|
||||||
static QStringList jsonLabels = {"moderators", "staff", "admins", "global_mods", "viewers"};
|
// debugging
|
||||||
auto refreshChatters = [=](QJsonObject obj) {
|
|
||||||
QJsonObject chattersObj = obj.value("chatters").toObject();
|
|
||||||
for (int i = 0; i < jsonLabels.size(); i++) {
|
|
||||||
foreach (const QJsonValue &v, chattersObj.value(jsonLabels.at(i)).toArray()) {
|
|
||||||
this->completionModel.addUser(v.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
auto doRefreshChatters = [=]() {
|
|
||||||
const auto streamStatus = this->getStreamStatus();
|
|
||||||
|
|
||||||
if (app->settings->onlyFetchChattersForSmallerStreamers) {
|
|
||||||
if (streamStatus.live && streamStatus.viewerCount > app->settings->smallStreamerLimit) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkRequest request("https://tmi.twitch.tv/group/user/" + this->name + "/chatters");
|
|
||||||
|
|
||||||
request.setCaller(QThread::currentThread());
|
|
||||||
request.onSuccess([refreshChatters](auto result) {
|
|
||||||
refreshChatters(result.parseJson()); //
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
request.execute();
|
|
||||||
};
|
|
||||||
|
|
||||||
doRefreshChatters();
|
|
||||||
|
|
||||||
this->chattersListTimer = new QTimer;
|
|
||||||
QObject::connect(this->chattersListTimer, &QTimer::timeout, doRefreshChatters);
|
|
||||||
this->chattersListTimer->start(5 * 60 * 1000);
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
for (int i = 0; i < 1000; i++) {
|
for (int i = 0; i < 1000; i++) {
|
||||||
this->addMessage(Message::createSystemMessage("asdf"));
|
this->addMessage(Message::createSystemMessage("asdf"));
|
||||||
@@ -110,15 +67,6 @@ TwitchChannel::TwitchChannel(const QString &channelName, Communi::IrcConnection
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
TwitchChannel::~TwitchChannel()
|
|
||||||
{
|
|
||||||
this->liveStatusTimer->stop();
|
|
||||||
this->liveStatusTimer->deleteLater();
|
|
||||||
|
|
||||||
this->chattersListTimer->stop();
|
|
||||||
this->chattersListTimer->deleteLater();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool TwitchChannel::isEmpty() const
|
bool TwitchChannel::isEmpty() const
|
||||||
{
|
{
|
||||||
return this->name.isEmpty();
|
return this->name.isEmpty();
|
||||||
@@ -129,14 +77,7 @@ bool TwitchChannel::canSendMessage() const
|
|||||||
return !this->isEmpty();
|
return !this->isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchChannel::setRoomID(const QString &_roomID)
|
void TwitchChannel::refreshChannelEmotes()
|
||||||
{
|
|
||||||
this->roomID = _roomID;
|
|
||||||
this->roomIDchanged.invoke();
|
|
||||||
this->fetchMessages.invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
void TwitchChannel::reloadChannelEmotes()
|
|
||||||
{
|
{
|
||||||
auto app = getApp();
|
auto app = getApp();
|
||||||
|
|
||||||
@@ -249,16 +190,16 @@ void TwitchChannel::addJoinedUser(const QString &user)
|
|||||||
|
|
||||||
void TwitchChannel::addPartedUser(const QString &user)
|
void TwitchChannel::addPartedUser(const QString &user)
|
||||||
{
|
{
|
||||||
auto *app = getApp();
|
auto app = getApp();
|
||||||
|
|
||||||
if (user == app->accounts->twitch.getCurrent()->getUserName() ||
|
if (user == app->accounts->twitch.getCurrent()->getUserName() ||
|
||||||
!app->settings->showJoins.getValue()) {
|
!getSettings()->showJoins.getValue()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::lock_guard<std::mutex> guard(this->partedUserMutex_);
|
std::lock_guard<std::mutex> guard(this->partedUserMutex_);
|
||||||
|
|
||||||
partedUsers_ << user;
|
this->partedUsers_ << user;
|
||||||
|
|
||||||
if (!this->partedUsersMergeQueued_) {
|
if (!this->partedUsersMergeQueued_) {
|
||||||
this->partedUsersMergeQueued_ = true;
|
this->partedUsersMergeQueued_ = true;
|
||||||
@@ -277,6 +218,18 @@ void TwitchChannel::addPartedUser(const QString &user)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString TwitchChannel::getRoomID() const
|
||||||
|
{
|
||||||
|
return this->roomID_.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TwitchChannel::setRoomID(const QString &id)
|
||||||
|
{
|
||||||
|
this->roomID_.set(id);
|
||||||
|
this->roomIDChanged.invoke();
|
||||||
|
this->loadRecentMessages();
|
||||||
|
}
|
||||||
|
|
||||||
TwitchChannel::RoomModes TwitchChannel::getRoomModes()
|
TwitchChannel::RoomModes TwitchChannel::getRoomModes()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(this->roomModeMutex_);
|
std::lock_guard<std::mutex> lock(this->roomModeMutex_);
|
||||||
@@ -318,13 +271,15 @@ void TwitchChannel::setLive(bool newLiveStatus)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (gotNewLiveStatus) {
|
if (gotNewLiveStatus) {
|
||||||
this->updateLiveInfo.invoke();
|
this->liveStatusChanged.invoke();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchChannel::refreshLiveStatus()
|
void TwitchChannel::refreshLiveStatus()
|
||||||
{
|
{
|
||||||
if (this->roomID.isEmpty()) {
|
auto roomID = this->getRoomID();
|
||||||
|
|
||||||
|
if (roomID.isEmpty()) {
|
||||||
Log("[TwitchChannel:{}] Refreshing live status (Missing ID)", this->name);
|
Log("[TwitchChannel:{}] Refreshing live status (Missing ID)", this->name);
|
||||||
this->setLive(false);
|
this->setLive(false);
|
||||||
return;
|
return;
|
||||||
@@ -332,13 +287,11 @@ void TwitchChannel::refreshLiveStatus()
|
|||||||
|
|
||||||
Log("[TwitchChannel:{}] Refreshing live status", this->name);
|
Log("[TwitchChannel:{}] Refreshing live status", this->name);
|
||||||
|
|
||||||
QString url("https://api.twitch.tv/kraken/streams/" + this->roomID);
|
QString url("https://api.twitch.tv/kraken/streams/" + roomID);
|
||||||
|
|
||||||
std::weak_ptr<Channel> weak = this->shared_from_this();
|
auto request = makeGetStreamRequest(roomID, QThread::currentThread());
|
||||||
|
|
||||||
auto request = makeGetStreamRequest(this->roomID, QThread::currentThread());
|
request.onSuccess([weak = this->weak_from_this()](auto result) {
|
||||||
|
|
||||||
request.onSuccess([weak](auto result) {
|
|
||||||
auto d = result.parseRapidJson();
|
auto d = result.parseRapidJson();
|
||||||
ChannelPtr shared = weak.lock();
|
ChannelPtr shared = weak.lock();
|
||||||
|
|
||||||
@@ -384,6 +337,7 @@ void TwitchChannel::refreshLiveStatus()
|
|||||||
|
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(channel->streamStatusMutex_);
|
std::lock_guard<std::mutex> lock(channel->streamStatusMutex_);
|
||||||
|
StreamStatus status;
|
||||||
channel->streamStatus_.live = true;
|
channel->streamStatus_.live = true;
|
||||||
channel->streamStatus_.viewerCount = stream["viewers"].GetUint();
|
channel->streamStatus_.viewerCount = stream["viewers"].GetUint();
|
||||||
channel->streamStatus_.game = stream["game"].GetString();
|
channel->streamStatus_.game = stream["game"].GetString();
|
||||||
@@ -413,7 +367,7 @@ void TwitchChannel::refreshLiveStatus()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Signal all listeners that the stream status has been updated
|
// Signal all listeners that the stream status has been updated
|
||||||
channel->updateLiveInfo.invoke();
|
channel->liveStatusChanged.invoke();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
@@ -421,70 +375,109 @@ void TwitchChannel::refreshLiveStatus()
|
|||||||
request.execute();
|
request.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchChannel::startRefreshLiveStatusTimer(int intervalMS)
|
void TwitchChannel::initializeLiveStatusTimer(int intervalMS)
|
||||||
{
|
{
|
||||||
this->liveStatusTimer = new QTimer;
|
|
||||||
QObject::connect(this->liveStatusTimer, &QTimer::timeout, [this]() {
|
|
||||||
this->refreshLiveStatus(); //
|
|
||||||
});
|
|
||||||
|
|
||||||
// When the Room ID of a twitch channel has been set, refresh the live status an extra time
|
|
||||||
this->roomIDchanged.connect([this]() {
|
|
||||||
this->refreshLiveStatus(); //
|
|
||||||
});
|
|
||||||
|
|
||||||
this->liveStatusTimer->start(intervalMS);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchChannel::fetchRecentMessages()
|
void TwitchChannel::loadRecentMessages()
|
||||||
{
|
{
|
||||||
static QString genericURL =
|
static QString genericURL =
|
||||||
"https://tmi.twitch.tv/api/rooms/%1/recent_messages?client_id=" + getDefaultClientID();
|
"https://tmi.twitch.tv/api/rooms/%1/recent_messages?client_id=" + getDefaultClientID();
|
||||||
|
|
||||||
NetworkRequest request(genericURL.arg(this->roomID));
|
NetworkRequest request(genericURL.arg(this->getRoomID()));
|
||||||
request.makeAuthorizedV5(getDefaultClientID());
|
request.makeAuthorizedV5(getDefaultClientID());
|
||||||
request.setCaller(QThread::currentThread());
|
request.setCaller(QThread::currentThread());
|
||||||
|
|
||||||
std::weak_ptr<Channel> weak = this->shared_from_this();
|
request.onSuccess([this, weak = this->weak_from_this()](auto result) {
|
||||||
|
// channel still exists?
|
||||||
request.onSuccess([weak](auto result) {
|
|
||||||
auto obj = result.parseJson();
|
|
||||||
ChannelPtr shared = weak.lock();
|
ChannelPtr shared = weak.lock();
|
||||||
|
if (!shared) return false;
|
||||||
|
|
||||||
if (!shared) {
|
// parse json
|
||||||
return false;
|
return this->parseRecentMessages(result.parseJson());
|
||||||
}
|
|
||||||
|
|
||||||
auto channel = dynamic_cast<TwitchChannel *>(shared.get());
|
|
||||||
assert(channel != nullptr);
|
|
||||||
|
|
||||||
static auto readConnection = channel->readConnection_;
|
|
||||||
|
|
||||||
QJsonArray msgArray = obj.value("messages").toArray();
|
|
||||||
if (msgArray.empty()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<MessagePtr> messages;
|
|
||||||
|
|
||||||
for (const QJsonValueRef _msg : msgArray) {
|
|
||||||
QByteArray content = _msg.toString().toUtf8();
|
|
||||||
auto msg = Communi::IrcMessage::fromData(content, readConnection);
|
|
||||||
auto privMsg = static_cast<Communi::IrcPrivateMessage *>(msg);
|
|
||||||
|
|
||||||
MessageParseArgs args;
|
|
||||||
TwitchMessageBuilder builder(channel, privMsg, args);
|
|
||||||
if (!builder.isIgnored()) {
|
|
||||||
messages.push_back(builder.build());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
channel->addMessagesAtStart(messages);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
request.execute();
|
request.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool TwitchChannel::parseRecentMessages(const QJsonObject &jsonRoot)
|
||||||
|
{
|
||||||
|
QJsonArray jsonMessages = jsonRoot.value("messages").toArray();
|
||||||
|
if (jsonMessages.empty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<MessagePtr> messages;
|
||||||
|
|
||||||
|
for (const auto jsonMessage : jsonMessages) {
|
||||||
|
auto content = jsonMessage.toString().toUtf8();
|
||||||
|
auto message = Communi::IrcMessage::fromData(content, this->readConnection_);
|
||||||
|
auto privMsg = dynamic_cast<Communi::IrcPrivateMessage *>(message);
|
||||||
|
assert(privMsg);
|
||||||
|
|
||||||
|
MessageParseArgs args;
|
||||||
|
TwitchMessageBuilder builder(this, privMsg, args);
|
||||||
|
if (!builder.isIgnored()) {
|
||||||
|
messages.push_back(builder.build());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this->addMessagesAtStart(messages);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TwitchChannel::refreshPubsub()
|
||||||
|
{
|
||||||
|
// listen to moderation actions
|
||||||
|
if (!this->hasModRights()) return;
|
||||||
|
auto roomId = this->getRoomID();
|
||||||
|
if (roomId.isEmpty()) return;
|
||||||
|
|
||||||
|
auto account = getApp()->accounts->twitch.getCurrent();
|
||||||
|
getApp()->twitch2->pubsub->listenToChannelModerationActions(roomId, account);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TwitchChannel::refreshViewerList()
|
||||||
|
{
|
||||||
|
// setting?
|
||||||
|
const auto streamStatus = this->getStreamStatus();
|
||||||
|
|
||||||
|
if (getSettings()->onlyFetchChattersForSmallerStreamers) {
|
||||||
|
if (streamStatus.live && streamStatus.viewerCount > getSettings()->smallStreamerLimit) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// get viewer list
|
||||||
|
NetworkRequest request("https://tmi.twitch.tv/group/user/" + this->name + "/chatters");
|
||||||
|
|
||||||
|
request.setCaller(QThread::currentThread());
|
||||||
|
request.onSuccess([this, weak = this->weak_from_this()](auto result) {
|
||||||
|
// channel still exists?
|
||||||
|
auto shared = weak.lock();
|
||||||
|
if (!shared) return false;
|
||||||
|
|
||||||
|
return this->parseViewerList(result.parseJson());
|
||||||
|
});
|
||||||
|
|
||||||
|
request.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool TwitchChannel::parseViewerList(const QJsonObject &jsonRoot)
|
||||||
|
{
|
||||||
|
static QStringList categories = {"moderators", "staff", "admins", "global_mods", "viewers"};
|
||||||
|
|
||||||
|
// parse json
|
||||||
|
QJsonObject jsonCategories = jsonRoot.value("chatters").toObject();
|
||||||
|
|
||||||
|
for (const auto &category : categories) {
|
||||||
|
for (const auto jsonCategory : jsonCategories.value(category).toArray()) {
|
||||||
|
this->completionModel.addUser(jsonCategory.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace chatterino
|
} // namespace chatterino
|
||||||
|
|||||||
@@ -18,9 +18,6 @@ class TwitchServer;
|
|||||||
|
|
||||||
class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder
|
class TwitchChannel final : public Channel, pajlada::Signals::SignalHolder
|
||||||
{
|
{
|
||||||
QTimer *liveStatusTimer;
|
|
||||||
QTimer *chattersListTimer;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
struct StreamStatus {
|
struct StreamStatus {
|
||||||
bool live = false;
|
bool live = false;
|
||||||
@@ -46,22 +43,32 @@ public:
|
|||||||
QString broadcasterLang;
|
QString broadcasterLang;
|
||||||
};
|
};
|
||||||
|
|
||||||
~TwitchChannel() final;
|
|
||||||
|
|
||||||
void reloadChannelEmotes();
|
|
||||||
|
|
||||||
bool isEmpty() const override;
|
bool isEmpty() const override;
|
||||||
bool canSendMessage() const override;
|
bool canSendMessage() const override;
|
||||||
void sendMessage(const QString &message) override;
|
void sendMessage(const QString &message) override;
|
||||||
|
|
||||||
|
bool isLive() const;
|
||||||
virtual bool isMod() const override;
|
virtual bool isMod() const override;
|
||||||
void setMod(bool value);
|
void setMod(bool value);
|
||||||
virtual bool isBroadcaster() const override;
|
virtual bool isBroadcaster() const override;
|
||||||
|
|
||||||
|
QString getRoomID() const;
|
||||||
|
void setRoomID(const QString &id);
|
||||||
|
RoomModes getRoomModes();
|
||||||
|
void setRoomModes(const RoomModes &roomModes_);
|
||||||
|
StreamStatus getStreamStatus() const;
|
||||||
|
|
||||||
void addRecentChatter(const std::shared_ptr<Message> &message) final;
|
void addRecentChatter(const std::shared_ptr<Message> &message) final;
|
||||||
void addJoinedUser(const QString &user);
|
void addJoinedUser(const QString &user);
|
||||||
void addPartedUser(const QString &user);
|
void addPartedUser(const QString &user);
|
||||||
|
|
||||||
|
struct NameOptions {
|
||||||
|
QString displayName;
|
||||||
|
QString localizedName;
|
||||||
|
};
|
||||||
|
|
||||||
|
void refreshChannelEmotes();
|
||||||
|
|
||||||
const std::shared_ptr<EmoteMap> bttvChannelEmotes;
|
const std::shared_ptr<EmoteMap> bttvChannelEmotes;
|
||||||
const std::shared_ptr<EmoteMap> ffzChannelEmotes;
|
const std::shared_ptr<EmoteMap> ffzChannelEmotes;
|
||||||
|
|
||||||
@@ -69,35 +76,24 @@ public:
|
|||||||
const QString channelURL;
|
const QString channelURL;
|
||||||
const QString popoutPlayerURL;
|
const QString popoutPlayerURL;
|
||||||
|
|
||||||
void setRoomID(const QString &_roomID);
|
pajlada::Signals::NoArgSignal roomIDChanged;
|
||||||
pajlada::Signals::NoArgSignal roomIDchanged;
|
pajlada::Signals::NoArgSignal liveStatusChanged;
|
||||||
pajlada::Signals::NoArgSignal updateLiveInfo;
|
|
||||||
|
|
||||||
pajlada::Signals::NoArgBoltSignal fetchMessages;
|
|
||||||
pajlada::Signals::NoArgSignal userStateChanged;
|
pajlada::Signals::NoArgSignal userStateChanged;
|
||||||
pajlada::Signals::NoArgSignal roomModesChanged;
|
pajlada::Signals::NoArgSignal roomModesChanged;
|
||||||
|
|
||||||
QString roomID;
|
|
||||||
|
|
||||||
RoomModes getRoomModes();
|
|
||||||
void setRoomModes(const RoomModes &roomModes_);
|
|
||||||
|
|
||||||
StreamStatus getStreamStatus() const;
|
|
||||||
|
|
||||||
struct NameOptions {
|
|
||||||
QString displayName;
|
|
||||||
QString localizedName;
|
|
||||||
};
|
|
||||||
|
|
||||||
bool isLive() const;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit TwitchChannel(const QString &channelName, Communi::IrcConnection *readConnection);
|
explicit TwitchChannel(const QString &channelName, Communi::IrcConnection *readConnection);
|
||||||
|
|
||||||
void setLive(bool newLiveStatus);
|
void initializeLiveStatusTimer(int intervalMS);
|
||||||
void refreshLiveStatus();
|
void refreshLiveStatus();
|
||||||
void startRefreshLiveStatusTimer(int intervalMS);
|
void refreshPubsub();
|
||||||
void fetchRecentMessages();
|
void refreshViewerList();
|
||||||
|
bool parseViewerList(const QJsonObject &jsonRoot);
|
||||||
|
void loadRecentMessages();
|
||||||
|
bool parseRecentMessages(const QJsonObject &jsonRoot);
|
||||||
|
|
||||||
|
void setLive(bool newLiveStatus);
|
||||||
|
|
||||||
mutable std::mutex streamStatusMutex_;
|
mutable std::mutex streamStatusMutex_;
|
||||||
StreamStatus streamStatus_;
|
StreamStatus streamStatus_;
|
||||||
@@ -110,6 +106,7 @@ private:
|
|||||||
QString lastSentMessage_;
|
QString lastSentMessage_;
|
||||||
RoomModes roomModes_;
|
RoomModes roomModes_;
|
||||||
std::mutex roomModeMutex_;
|
std::mutex roomModeMutex_;
|
||||||
|
MutexValue<QString> roomID_;
|
||||||
|
|
||||||
QObject object_;
|
QObject object_;
|
||||||
std::mutex joinedUserMutex_;
|
std::mutex joinedUserMutex_;
|
||||||
@@ -125,6 +122,9 @@ private:
|
|||||||
std::map<QString, NameOptions> recentChatters_;
|
std::map<QString, NameOptions> recentChatters_;
|
||||||
std::mutex recentChattersMutex_;
|
std::mutex recentChattersMutex_;
|
||||||
|
|
||||||
|
QTimer liveStatusTimer_;
|
||||||
|
QTimer chattersListTimer_;
|
||||||
|
|
||||||
friend class TwitchServer;
|
friend class TwitchServer;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -298,8 +298,8 @@ void TwitchMessageBuilder::parseRoomID()
|
|||||||
if (iterator != std::end(this->tags)) {
|
if (iterator != std::end(this->tags)) {
|
||||||
this->roomID_ = iterator.value().toString();
|
this->roomID_ = iterator.value().toString();
|
||||||
|
|
||||||
if (this->twitchChannel->roomID.isEmpty()) {
|
if (this->twitchChannel->getRoomID().isEmpty()) {
|
||||||
this->twitchChannel->roomID = this->roomID_;
|
this->twitchChannel->setRoomID(this->roomID_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,16 +161,12 @@ std::shared_ptr<Channel> TwitchServer::getChannelOrEmptyByID(const QString &chan
|
|||||||
|
|
||||||
for (const auto &weakChannel : this->channels) {
|
for (const auto &weakChannel : this->channels) {
|
||||||
auto channel = weakChannel.lock();
|
auto channel = weakChannel.lock();
|
||||||
if (!channel) {
|
if (!channel) continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto twitchChannel = std::dynamic_pointer_cast<TwitchChannel>(channel);
|
auto twitchChannel = std::dynamic_pointer_cast<TwitchChannel>(channel);
|
||||||
if (!twitchChannel) {
|
if (!twitchChannel) continue;
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (twitchChannel->roomID == channelID) {
|
if (twitchChannel->getRoomID() == channelID) {
|
||||||
return twitchChannel;
|
return twitchChannel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -284,7 +284,7 @@ void SplitHeader::initializeChannelSignals()
|
|||||||
TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
|
TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
|
||||||
|
|
||||||
if (twitchChannel) {
|
if (twitchChannel) {
|
||||||
this->managedConnections_.emplace_back(twitchChannel->updateLiveInfo.connect([this]() {
|
this->managedConnections_.emplace_back(twitchChannel->liveStatusChanged.connect([this]() {
|
||||||
this->updateChannelText(); //
|
this->updateChannelText(); //
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@@ -494,7 +494,7 @@ void SplitHeader::menuReloadChannelEmotes()
|
|||||||
TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
|
TwitchChannel *twitchChannel = dynamic_cast<TwitchChannel *>(channel.get());
|
||||||
|
|
||||||
if (twitchChannel) {
|
if (twitchChannel) {
|
||||||
twitchChannel->reloadChannelEmotes();
|
twitchChannel->refreshChannelEmotes();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user