diff --git a/.gitmodules b/.gitmodules index e15a27575..219a91bfa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,6 +38,7 @@ [submodule "lib/lua/src"] path = lib/lua/src url = https://github.com/lua/lua + branch = v5.4 [submodule "tools/crash-handler"] path = tools/crash-handler url = https://github.com/Chatterino/crash-handler diff --git a/CHANGELOG.md b/CHANGELOG.md index 7410a89ee..e1acdcfad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,9 +34,14 @@ - Minor: Moderators can now see which mods start and cancel raids. (#5563) - Minor: The emote popup now reloads when Twitch emotes are reloaded. (#5580) - Minor: Added `--login ` CLI argument to specify which account to start logged in as. (#5626) +- Minor: When blocking a channel, Chatterino will now warn you about that action. (#5615) - Minor: Indicate when subscriptions and resubscriptions are for multiple months. (#5642) +- Minor: Added a setting to control whether or not to show "Blocked Term" automod messages. (#5690) - Minor: Proxy URL information is now included in the `/debug-env` command. (#5648) - Minor: Make raid entry message usernames clickable. (#5651) +- Minor: Tabs unhighlight when their content is read in other tabs. (#5649) +- Minor: Made usernames in bits and sub messages clickable. (#5686) +- Minor: Mentions of FrankerFaceZ and BetterTTV in settings are standardized as such. (#5698) - Minor: Added support for the "Device code grant flow" for authentication. (#5680) - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612) - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378) @@ -55,6 +60,7 @@ - Bugfix: Fixed event emotes not showing up in autocomplete and popups. (#5239, #5580, #5582, #5632) - Bugfix: Fixed tab visibility being controllable in the emote popup. (#5530) - Bugfix: Fixed account switch not being saved if no other settings were changed. (#5558) +- Bugfix: Fixed a crash that could occur when handling the quick switcher popup really quickly. (#5687) - Bugfix: Fixed 7TV badges being inadvertently animated. (#5674) - Bugfix: Fixed some tooltips not being readable. (#5578) - Bugfix: Fixed log files being locked longer than needed. (#5592) @@ -64,6 +70,8 @@ - Bugfix: Fixed double-click selection not working when clicking outside a message. (#5617) - Bugfix: Fixed emotes starting with ":" not tab-completing. (#5603) - Bugfix: Fixed 7TV emotes messing with Qt's HTML. (#5677) +- Bugfix: Fixed incorrect messages getting replaced visually. (#5683) +- Bugfix: Fixed rendering of multi-line selection that starts at a trailing space. (#5691) - Dev: Update Windows build from Qt 6.5.0 to Qt 6.7.1. (#5420) - Dev: Update vcpkg build Qt from 6.5.0 to 6.7.0, boost from 1.83.0 to 1.85.0, openssl from 3.1.3 to 3.3.0. (#5422) - Dev: Unsingletonize `ISoundController`. (#5462) @@ -76,7 +84,7 @@ - Dev: Removed unused timegate settings. (#5361) - Dev: Add `Channel::addSystemMessage` helper function, allowing us to avoid the common `channel->addMessage(makeSystemMessage(...));` pattern. (#5500) - Dev: Unsingletonize `Resources2`. (#5460) -- Dev: All Lua globals now show in the `c2` global in the LuaLS metadata. (#5385) +- Dev: All Lua globals now show in the `c2` global in the LuaLS metadata. (#5385, #5682) - Dev: Images are now loaded in worker threads. (#5431) - Dev: Fixed broken `SignalVector::operator[]` implementation. (#5556) - Dev: Qt Creator now auto-configures Conan when loading the project and skips vcpkg. (#5305) @@ -111,11 +119,15 @@ - Dev: Twitch messages are now sent using Twitch's Helix API instead of IRC by default. (#5607) - Dev: `GIFTimer` is no longer initialized in tests. (#5608) - Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616) -- Dev: Move plugins to Sol2. (#5622) +- Dev: Move plugins to Sol2. (#5622, #5682) +- Dev: Clarified our Lua dependency's version. (#5693) +- Dev: Specified qtkeychain dependency version. (#5695, #5697) - Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652) - Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668) - Dev: Refactored IRC message building. (#5663) - Dev: Fixed some compiler warnings. (#5672) +- Dev: Unified parsing of historic and live IRC messages. (#5678) +- Dev: 7TV's `entitlement.reset` is now explicitly ignored. (#5685) ## 2.5.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 603c9c42b..37c8835b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,10 +160,19 @@ if (BUILD_WITH_QTKEYCHAIN) message(FATAL_ERROR "Submodules probably not loaded, unable to find lib/qtkeychain/CMakeLists.txt") endif() + set(_prev_testing ${BUILD_TESTING}) + set(BUILD_TESTING Off) add_subdirectory("${QTKEYCHAIN_ROOT_LIB_FOLDER}" EXCLUDE_FROM_ALL) + set(BUILD_TESTING ${_prev_testing}) + if (NOT TARGET qt${MAJOR_QT_VERSION}keychain) message(FATAL_ERROR "qt${MAJOR_QT_VERSION}keychain target was not created :@") endif() + if (MSVC AND "${MAJOR_QT_VERSION}" STREQUAL "5") + target_compile_definitions(qt5keychain PRIVATE UNICODE) + target_compile_options(qt5keychain PRIVATE /utf-8) + set_target_properties(qt5keychain PROPERTIES CXX_STANDARD 17) + endif() endif() endif() diff --git a/docs/plugin-meta.lua b/docs/plugin-meta.lua index 5a86efca0..27cdf8786 100644 --- a/docs/plugin-meta.lua +++ b/docs/plugin-meta.lua @@ -5,20 +5,20 @@ -- Add the folder this file is in to "Lua.workspace.library". c2 = {} ----@alias c2.LogLevel.Debug "c2.LogLevel.Debug" ----@alias c2.LogLevel.Info "c2.LogLevel.Info" ----@alias c2.LogLevel.Warning "c2.LogLevel.Warning" ----@alias c2.LogLevel.Critical "c2.LogLevel.Critical" ----@alias c2.LogLevel c2.LogLevel.Debug|c2.LogLevel.Info|c2.LogLevel.Warning|c2.LogLevel.Critical ----@type { Debug: c2.LogLevel.Debug, Info: c2.LogLevel.Info, Warning: c2.LogLevel.Warning, Critical: c2.LogLevel.Critical } -c2.LogLevel = {} +---@enum c2.LogLevel +c2.LogLevel = { + Debug = {}, ---@type c2.LogLevel.Debug + Info = {}, ---@type c2.LogLevel.Info + Warning = {}, ---@type c2.LogLevel.Warning + Critical = {}, ---@type c2.LogLevel.Critical +} -- Begin src/controllers/plugins/api/EventType.hpp ----@alias c2.EventType.CompletionRequested "c2.EventType.CompletionRequested" ----@alias c2.EventType c2.EventType.CompletionRequested ----@type { CompletionRequested: c2.EventType.CompletionRequested } -c2.EventType = {} +---@enum c2.EventType +c2.EventType = { + CompletionRequested = {}, ---@type c2.EventType.CompletionRequested +} -- End src/controllers/plugins/api/EventType.hpp @@ -38,19 +38,19 @@ c2.EventType = {} -- Begin src/common/Channel.hpp ----@alias c2.ChannelType.None "c2.ChannelType.None" ----@alias c2.ChannelType.Direct "c2.ChannelType.Direct" ----@alias c2.ChannelType.Twitch "c2.ChannelType.Twitch" ----@alias c2.ChannelType.TwitchWhispers "c2.ChannelType.TwitchWhispers" ----@alias c2.ChannelType.TwitchWatching "c2.ChannelType.TwitchWatching" ----@alias c2.ChannelType.TwitchMentions "c2.ChannelType.TwitchMentions" ----@alias c2.ChannelType.TwitchLive "c2.ChannelType.TwitchLive" ----@alias c2.ChannelType.TwitchAutomod "c2.ChannelType.TwitchAutomod" ----@alias c2.ChannelType.TwitchEnd "c2.ChannelType.TwitchEnd" ----@alias c2.ChannelType.Misc "c2.ChannelType.Misc" ----@alias c2.ChannelType c2.ChannelType.None|c2.ChannelType.Direct|c2.ChannelType.Twitch|c2.ChannelType.TwitchWhispers|c2.ChannelType.TwitchWatching|c2.ChannelType.TwitchMentions|c2.ChannelType.TwitchLive|c2.ChannelType.TwitchAutomod|c2.ChannelType.TwitchEnd|c2.ChannelType.Misc ----@type { None: c2.ChannelType.None, Direct: c2.ChannelType.Direct, Twitch: c2.ChannelType.Twitch, TwitchWhispers: c2.ChannelType.TwitchWhispers, TwitchWatching: c2.ChannelType.TwitchWatching, TwitchMentions: c2.ChannelType.TwitchMentions, TwitchLive: c2.ChannelType.TwitchLive, TwitchAutomod: c2.ChannelType.TwitchAutomod, TwitchEnd: c2.ChannelType.TwitchEnd, Misc: c2.ChannelType.Misc } -c2.ChannelType = {} +---@enum c2.ChannelType +c2.ChannelType = { + None = {}, ---@type c2.ChannelType.None + Direct = {}, ---@type c2.ChannelType.Direct + Twitch = {}, ---@type c2.ChannelType.Twitch + TwitchWhispers = {}, ---@type c2.ChannelType.TwitchWhispers + TwitchWatching = {}, ---@type c2.ChannelType.TwitchWatching + TwitchMentions = {}, ---@type c2.ChannelType.TwitchMentions + TwitchLive = {}, ---@type c2.ChannelType.TwitchLive + TwitchAutomod = {}, ---@type c2.ChannelType.TwitchAutomod + TwitchEnd = {}, ---@type c2.ChannelType.TwitchEnd + Misc = {}, ---@type c2.ChannelType.Misc +} -- End src/common/Channel.hpp @@ -174,90 +174,97 @@ function c2.Channel.by_twitch_id(id) end -- Begin src/controllers/plugins/api/HTTPResponse.hpp ----@class HTTPResponse -HTTPResponse = {} +---@class c2.HTTPResponse +c2.HTTPResponse = {} --- Returns the data. This is not guaranteed to be encoded using any --- particular encoding scheme. It's just the bytes the server returned. --- -function HTTPResponse:data() end +---@return string +---@nodiscard +function c2.HTTPResponse:data() end --- Returns the status code. --- -function HTTPResponse:status() end +---@return number|nil +---@nodiscard +function c2.HTTPResponse:status() end --- A somewhat human readable description of an error if such happened --- -function HTTPResponse:error() end +---@return string +---@nodiscard +function c2.HTTPResponse:error() end ---@return string -function HTTPResponse:__tostring() end +---@nodiscard +function c2.HTTPResponse:__tostring() end -- End src/controllers/plugins/api/HTTPResponse.hpp -- Begin src/controllers/plugins/api/HTTPRequest.hpp ----@alias HTTPCallback fun(result: HTTPResponse): nil ----@class HTTPRequest -HTTPRequest = {} +---@alias c2.HTTPCallback fun(result: c2.HTTPResponse): nil +---@class c2.HTTPRequest +c2.HTTPRequest = {} --- Sets the success callback --- ----@param callback HTTPCallback Function to call when the HTTP request succeeds -function HTTPRequest:on_success(callback) end +---@param callback c2.HTTPCallback Function to call when the HTTP request succeeds +function c2.HTTPRequest:on_success(callback) end --- Sets the failure callback --- ----@param callback HTTPCallback Function to call when the HTTP request fails or returns a non-ok status -function HTTPRequest:on_error(callback) end +---@param callback c2.HTTPCallback Function to call when the HTTP request fails or returns a non-ok status +function c2.HTTPRequest:on_error(callback) end --- Sets the finally callback --- ---@param callback fun(): nil Function to call when the HTTP request finishes -function HTTPRequest:finally(callback) end +function c2.HTTPRequest:finally(callback) end --- Sets the timeout --- ---@param timeout integer How long in milliseconds until the times out -function HTTPRequest:set_timeout(timeout) end +function c2.HTTPRequest:set_timeout(timeout) end --- Sets the request payload --- ---@param data string -function HTTPRequest:set_payload(data) end +function c2.HTTPRequest:set_payload(data) end --- Sets a header in the request --- ---@param name string ---@param value string -function HTTPRequest:set_header(name, value) end +function c2.HTTPRequest:set_header(name, value) end --- Executes the HTTP request --- -function HTTPRequest:execute() end +function c2.HTTPRequest:execute() end ---@return string -function HTTPRequest:__tostring() end +function c2.HTTPRequest:__tostring() end --- Creates a new HTTPRequest --- ----@param method HTTPMethod Method to use +---@param method c2.HTTPMethod Method to use ---@param url string Where to send the request to ----@return HTTPRequest -function HTTPRequest.create(method, url) end +---@return c2.HTTPRequest +function c2.HTTPRequest.create(method, url) end -- End src/controllers/plugins/api/HTTPRequest.hpp -- Begin src/common/network/NetworkCommon.hpp ----@alias HTTPMethod.Get "HTTPMethod.Get" ----@alias HTTPMethod.Post "HTTPMethod.Post" ----@alias HTTPMethod.Put "HTTPMethod.Put" ----@alias HTTPMethod.Delete "HTTPMethod.Delete" ----@alias HTTPMethod.Patch "HTTPMethod.Patch" ----@alias HTTPMethod HTTPMethod.Get|HTTPMethod.Post|HTTPMethod.Put|HTTPMethod.Delete|HTTPMethod.Patch ----@type { Get: HTTPMethod.Get, Post: HTTPMethod.Post, Put: HTTPMethod.Put, Delete: HTTPMethod.Delete, Patch: HTTPMethod.Patch } -HTTPMethod = {} +---@enum c2.HTTPMethod +c2.HTTPMethod = { + Get = {}, ---@type c2.HTTPMethod.Get + Post = {}, ---@type c2.HTTPMethod.Post + Put = {}, ---@type c2.HTTPMethod.Put + Delete = {}, ---@type c2.HTTPMethod.Delete + Patch = {}, ---@type c2.HTTPMethod.Patch +} -- End src/common/network/NetworkCommon.hpp diff --git a/lib/qtkeychain b/lib/qtkeychain index e5b070831..73c3772d6 160000 --- a/lib/qtkeychain +++ b/lib/qtkeychain @@ -1 +1 @@ -Subproject commit e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6 +Subproject commit 73c3772d6432280df83e1ab3299c2a8f1e4ea47f diff --git a/mocks/include/mocks/Helix.hpp b/mocks/include/mocks/Helix.hpp index cfb2d71b6..02913efed 100644 --- a/mocks/include/mocks/Helix.hpp +++ b/mocks/include/mocks/Helix.hpp @@ -422,7 +422,7 @@ public: // get followed channel MOCK_METHOD( void, getFollowedChannel, - (QString userID, QString broadcasterID, + (QString userID, QString broadcasterID, const QObject *caller, ResultCallback> successCallback, FailureCallback failureCallback), (override)); diff --git a/scripts/make_luals_meta.py b/scripts/make_luals_meta.py old mode 100644 new mode 100755 index b1420e780..e1dafe496 --- a/scripts/make_luals_meta.py +++ b/scripts/make_luals_meta.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 """ This script generates docs/plugin-meta.lua. It accepts no arguments @@ -242,25 +243,19 @@ def read_file(path: Path, out: TextIOWrapper): ) name = header[0].split(" ", 1)[1] printmsg(path, reader.line_no(), f"enum {name}") - variants = reader.read_enum_variants() - - vtypes = [] - for variant in variants: - vtype = f'{name}.{variant}' - vtypes.append(vtype) - out.write(f'---@alias {vtype} "{vtype}"\n') - - out.write(f"---@alias {name} {'|'.join(vtypes)}\n") if header_comment: out.write(f"--- {header_comment}\n") - out.write("---@type { ") + out.write(f"---@enum {name}\n") + out.write(f"{name} = {{\n") out.write( - ", ".join( - [f"{variant}: {typ}" for variant, typ in zip(variants,vtypes)] + "\n".join( + [ + f" {variant} = {{}}, ---@type {name}.{variant}" + for variant in reader.read_enum_variants() + ] ) ) - out.write(" }\n") - out.write(f"{name} = {{}}\n\n") + out.write("\n}\n\n") continue # class diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bace57a9c..631239533 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,6 +40,7 @@ set(SOURCE_FILES common/WindowDescriptors.cpp common/WindowDescriptors.hpp + common/enums/MessageContext.hpp common/enums/MessageOverflow.hpp common/network/NetworkCommon.cpp @@ -282,6 +283,9 @@ set(SOURCE_FILES messages/MessageElement.cpp messages/MessageElement.hpp messages/MessageFlag.hpp + messages/MessageSimilarity.cpp + messages/MessageSimilarity.hpp + messages/MessageSink.hpp messages/MessageThread.cpp messages/MessageThread.hpp @@ -527,6 +531,8 @@ set(SOURCE_FILES util/Twitch.hpp util/TypeName.hpp util/Variant.hpp + util/VectorMessageSink.cpp + util/VectorMessageSink.hpp util/WidgetHelpers.cpp util/WidgetHelpers.hpp util/WindowsHelper.cpp diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp index ef778bad1..6396ef00c 100644 --- a/src/common/Channel.cpp +++ b/src/common/Channel.cpp @@ -3,7 +3,9 @@ #include "Application.hpp" #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" +#include "messages/MessageSimilarity.hpp" #include "providers/twitch/IrcMessageHandler.hpp" +#include "providers/twitch/TwitchIrcServer.hpp" #include "singletons/Emotes.hpp" #include "singletons/Logging.hpp" #include "singletons/Settings.hpp" @@ -121,10 +123,10 @@ void Channel::addSystemMessage(const QString &contents) this->addMessage(msg, MessageContext::Original); } -void Channel::addOrReplaceTimeout(MessagePtr message) +void Channel::addOrReplaceTimeout(MessagePtr message, QTime now) { addOrReplaceChannelTimeout( - this->getMessageSnapshot(), std::move(message), QTime::currentTime(), + this->getMessageSnapshot(), std::move(message), now, [this](auto /*idx*/, auto msg, auto replacement) { this->replaceMessage(msg, replacement); }, @@ -253,21 +255,33 @@ void Channel::fillInMissingMessages(const std::vector &messages) } } -void Channel::replaceMessage(MessagePtr message, MessagePtr replacement) +void Channel::replaceMessage(const MessagePtr &message, + const MessagePtr &replacement) { int index = this->messages_.replaceItem(message, replacement); if (index >= 0) { - this->messageReplaced.invoke((size_t)index, replacement); + this->messageReplaced.invoke((size_t)index, message, replacement); } } -void Channel::replaceMessage(size_t index, MessagePtr replacement) +void Channel::replaceMessage(size_t index, const MessagePtr &replacement) { - if (this->messages_.replaceItem(index, replacement)) + MessagePtr prev; + if (this->messages_.replaceItem(index, replacement, &prev)) { - this->messageReplaced.invoke(index, replacement); + this->messageReplaced.invoke(index, prev, replacement); + } +} + +void Channel::replaceMessage(size_t hint, const MessagePtr &message, + const MessagePtr &replacement) +{ + auto index = this->messages_.replaceItem(hint, message, replacement); + if (index >= 0) + { + this->messageReplaced.invoke(hint, message, replacement); } } @@ -287,10 +301,15 @@ void Channel::clearMessages() } MessagePtr Channel::findMessage(QString messageID) +{ + return this->findMessageByID(messageID); +} + +MessagePtr Channel::findMessageByID(QStringView messageID) { MessagePtr res; - if (auto msg = this->messages_.rfind([&messageID](const MessagePtr &msg) { + if (auto msg = this->messages_.rfind([messageID](const MessagePtr &msg) { return msg->id == messageID; }); msg) @@ -301,6 +320,19 @@ MessagePtr Channel::findMessage(QString messageID) return res; } +void Channel::applySimilarityFilters(const MessagePtr &message) const +{ + setSimilarityFlags(message, this->messages_.getSnapshot()); +} + +MessageSinkTraits Channel::sinkTraits() const +{ + return { + MessageSinkTrait::AddMentionsToGlobalChannel, + MessageSinkTrait::RequiresKnownChannelPointReward, + }; +} + bool Channel::canSendMessage() const { return false; diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp index ac90573ff..c7d006f1b 100644 --- a/src/common/Channel.hpp +++ b/src/common/Channel.hpp @@ -1,8 +1,10 @@ #pragma once +#include "common/enums/MessageContext.hpp" #include "controllers/completion/TabCompletionModel.hpp" #include "messages/LimitedQueue.hpp" #include "messages/MessageFlag.hpp" +#include "messages/MessageSink.hpp" #include #include @@ -26,15 +28,7 @@ enum class TimeoutStackStyle : int { Default = DontStackBeyondUserMessage, }; -/// Context of the message being added to a channel -enum class MessageContext { - /// This message is the original - Original, - /// This message is a repost of a message that has already been added in a channel - Repost, -}; - -class Channel : public std::enable_shared_from_this +class Channel : public std::enable_shared_from_this, public MessageSink { public: // This is for Lua. See scripts/make_luals_meta.py @@ -55,7 +49,7 @@ public: }; explicit Channel(const QString &name, Type type); - virtual ~Channel(); + ~Channel() override; // SIGNALS pajlada::Signals::Signal @@ -66,7 +60,9 @@ public: pajlada::Signals::Signal> messageAppended; pajlada::Signals::Signal &> messagesAddedAtStart; - pajlada::Signals::Signal messageReplaced; + /// (index, prev-message, replacement) + pajlada::Signals::Signal + messageReplaced; /// Invoked when some number of messages were filled in using time received pajlada::Signals::Signal &> filledInMessages; pajlada::Signals::NoArgSignal destroyed; @@ -85,8 +81,9 @@ public: // overridingFlags can be filled in with flags that should be used instead // of the message's flags. This is useful in case a flag is specific to a // type of split - void addMessage(MessagePtr message, MessageContext context, - std::optional overridingFlags = std::nullopt); + void addMessage( + MessagePtr message, MessageContext context, + std::optional overridingFlags = std::nullopt) final; void addMessagesAtStart(const std::vector &messages_); void addSystemMessage(const QString &contents); @@ -94,19 +91,28 @@ public: /// Inserts the given messages in order by Message::serverReceivedTime. void fillInMissingMessages(const std::vector &messages); - void addOrReplaceTimeout(MessagePtr message); - void disableAllMessages(); - void replaceMessage(MessagePtr message, MessagePtr replacement); - void replaceMessage(size_t index, MessagePtr replacement); + void addOrReplaceTimeout(MessagePtr message, QTime now) final; + void disableAllMessages() final; + void replaceMessage(const MessagePtr &message, + const MessagePtr &replacement); + void replaceMessage(size_t index, const MessagePtr &replacement); + void replaceMessage(size_t hint, const MessagePtr &message, + const MessagePtr &replacement); void deleteMessage(QString messageID); /// Removes all messages from this channel and invokes #messagesCleared void clearMessages(); - MessagePtr findMessage(QString messageID); + [[deprecated("Use findMessageByID instead")]] MessagePtr findMessage( + QString messageID); + MessagePtr findMessageByID(QStringView messageID) final; bool hasMessages() const; + void applySimilarityFilters(const MessagePtr &message) const final; + + MessageSinkTraits sinkTraits() const final; + // CHANNEL INFO virtual bool canSendMessage() const; virtual bool isWritable() const; // whether split input will be usable diff --git a/src/common/ChatterinoSetting.hpp b/src/common/ChatterinoSetting.hpp index 66be9102a..fcae2a036 100644 --- a/src/common/ChatterinoSetting.hpp +++ b/src/common/ChatterinoSetting.hpp @@ -6,6 +6,10 @@ #include #include +#include +#include +#include + namespace chatterino { void _registerSetting(std::weak_ptr setting); @@ -162,6 +166,9 @@ struct IsChatterinoSettingT : std::false_type { template struct IsChatterinoSettingT> : std::true_type { }; +template +struct IsChatterinoSettingT> : std::true_type { +}; template concept IsChatterinoSetting = IsChatterinoSettingT::value; diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp index 1effa8f9b..7e5e5655e 100644 --- a/src/common/Credentials.cpp +++ b/src/common/Credentials.cpp @@ -24,7 +24,7 @@ # include "qt5keychain/keychain.h" # endif # else -# include "keychain.h" +# include # endif #endif diff --git a/src/common/enums/MessageContext.hpp b/src/common/enums/MessageContext.hpp new file mode 100644 index 000000000..669e55315 --- /dev/null +++ b/src/common/enums/MessageContext.hpp @@ -0,0 +1,13 @@ +#pragma once + +namespace chatterino { + +/// Context of the message being added to a channel +enum class MessageContext { + /// This message is the original + Original, + /// This message is a repost of a message that has already been added in a channel + Repost, +}; + +} // namespace chatterino diff --git a/src/common/network/NetworkCommon.hpp b/src/common/network/NetworkCommon.hpp index 215b828a7..8efd66620 100644 --- a/src/common/network/NetworkCommon.hpp +++ b/src/common/network/NetworkCommon.hpp @@ -16,7 +16,7 @@ using NetworkErrorCallback = std::function; using NetworkFinallyCallback = std::function; /** - * @exposeenum HTTPMethod + * @exposeenum c2.HTTPMethod */ enum class NetworkRequestType { Get, diff --git a/src/controllers/plugins/api/HTTPRequest.hpp b/src/controllers/plugins/api/HTTPRequest.hpp index 6fe3b97be..ebf82967f 100644 --- a/src/controllers/plugins/api/HTTPRequest.hpp +++ b/src/controllers/plugins/api/HTTPRequest.hpp @@ -16,11 +16,11 @@ namespace chatterino::lua::api { // NOLINTBEGIN(readability-identifier-naming) /** - * @lua@alias HTTPCallback fun(result: HTTPResponse): nil + * @lua@alias c2.HTTPCallback fun(result: c2.HTTPResponse): nil */ /** - * @lua@class HTTPRequest + * @lua@class c2.HTTPRequest */ class HTTPRequest : public std::enable_shared_from_this { @@ -61,16 +61,16 @@ public: /** * Sets the success callback * - * @lua@param callback HTTPCallback Function to call when the HTTP request succeeds - * @exposed HTTPRequest:on_success + * @lua@param callback c2.HTTPCallback Function to call when the HTTP request succeeds + * @exposed c2.HTTPRequest:on_success */ void on_success(sol::protected_function func); /** * Sets the failure callback * - * @lua@param callback HTTPCallback Function to call when the HTTP request fails or returns a non-ok status - * @exposed HTTPRequest:on_error + * @lua@param callback c2.HTTPCallback Function to call when the HTTP request fails or returns a non-ok status + * @exposed c2.HTTPRequest:on_error */ void on_error(sol::protected_function func); @@ -78,7 +78,7 @@ public: * Sets the finally callback * * @lua@param callback fun(): nil Function to call when the HTTP request finishes - * @exposed HTTPRequest:finally + * @exposed c2.HTTPRequest:finally */ void finally(sol::protected_function func); @@ -86,7 +86,7 @@ public: * Sets the timeout * * @lua@param timeout integer How long in milliseconds until the times out - * @exposed HTTPRequest:set_timeout + * @exposed c2.HTTPRequest:set_timeout */ void set_timeout(int timeout); @@ -94,7 +94,7 @@ public: * Sets the request payload * * @lua@param data string - * @exposed HTTPRequest:set_payload + * @exposed c2.HTTPRequest:set_payload */ void set_payload(QByteArray payload); @@ -103,19 +103,19 @@ public: * * @lua@param name string * @lua@param value string - * @exposed HTTPRequest:set_header + * @exposed c2.HTTPRequest:set_header */ void set_header(QByteArray name, QByteArray value); /** * Executes the HTTP request * - * @exposed HTTPRequest:execute + * @exposed c2.HTTPRequest:execute */ void execute(sol::this_state L); /** * @lua@return string - * @exposed HTTPRequest:__tostring + * @exposed c2.HTTPRequest:__tostring */ QString to_string(); @@ -126,11 +126,11 @@ public: /** * Creates a new HTTPRequest * - * @lua@param method HTTPMethod Method to use + * @lua@param method c2.HTTPMethod Method to use * @lua@param url string Where to send the request to * - * @lua@return HTTPRequest - * @exposed HTTPRequest.create + * @lua@return c2.HTTPRequest + * @exposed c2.HTTPRequest.create */ static std::shared_ptr create(sol::this_state L, NetworkRequestType method, diff --git a/src/controllers/plugins/api/HTTPResponse.hpp b/src/controllers/plugins/api/HTTPResponse.hpp index 80eb49bd3..9997c858d 100644 --- a/src/controllers/plugins/api/HTTPResponse.hpp +++ b/src/controllers/plugins/api/HTTPResponse.hpp @@ -15,7 +15,7 @@ namespace chatterino::lua::api { // NOLINTBEGIN(readability-identifier-naming) /** - * @lua@class HTTPResponse + * @lua@class c2.HTTPResponse */ class HTTPResponse { @@ -38,26 +38,34 @@ public: * Returns the data. This is not guaranteed to be encoded using any * particular encoding scheme. It's just the bytes the server returned. * - * @exposed HTTPResponse:data + * @lua@return string + * @lua@nodiscard + * @exposed c2.HTTPResponse:data */ QByteArray data(); /** * Returns the status code. * - * @exposed HTTPResponse:status + * @lua@return number|nil + * @lua@nodiscard + * @exposed c2.HTTPResponse:status */ std::optional status(); /** * A somewhat human readable description of an error if such happened - * @exposed HTTPResponse:error + * + * @lua@return string + * @lua@nodiscard + * @exposed c2.HTTPResponse:error */ QString error(); /** * @lua@return string - * @exposed HTTPResponse:__tostring + * @lua@nodiscard + * @exposed c2.HTTPResponse:__tostring */ QString to_string(); }; diff --git a/src/messages/LimitedQueue.hpp b/src/messages/LimitedQueue.hpp index a204c84a9..4d223ab15 100644 --- a/src/messages/LimitedQueue.hpp +++ b/src/messages/LimitedQueue.hpp @@ -8,6 +8,7 @@ #include #include #include +#include #include namespace chatterino { @@ -212,9 +213,10 @@ public: * * @param[in] index the index of the item to replace * @param[in] replacement the item to put in place of the item at index + * @param[out] prev (optional) the item located at @a index before replacing * @return true if a replacement took place */ - bool replaceItem(size_t index, const T &replacement) + bool replaceItem(size_t index, const T &replacement, T *prev = nullptr) { std::unique_lock lock(this->mutex_); @@ -223,10 +225,46 @@ public: return false; } - this->buffer_[index] = replacement; + if (prev) + { + *prev = std::exchange(this->buffer_[index], replacement); + } + else + { + this->buffer_[index] = replacement; + } return true; } + /** + * @brief Replace the needle with the given item + * + * @param hint A hint on where the needle _might_ be + * @param[in] needle the item to search for + * @param[in] replacement the item to replace needle with + * @return the index of the replaced item, or -1 if no replacement took place + */ + int replaceItem(size_t hint, const T &needle, const T &replacement) + { + std::unique_lock lock(this->mutex_); + + if (hint < this->buffer_.size() && this->buffer_[hint] == needle) + { + this->buffer_[hint] = replacement; + return static_cast(hint); + } + + for (size_t i = 0; i < this->buffer_.size(); ++i) + { + if (this->buffer_[i] == needle) + { + this->buffer_[i] = replacement; + return static_cast(i); + } + } + return -1; + } + /** * @brief Inserts the given item before another item * @@ -315,6 +353,32 @@ public: return std::nullopt; } + /** + * @brief Find an item with a hint + * + * @param hint A hint on where the needle _might_ be + * @param predicate that will used to find the item + * @return the item and its index or none if it's not found + */ + std::optional> find(size_t hint, auto &&predicate) + { + std::unique_lock lock(this->mutex_); + + if (hint < this->buffer_.size() && predicate(this->buffer_[hint])) + { + return std::pair{hint, this->buffer_[hint]}; + }; + + for (size_t i = 0; i < this->buffer_.size(); i++) + { + if (predicate(this->buffer_[i])) + { + return std::pair{i, this->buffer_[i]}; + } + } + return std::nullopt; + } + /** * @brief Returns the first item matching a predicate, checking in reverse * diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index cee5a7c87..00b5eedbf 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -26,6 +26,7 @@ #include "providers/twitch/api/Helix.hpp" #include "providers/twitch/ChannelPointReward.hpp" #include "providers/twitch/PubSubActions.hpp" +#include "providers/twitch/pubsubmessages/AutoMod.hpp" #include "providers/twitch/TwitchAccount.hpp" #include "providers/twitch/TwitchBadge.hpp" #include "providers/twitch/TwitchBadges.hpp" @@ -75,6 +76,8 @@ const QRegularExpression mentionRegex("^@" + regexHelpString); // if findAllUsernames setting is enabled, matches strings like in the examples above, but without @ symbol at the beginning const QRegularExpression allUsernamesMentionRegex("^" + regexHelpString); +const QRegularExpression SPACE_REGEX("\\s"); + const QSet zeroWidthEmotes{ "SoSnowy", "IceCold", "SantaHat", "TopHat", "ReinDeer", "CandyCane", "cvMask", "cvHazmat", @@ -512,7 +515,7 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text, // check system message for links // (e.g. needed for sub ticket message in sub only mode) const QStringList textFragments = - text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts); + text.split(SPACE_REGEX, Qt::SkipEmptyParts); for (const auto &word : textFragments) { auto link = linkparser::parse(word); @@ -531,33 +534,100 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text, this->message().searchText = text; } -MessageBuilder::MessageBuilder(RaidEntryMessageTag, const QString &text, - const QString &loginName, - const QString &displayName, - const MessageColor &userColor, const QTime &time) - : MessageBuilder() +MessagePtrMut MessageBuilder::makeSystemMessageWithUser( + const QString &text, const QString &loginName, const QString &displayName, + const MessageColor &userColor, const QTime &time) { - this->emplace(time); + MessageBuilder builder; + builder.emplace(time); - const QStringList textFragments = - text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts); + const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts); for (const auto &word : textFragments) { if (word == displayName) { - this->emplace(displayName, loginName, - MessageColor::System, userColor); + builder.emplace(displayName, loginName, + MessageColor::System, userColor); continue; } - this->emplace(word, MessageElementFlag::Text, - MessageColor::System); + builder.emplace(word, MessageElementFlag::Text, + MessageColor::System); } - this->message().flags.set(MessageFlag::System); - this->message().flags.set(MessageFlag::DoNotTriggerNotification); - this->message().messageText = text; - this->message().searchText = text; + builder->flags.set(MessageFlag::System); + builder->flags.set(MessageFlag::DoNotTriggerNotification); + builder->messageText = text; + builder->searchText = text; + + return builder.release(); +} + +MessagePtrMut MessageBuilder::makeSubgiftMessage(const QString &text, + const QVariantMap &tags, + const QTime &time) +{ + MessageBuilder builder; + builder.emplace(time); + + auto gifterLogin = tags.value("login").toString(); + auto gifterDisplayName = tags.value("display-name").toString(); + if (gifterDisplayName.isEmpty()) + { + gifterDisplayName = gifterLogin; + } + MessageColor gifterColor = MessageColor::System; + if (auto colorTag = tags.value("color").value(); colorTag.isValid()) + { + gifterColor = MessageColor(colorTag); + } + + auto recipientLogin = + tags.value("msg-param-recipient-user-name").toString(); + if (recipientLogin.isEmpty()) + { + recipientLogin = tags.value("msg-param-recipient-name").toString(); + } + auto recipientDisplayName = + tags.value("msg-param-recipient-display-name").toString(); + if (recipientDisplayName.isEmpty()) + { + recipientDisplayName = recipientLogin; + } + + const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts); + for (const auto &word : textFragments) + { + if (word == gifterDisplayName) + { + builder.emplace(gifterDisplayName, gifterLogin, + MessageColor::System, gifterColor); + continue; + } + if (word.endsWith('!') && + word.size() == recipientDisplayName.size() + 1 && + word.startsWith(recipientDisplayName)) + { + builder + .emplace(recipientDisplayName, recipientLogin, + MessageColor::System, + MessageColor::System) + ->setTrailingSpace(false); + builder.emplace(u"!"_s, MessageElementFlag::Text, + MessageColor::System); + continue; + } + + builder.emplace(word, MessageElementFlag::Text, + MessageColor::System); + } + + builder->flags.set(MessageFlag::System); + builder->flags.set(MessageFlag::DoNotTriggerNotification); + builder->messageText = text; + builder->searchText = text; + + return builder.release(); } MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser, @@ -1568,6 +1638,12 @@ std::pair MessageBuilder::makeAutomodMessage( { MessageBuilder builder, builder2; + if (action.reasonCode == PubSubAutoModQueueMessage::Reason::BlockedTerm) + { + builder.message().flags.set(MessageFlag::AutoModBlockedTerm); + builder2.message().flags.set(MessageFlag::AutoModBlockedTerm); + } + // // Builder for AutoMod message with explanation builder.message().id = "automod_" + action.msgID; diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp index 45b65095d..122348b06 100644 --- a/src/messages/MessageBuilder.hpp +++ b/src/messages/MessageBuilder.hpp @@ -52,8 +52,6 @@ namespace linkparser { struct SystemMessageTag { }; -struct RaidEntryMessageTag { -}; struct TimeoutMessageTag { }; struct LiveUpdatesUpdateEmoteMessageTag { @@ -69,7 +67,6 @@ struct ImageUploaderResultTag { // NOLINTBEGIN(readability-identifier-naming) const SystemMessageTag systemMessage{}; -const RaidEntryMessageTag raidEntryMessage{}; const TimeoutMessageTag timeoutMessage{}; const LiveUpdatesUpdateEmoteMessageTag liveUpdatesUpdateEmoteMessage{}; const LiveUpdatesRemoveEmoteMessageTag liveUpdatesRemoveEmoteMessage{}; @@ -109,9 +106,6 @@ public: MessageBuilder(SystemMessageTag, const QString &text, const QTime &time = QTime::currentTime()); - MessageBuilder(RaidEntryMessageTag, const QString &text, - const QString &loginName, const QString &displayName, - const MessageColor &userColor, const QTime &time); MessageBuilder(TimeoutMessageTag, const QString &timeoutUser, const QString &sourceUser, const QString &systemMessageText, int times, const QTime &time = QTime::currentTime()); @@ -255,6 +249,15 @@ public: const std::shared_ptr &thread = {}, const MessagePtr &parent = {}); + static MessagePtrMut makeSystemMessageWithUser( + const QString &text, const QString &loginName, + const QString &displayName, const MessageColor &userColor, + const QTime &time); + + static MessagePtrMut makeSubgiftMessage(const QString &text, + const QVariantMap &tags, + const QTime &time); + private: struct TextState { TwitchChannel *twitchChannel = nullptr; diff --git a/src/messages/MessageFlag.hpp b/src/messages/MessageFlag.hpp index 60c213f03..306587a09 100644 --- a/src/messages/MessageFlag.hpp +++ b/src/messages/MessageFlag.hpp @@ -52,6 +52,8 @@ enum class MessageFlag : std::int64_t { Action = (1LL << 36), /// The message is sent in a different source channel as part of a Shared Chat session SharedMessage = (1LL << 37), + /// AutoMod message that showed up due to containing a blocked term in the channel + AutoModBlockedTerm = (1LL << 38), }; using MessageFlags = FlagsEnum; diff --git a/src/messages/MessageSimilarity.cpp b/src/messages/MessageSimilarity.cpp new file mode 100644 index 000000000..2f8157d6b --- /dev/null +++ b/src/messages/MessageSimilarity.cpp @@ -0,0 +1,121 @@ +#include "messages/MessageSimilarity.hpp" + +#include "Application.hpp" +#include "controllers/accounts/AccountController.hpp" +#include "messages/LimitedQueueSnapshot.hpp" // IWYU pragma: keep +#include "providers/twitch/TwitchAccount.hpp" +#include "singletons/Settings.hpp" + +#include +#include + +namespace { + +using namespace chatterino; + +float relativeSimilarity(QStringView str1, QStringView str2) +{ + using SizeType = QStringView::size_type; + + // Longest Common Substring Problem + std::vector> tree(str1.size(), + std::vector(str2.size(), 0)); + int z = 0; + + for (SizeType i = 0; i < str1.size(); ++i) + { + for (SizeType j = 0; j < str2.size(); ++j) + { + if (str1[i] == str2[j]) + { + if (i == 0 || j == 0) + { + tree[i][j] = 1; + } + else + { + tree[i][j] = tree[i - 1][j - 1] + 1; + } + z = std::max(tree[i][j], z); + } + else + { + tree[i][j] = 0; + } + } + } + + // ensure that no div by 0 + if (z == 0) + { + return 0.F; + } + + auto div = std::max<>({static_cast(1), str1.size(), str2.size()}); + + return float(z) / float(div); +} + +template +float inMessages(const MessagePtr &msg, const T &messages) +{ + float similarityPercent = 0.0F; + + for (const auto &prevMsg : + messages | std::views::reverse | + std::views::take(getSettings()->hideSimilarMaxMessagesToCheck)) + { + if (prevMsg->parseTime.secsTo(QTime::currentTime()) >= + getSettings()->hideSimilarMaxDelay) + { + break; + } + if (getSettings()->hideSimilarBySameUser && + msg->loginName != prevMsg->loginName) + { + continue; + } + similarityPercent = std::max( + similarityPercent, + relativeSimilarity(msg->messageText, prevMsg->messageText)); + } + + return similarityPercent; +} + +} // namespace + +namespace chatterino { + +template +void setSimilarityFlags(const MessagePtr &message, const T &messages) +{ + if (getSettings()->similarityEnabled) + { + bool isMyself = + message->loginName == + getApp()->getAccounts()->twitch.getCurrent()->getUserName(); + bool hideMyself = getSettings()->hideSimilarMyself; + + if (isMyself && !hideMyself) + { + return; + } + + if (inMessages(message, messages) > getSettings()->similarityPercentage) + { + message->flags.set(MessageFlag::Similar); + if (getSettings()->colorSimilarDisabled) + { + message->flags.set(MessageFlag::Disabled); + } + } + } +} + +template void setSimilarityFlags>( + const MessagePtr &msg, const std::vector &messages); +template void setSimilarityFlags>( + const MessagePtr &msg, const LimitedQueueSnapshot &messages); + +} // namespace chatterino diff --git a/src/messages/MessageSimilarity.hpp b/src/messages/MessageSimilarity.hpp new file mode 100644 index 000000000..54d0214d7 --- /dev/null +++ b/src/messages/MessageSimilarity.hpp @@ -0,0 +1,11 @@ +#pragma once + +#include "messages/Message.hpp" + +#include +namespace chatterino { + +template +void setSimilarityFlags(const MessagePtr &message, const T &messages); + +} // namespace chatterino diff --git a/src/messages/MessageSink.hpp b/src/messages/MessageSink.hpp new file mode 100644 index 000000000..e720a1867 --- /dev/null +++ b/src/messages/MessageSink.hpp @@ -0,0 +1,67 @@ +#pragma once + +#include "common/enums/MessageContext.hpp" +#include "common/FlagsEnum.hpp" +#include "messages/MessageFlag.hpp" + +#include +#include + +class QStringView; +class QTime; + +namespace chatterino { + +struct Message; +using MessagePtr = std::shared_ptr; + +enum class MessageSinkTrait : uint8_t { + None = 0, + + /// Messages with the `Highlighted` and `ShowInMentions` flags should be + /// added to the global mentions channel when encountered. + AddMentionsToGlobalChannel = 1 << 0, + + /// A channel-point redemption whose reward is not yet known should not be + /// added to this sink, but queued in the corresponding TwitchChannel + /// (`addQueuedRedemption`). + RequiresKnownChannelPointReward = 1 << 1, +}; +using MessageSinkTraits = FlagsEnum; + +/// A generic interface for a managed buffer of `Message`s +class MessageSink +{ +public: + virtual ~MessageSink() = default; + + /// Add a message to this sink + /// + /// @param message The message to add (non-null) + /// @param ctx The context in which this message is being added. + /// @param overridingFlags + virtual void addMessage( + MessagePtr message, MessageContext ctx, + std::optional overridingFlags = std::nullopt) = 0; + + /// Adds a timeout message or merges it into an existing one + virtual void addOrReplaceTimeout(MessagePtr clearchatMessage, + QTime now) = 0; + + /// Flags all messages as `Disabled` + virtual void disableAllMessages() = 0; + + /// Searches for similar messages and flags this message as similar + /// (based on the current settings). + virtual void applySimilarityFilters(const MessagePtr &message) const = 0; + + /// @brief Searches for a message by an ID + /// + /// If there is no message found, an empty shared-pointer is returned. + virtual MessagePtr findMessageByID(QStringView id) = 0; + + /// Behaviour to be exercised when parsing/building messages for this sink. + virtual MessageSinkTraits sinkTraits() const = 0; +}; + +} // namespace chatterino diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index 81c75c6b4..dc51113f6 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -141,6 +141,9 @@ void MessageLayout::actuallyLayout(const MessageLayoutContext &ctx) bool hideModerated = getSettings()->hideModerated; bool hideModerationActions = getSettings()->hideModerationActions; + bool hideBlockedTermAutomodMessages = + getSettings()->showBlockedTermAutomodMessages.getEnum() == + ShowModerationState::Never; bool hideSimilar = getSettings()->hideSimilar; bool hideReplies = !ctx.flags.has(MessageElementFlag::RepliedMessage); @@ -154,9 +157,21 @@ void MessageLayout::actuallyLayout(const MessageLayoutContext &ctx) continue; } + if (hideBlockedTermAutomodMessages && + this->message_->flags.has(MessageFlag::AutoModBlockedTerm)) + { + // NOTE: This hides the message but it will make the message re-appear if moderation message hiding is no longer active, and the layout is re-laid-out. + // This is only the case for the moderation messages that don't get filtered during creation. + // We should decide which is the correct method & apply that everywhere + continue; + } + if (this->message_->flags.has(MessageFlag::Timeout) || this->message_->flags.has(MessageFlag::Untimeout)) { + // NOTE: This hides the message but it will make the message re-appear if moderation message hiding is no longer active, and the layout is re-laid-out. + // This is only the case for the moderation messages that don't get filtered during creation. + // We should decide which is the correct method & apply that everywhere if (hideModerationActions || (getSettings()->streamerModeHideModActions && getApp()->getStreamerMode()->isEnabled())) diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp index dbf04fb77..20569a8b8 100644 --- a/src/messages/layouts/MessageLayoutContainer.cpp +++ b/src/messages/layouts/MessageLayoutContainer.cpp @@ -854,6 +854,18 @@ std::optional MessageLayoutContainer::paintSelectionStart( { const auto selectionColor = getTheme()->messages.selection; + auto paintRemainingLines = [&](size_t startIndex) { + for (size_t i = startIndex; i < this->lines_.size(); i++) + { + const auto &line = this->lines_[i]; + auto left = this->elements_[line.startIndex]->getRect().left(); + auto right = this->elements_[line.endIndex - 1]->getRect().right(); + + this->paintSelectionRect(painter, line, left, right, yOffset, + selectionColor); + } + }; + // The selection starts in this message for (size_t lineIndex = 0; lineIndex < this->lines_.size(); lineIndex++) { @@ -874,7 +886,17 @@ std::optional MessageLayoutContainer::paintSelectionStart( auto right = this->elements_[line.endIndex - 1]->getRect().right(); this->paintSelectionRect(painter, line, right, right, yOffset, selectionColor); - return std::nullopt; + + if (selection.selectionMax.messageIndex != messageIndex) + { + // The selection does not end in this message + paintRemainingLines(lineIndex + 1); + + return std::nullopt; + } + + // The selection starts in this line, but ends in some next line or message + return {lineIndex + 1}; } int x = this->elements_[line.startIndex]->getRect().left(); @@ -923,21 +945,9 @@ std::optional MessageLayoutContainer::paintSelectionStart( if (selection.selectionMax.messageIndex != messageIndex) { // The selection does not end in this message - for (size_t lineIndex2 = lineIndex + 1; - lineIndex2 < this->lines_.size(); lineIndex2++) - { - const auto &line2 = this->lines_[lineIndex2]; - auto left = - this->elements_[line2.startIndex]->getRect().left(); - auto right = - this->elements_[line2.endIndex - 1]->getRect().right(); - - this->paintSelectionRect(painter, line2, left, right, - yOffset, selectionColor); - } - this->paintSelectionRect(painter, line, x, r, yOffset, selectionColor); + paintRemainingLines(lineIndex + 1); return std::nullopt; } diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp index 1cd7f6af2..e59e53922 100644 --- a/src/messages/layouts/MessageLayoutContainer.hpp +++ b/src/messages/layouts/MessageLayoutContainer.hpp @@ -283,7 +283,12 @@ private: /** * Paint the selection start * - * Returns a line index if this message should also paint the selection end + * @returns A line index if the selection ends within this message but start + * and end are on different lines. The returned index is the index + * of the first line where the selection starts at the beginning of + * the line. This index should be passed to paintSelectionEnd(). + * If `std::nullopt` is returned, no further call to + * paintSelectionEnd() is necessary. */ std::optional paintSelectionStart(QPainter &painter, size_t messageIndex, diff --git a/src/providers/recentmessages/Impl.cpp b/src/providers/recentmessages/Impl.cpp index 410a34aac..4605204eb 100644 --- a/src/providers/recentmessages/Impl.cpp +++ b/src/providers/recentmessages/Impl.cpp @@ -3,7 +3,9 @@ #include "common/Env.hpp" #include "messages/MessageBuilder.hpp" #include "providers/twitch/IrcMessageHandler.hpp" +#include "providers/twitch/TwitchChannel.hpp" #include "util/Helpers.hpp" +#include "util/VectorMessageSink.hpp" #include #include @@ -40,7 +42,13 @@ std::vector parseRecentMessages( std::vector buildRecentMessages( std::vector &messages, Channel *channel) { - std::vector allBuiltMessages; + VectorMessageSink sink({}, MessageFlag::RecentMessage); + + auto *twitchChannel = dynamic_cast(channel); + if (!twitchChannel) + { + return {}; + } for (auto *message : messages) { @@ -58,24 +66,16 @@ std::vector buildRecentMessages( auto msg = makeSystemMessage( QLocale().toString(msgDate, QLocale::LongFormat), QTime(0, 0)); - msg->flags.set(MessageFlag::RecentMessage); - allBuiltMessages.emplace_back(msg); + sink.addMessage(msg, MessageContext::Original); } } - auto builtMessages = IrcMessageHandler::parseMessageWithReply( - channel, message, allBuiltMessages); - - for (const auto &builtMessage : builtMessages) - { - builtMessage->flags.set(MessageFlag::RecentMessage); - allBuiltMessages.emplace_back(builtMessage); - } + IrcMessageHandler::parseMessageInto(message, sink, twitchChannel); message->deleteLater(); } - return allBuiltMessages; + return std::move(sink).takeMessages(); } // Returns the URL to be used for querying the Recent Messages API for the diff --git a/src/providers/seventv/SeventvEventAPI.cpp b/src/providers/seventv/SeventvEventAPI.cpp index fcb99ce12..41f219639 100644 --- a/src/providers/seventv/SeventvEventAPI.cpp +++ b/src/providers/seventv/SeventvEventAPI.cpp @@ -233,6 +233,14 @@ void SeventvEventAPI::handleDispatch(const Dispatch &dispatch) } } break; + case SubscriptionType::ResetEntitlement: { + // unhandled (not clear what we'd do here yet) + } + break; + case SubscriptionType::CreateEmoteSet: { + // unhandled (c2 does not support custom emote sets) + } + break; default: { qCDebug(chatterinoSeventvEventAPI) << "Unknown subscription type:" diff --git a/src/providers/seventv/eventapi/Subscription.hpp b/src/providers/seventv/eventapi/Subscription.hpp index 65cf03544..c6767b139 100644 --- a/src/providers/seventv/eventapi/Subscription.hpp +++ b/src/providers/seventv/eventapi/Subscription.hpp @@ -27,6 +27,7 @@ enum class SubscriptionType { CreateEntitlement, UpdateEntitlement, DeleteEntitlement, + ResetEntitlement, INVALID, }; @@ -119,6 +120,8 @@ constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name< return "entitlement.update"; case SubscriptionType::DeleteEntitlement: return "entitlement.delete"; + case SubscriptionType::ResetEntitlement: + return "entitlement.reset"; default: return default_tag; diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 249bd6c3c..9864b3644 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/src/providers/twitch/IrcMessageHandler.cpp @@ -7,24 +7,21 @@ #include "common/QLogging.hpp" #include "controllers/accounts/AccountController.hpp" #include "controllers/ignores/IgnoreController.hpp" -#include "messages/LimitedQueue.hpp" #include "messages/Link.hpp" #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" #include "messages/MessageColor.hpp" #include "messages/MessageElement.hpp" +#include "messages/MessageSink.hpp" #include "messages/MessageThread.hpp" -#include "providers/twitch/ChannelPointReward.hpp" #include "providers/twitch/TwitchAccount.hpp" #include "providers/twitch/TwitchAccountManager.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchHelpers.hpp" #include "providers/twitch/TwitchIrcServer.hpp" -#include "singletons/Resources.hpp" #include "singletons/Settings.hpp" #include "singletons/StreamerMode.hpp" #include "singletons/WindowManager.hpp" -#include "util/ChannelHelpers.hpp" #include "util/FormatTime.hpp" #include "util/Helpers.hpp" #include "util/IrcHelpers.hpp" @@ -34,7 +31,6 @@ #include #include -#include using namespace chatterino::literals; @@ -165,50 +161,6 @@ ChannelPtr channelOrEmptyByTarget(const QString &target, return server.getChannelOrEmpty(channelName); } -float relativeSimilarity(const QString &str1, const QString &str2) -{ - // Longest Common Substring Problem - std::vector> tree(str1.size(), - std::vector(str2.size(), 0)); - int z = 0; - - for (int i = 0; i < str1.size(); ++i) - { - for (int j = 0; j < str2.size(); ++j) - { - if (str1[i] == str2[j]) - { - if (i == 0 || j == 0) - { - tree[i][j] = 1; - } - else - { - tree[i][j] = tree[i - 1][j - 1] + 1; - } - if (tree[i][j] > z) - { - z = tree[i][j]; - } - } - else - { - tree[i][j] = 0; - } - } - } - - // ensure that no div by 0 - if (z == 0) - { - return 0.F; - } - - auto div = std::max(1, std::max(str1.size(), str2.size())); - - return float(z) / float(div); -} - QMap parseBadges(const QString &badgesString) { QMap badges; @@ -232,106 +184,6 @@ struct ReplyContext { MessagePtr parent; }; -[[nodiscard]] ReplyContext getReplyContext( - TwitchChannel *channel, Communi::IrcMessage *message, - const std::vector &otherLoaded) -{ - ReplyContext ctx; - - const auto &tags = message->tags(); - if (const auto it = tags.find("reply-thread-parent-msg-id"); - it != tags.end()) - { - const QString replyID = it.value().toString(); - auto threadIt = channel->threads().find(replyID); - std::shared_ptr rootThread; - if (threadIt != channel->threads().end()) - { - auto owned = threadIt->second.lock(); - if (owned) - { - // Thread already exists (has a reply) - checkThreadSubscription(tags, message->nick(), owned); - ctx.thread = owned; - rootThread = owned; - } - } - - if (!rootThread) - { - MessagePtr foundMessage; - - // Thread does not yet exist, find root reply and create thread. - // Linear search is justified by the infrequent use of replies - for (const auto &otherMsg : otherLoaded) - { - if (otherMsg->id == replyID) - { - // Found root reply message - foundMessage = otherMsg; - break; - } - } - - if (!foundMessage) - { - // We didn't find the reply root message in the otherLoaded messages - // which are typically the already-parsed recent messages from the - // Recent Messages API. We could have a really old message that - // still exists being replied to, so check for that here. - foundMessage = channel->findMessage(replyID); - } - - if (foundMessage) - { - std::shared_ptr newThread = - std::make_shared(foundMessage); - checkThreadSubscription(tags, message->nick(), newThread); - - ctx.thread = newThread; - rootThread = newThread; - // Store weak reference to thread in channel - channel->addReplyThread(newThread); - } - } - - if (const auto parentIt = tags.find("reply-parent-msg-id"); - parentIt != tags.end()) - { - const QString parentID = parentIt.value().toString(); - if (replyID == parentID) - { - if (rootThread) - { - ctx.parent = rootThread->root(); - } - } - else - { - auto parentThreadIt = channel->threads().find(parentID); - if (parentThreadIt != channel->threads().end()) - { - auto thread = parentThreadIt->second.lock(); - if (thread) - { - ctx.parent = thread->root(); - } - } - else - { - auto parent = channel->findMessage(parentID); - if (parent) - { - ctx.parent = parent; - } - } - } - } - } - - return ctx; -} - std::optional parseClearChatMessage( Communi::IrcMessage *message) { @@ -370,9 +222,9 @@ std::optional parseClearChatMessage( } /** - * Parse a single IRC NOTICE message into 0 or more Chatterino messages + * Parse a single IRC NOTICE message into a Chatterino message **/ -std::vector parseNoticeMessage(Communi::IrcNoticeMessage *message) +MessagePtr parseNoticeMessage(Communi::IrcNoticeMessage *message) { assert(message != nullptr); @@ -400,7 +252,7 @@ std::vector parseNoticeMessage(Communi::IrcNoticeMessage *message) linkColor) ->setLink(accountsLink); - return {builder.release()}; + return builder.release(); } if (message->content().startsWith("You are permanently banned ")) @@ -410,256 +262,19 @@ std::vector parseNoticeMessage(Communi::IrcNoticeMessage *message) if (message->tags().value("msg-id") == "msg_timedout") { - std::vector builtMessage; - QString remainingTime = formatTime(message->content().split(" ").value(5)); QString formattedMessage = QString("You are timed out for %1.") .arg(remainingTime.isEmpty() ? "0s" : remainingTime); - builtMessage.emplace_back(makeSystemMessage( - formattedMessage, calculateMessageTime(message).time())); - - return builtMessage; + return makeSystemMessage(formattedMessage, + calculateMessageTime(message).time()); } // default case - std::vector builtMessages; - - builtMessages.emplace_back(makeSystemMessage( - message->content(), calculateMessageTime(message).time())); - - return builtMessages; -} - -/** - * Parse a single IRC USERNOTICE message into 0 or more Chatterino messages - **/ -std::vector parseUserNoticeMessage(Channel *channel, - Communi::IrcMessage *message) -{ - assert(channel != nullptr); - assert(message != nullptr); - - std::vector builtMessages; - - auto tags = message->tags(); - auto parameters = message->parameters(); - - QString msgType = tags.value("msg-id").toString(); - bool mirrored = msgType == "sharedchatnotice"; - if (mirrored) - { - msgType = tags.value("source-msg-id").toString(); - } - else - { - auto rIt = tags.find("room-id"); - auto sIt = tags.find("source-room-id"); - if (rIt != tags.end() && sIt != tags.end()) - { - mirrored = rIt.value().toString() != sIt.value().toString(); - } - } - - if (mirrored && msgType != "announcement") - { - // avoid confusing broadcasters with user payments to other channels - return {}; - } - - QString content; - if (parameters.size() >= 2) - { - content = parameters[1]; - } - - if (isIgnoredMessage({ - .message = content, - .twitchUserID = tags.value("user-id").toString(), - .isMod = channel->isMod(), - .isBroadcaster = channel->isBroadcaster(), - })) - { - return {}; - } - - if (SPECIAL_MESSAGE_TYPES.contains(msgType)) - { - // Messages are not required, so they might be empty - if (!content.isEmpty()) - { - MessageParseArgs args; - args.trimSubscriberUsername = true; - args.allowIgnore = false; - - auto [built, highlight] = MessageBuilder::makeIrcMessage( - channel, message, args, content, 0); - if (built) - { - built->flags.set(MessageFlag::Subscription); - built->flags.unset(MessageFlag::Highlighted); - if (mirrored) - { - built->flags.set(MessageFlag::SharedMessage); - } - builtMessages.emplace_back(std::move(built)); - } - } - } - - auto it = tags.find("system-msg"); - - if (it != tags.end()) - { - // By default, we return value of system-msg tag - QString messageText = it.value().toString(); - - if (msgType == "bitsbadgetier") - { - messageText = - QString("%1 just earned a new %2 Bits badge!") - .arg(tags.value("display-name").toString(), - kFormatNumbers( - tags.value("msg-param-threshold").toInt())); - } - else if (msgType == "announcement") - { - messageText = "Announcement"; - } - else if (msgType == "raid") - { - auto login = tags.value("login").toString(); - auto displayName = tags.value("msg-param-displayName").toString(); - - if (!login.isEmpty() && !displayName.isEmpty()) - { - MessageColor color = MessageColor::System; - if (auto colorTag = tags.value("color").value(); - colorTag.isValid()) - { - color = MessageColor(colorTag); - } - - auto b = MessageBuilder( - raidEntryMessage, parseTagString(messageText), login, - displayName, color, calculateMessageTime(message).time()); - - b->flags.set(MessageFlag::Subscription); - if (mirrored) - { - b->flags.set(MessageFlag::SharedMessage); - } - - auto newMessage = b.release(); - builtMessages.emplace_back(newMessage); - return builtMessages; - } - } - else if (msgType == "subgift") - { - if (auto monthsIt = tags.find("msg-param-gift-months"); - monthsIt != tags.end()) - { - int months = monthsIt.value().toInt(); - if (months > 1) - { - auto plan = tags.value("msg-param-sub-plan").toString(); - QString name = - ANONYMOUS_GIFTER_ID == tags.value("user-id").toString() - ? "An anonymous user" - : tags.value("display-name").toString(); - messageText = - QString("%1 gifted %2 months of a Tier %3 sub to %4!") - .arg(name, QString::number(months), - plan.isEmpty() ? '1' : plan.at(0), - tags.value("msg-param-recipient-display-name") - .toString()); - - if (auto countIt = tags.find("msg-param-sender-count"); - countIt != tags.end()) - { - int count = countIt.value().toInt(); - if (count > months) - { - messageText += - QString( - " They've gifted %1 months in the channel.") - .arg(QString::number(count)); - } - } - } - } - } - else if (msgType == "sub" || msgType == "resub") - { - if (auto tenure = tags.find("msg-param-multimonth-tenure"); - tenure != tags.end() && tenure.value().toInt() == 0) - { - int months = - tags.value("msg-param-multimonth-duration").toInt(); - if (months > 1) - { - int tier = tags.value("msg-param-sub-plan").toInt() / 1000; - messageText = - QString( - "%1 subscribed at Tier %2 for %3 months in advance") - .arg(tags.value("display-name").toString(), - QString::number(tier), - QString::number(months)); - if (msgType == "resub") - { - int cumulative = - tags.value("msg-param-cumulative-months").toInt(); - messageText += - QString(", reaching %1 months cumulatively so far!") - .arg(QString::number(cumulative)); - } - else - { - messageText += "!"; - } - } - } - } - - auto b = MessageBuilder(systemMessage, parseTagString(messageText), - calculateMessageTime(message).time()); - b->flags.set(MessageFlag::Subscription); - if (mirrored) - { - b->flags.set(MessageFlag::SharedMessage); - } - - auto newMessage = b.release(); - builtMessages.emplace_back(newMessage); - } - - return builtMessages; -} - -/** - * Parse a single IRC PRIVMSG into 0-1 Chatterino messages - */ -std::vector parsePrivMessage(Channel *channel, - Communi::IrcPrivateMessage *message) -{ - assert(channel != nullptr); - assert(message != nullptr); - - std::vector builtMessages; - MessageParseArgs args; - args.isAction = message->isAction(); - auto [built, alert] = MessageBuilder::makeIrcMessage(channel, message, args, - message->content(), 0); - if (built) - { - builtMessages.emplace_back(std::move(built)); - MessageBuilder::triggerHighlights(channel, alert); - } - - return builtMessages; + return makeSystemMessage(message->content(), + calculateMessageTime(message).time()); } } // namespace @@ -674,65 +289,27 @@ IrcMessageHandler &IrcMessageHandler::instance() return instance; } -std::vector IrcMessageHandler::parseMessageWithReply( - Channel *channel, Communi::IrcMessage *message, - std::vector &otherLoaded) +void IrcMessageHandler::parseMessageInto(Communi::IrcMessage *message, + MessageSink &sink, + TwitchChannel *channel) { - std::vector builtMessages; - auto command = message->command(); if (command == u"PRIVMSG"_s) { - auto *privMsg = dynamic_cast(message); - auto *tc = dynamic_cast(channel); - if (!tc) - { - return parsePrivMessage(channel, privMsg); - } - - QString content = privMsg->content(); - int messageOffset = stripLeadingReplyMention(privMsg->tags(), content); - MessageParseArgs args; - auto tags = privMsg->tags(); - if (const auto it = tags.find("custom-reward-id"); it != tags.end()) - { - args.channelPointRewardId = it.value().toString(); - } - args.isAction = privMsg->isAction(); - - auto replyCtx = getReplyContext(tc, message, otherLoaded); - auto [built, alert] = MessageBuilder::makeIrcMessage( - channel, message, args, content, messageOffset, replyCtx.thread, - replyCtx.parent); - - if (built) - { - builtMessages.emplace_back(built); - MessageBuilder::triggerHighlights(channel, alert); - } - - if (message->tags().contains(u"pinned-chat-paid-amount"_s)) - { - auto ptr = MessageBuilder::buildHypeChatMessage(privMsg); - if (ptr) - { - builtMessages.emplace_back(std::move(ptr)); - } - } - - return builtMessages; + parsePrivMessageInto( + dynamic_cast(message), sink, channel); } - - if (command == u"USERNOTICE"_s) + else if (command == u"USERNOTICE"_s) { - return parseUserNoticeMessage(channel, message); + parseUserNoticeMessageInto(message, sink, channel); } if (command == u"NOTICE"_s) { - return parseNoticeMessage( - dynamic_cast(message)); + sink.addMessage(parseNoticeMessage( + dynamic_cast(message)), + MessageContext::Original); } if (command == u"CLEARCHAT"_s) @@ -740,32 +317,20 @@ std::vector IrcMessageHandler::parseMessageWithReply( auto cc = parseClearChatMessage(message); if (!cc) { - return builtMessages; + return; } auto &clearChat = *cc; if (clearChat.disableAllMessages) { - builtMessages.emplace_back(std::move(clearChat.message)); + sink.addMessage(std::move(clearChat.message), + MessageContext::Original); } else { - addOrReplaceChannelTimeout( - otherLoaded, std::move(clearChat.message), - calculateMessageTime(message).time(), - [&](auto idx, auto /*msg*/, auto &&replacement) { - replacement->flags.set(MessageFlag::RecentMessage); - otherLoaded[idx] = replacement; - }, - [&](auto &&msg) { - builtMessages.emplace_back(msg); - }, - false); + sink.addOrReplaceTimeout(std::move(clearChat.message), + calculateMessageTime(message).time()); } - - return builtMessages; } - - return builtMessages; } void IrcMessageHandler::handlePrivMessage(Communi::IrcPrivateMessage *message, @@ -778,32 +343,41 @@ void IrcMessageHandler::handlePrivMessage(Communi::IrcPrivateMessage *message, } auto *twitchChannel = dynamic_cast(chan.get()); - - if (twitchChannel != nullptr) + if (!twitchChannel) { - auto currentUser = getApp()->getAccounts()->twitch.getCurrent(); - if (message->tag("user-id") == currentUser->getUserId()) + return; + } + + parsePrivMessageInto(message, *twitchChannel, twitchChannel); +} + +void IrcMessageHandler::parsePrivMessageInto( + Communi::IrcPrivateMessage *message, MessageSink &sink, + TwitchChannel *channel) +{ + auto currentUser = getApp()->getAccounts()->twitch.getCurrent(); + if (message->tag("user-id") == currentUser->getUserId()) + { + auto badgesTag = message->tag("badges"); + if (badgesTag.isValid()) { - auto badgesTag = message->tag("badges"); - if (badgesTag.isValid()) - { - auto parsedBadges = parseBadges(badgesTag.toString()); - twitchChannel->setMod(parsedBadges.contains("moderator")); - twitchChannel->setVIP(parsedBadges.contains("vip")); - twitchChannel->setStaff(parsedBadges.contains("staff")); - } + auto parsedBadges = parseBadges(badgesTag.toString()); + channel->setMod(parsedBadges.contains("moderator")); + channel->setVIP(parsedBadges.contains("vip")); + channel->setStaff(parsedBadges.contains("staff")); } } - this->addMessage(message, chan, unescapeZeroWidthJoiner(message->content()), - twitchServer, false, message->isAction()); + IrcMessageHandler::addMessage( + message, sink, channel, unescapeZeroWidthJoiner(message->content()), + *getApp()->getTwitch(), false, message->isAction()); if (message->tags().contains(u"pinned-chat-paid-amount"_s)) { auto ptr = MessageBuilder::buildHypeChatMessage(message); if (ptr) { - chan->addMessage(ptr, MessageContext::Original); + sink.addMessage(ptr, MessageContext::Original); } } } @@ -900,7 +474,8 @@ void IrcMessageHandler::handleClearChatMessage(Communi::IrcMessage *message) return; } - chan->addOrReplaceTimeout(std::move(clearChat.message)); + chan->addOrReplaceTimeout(std::move(clearChat.message), + calculateMessageTime(message).time()); // refresh all getApp()->getWindows()->repaintVisibleChatWidgets(chan.get()); @@ -1039,11 +614,24 @@ void IrcMessageHandler::handleWhisperMessage(Communi::IrcMessage *ircMessage) void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, ITwitchIrcServer &twitchServer) +{ + auto target = message->parameter(0); + auto *channel = dynamic_cast( + twitchServer.getChannelOrEmpty(target).get()); + if (!channel) + { + return; + } + parseUserNoticeMessageInto(message, *channel, channel); +} + +void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message, + MessageSink &sink, + TwitchChannel *channel) { auto tags = message->tags(); auto parameters = message->parameters(); - auto target = parameters[0]; QString msgType = tags.value("msg-id").toString(); bool mirrored = msgType == "sharedchatnotice"; if (mirrored) @@ -1072,12 +660,11 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, content = parameters[1]; } - auto chn = twitchServer.getChannelOrEmpty(target); if (isIgnoredMessage({ .message = content, .twitchUserID = tags.value("user-id").toString(), - .isMod = chn->isMod(), - .isBroadcaster = chn->isBroadcaster(), + .isMod = channel->isMod(), + .isBroadcaster = channel->isBroadcaster(), })) { return; @@ -1088,7 +675,8 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, // Messages are not required, so they might be empty if (!content.isEmpty()) { - this->addMessage(message, chn, content, twitchServer, true, false); + addMessage(message, sink, channel, content, *getApp()->getTwitch(), + true, false); } } @@ -1111,53 +699,6 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, { messageText = "Announcement"; } - else if (msgType == "raid") - { - auto login = tags.value("login").toString(); - auto displayName = tags.value("msg-param-displayName").toString(); - - if (!login.isEmpty() && !displayName.isEmpty()) - { - MessageColor color = MessageColor::System; - if (auto colorTag = tags.value("color").value(); - colorTag.isValid()) - { - color = MessageColor(colorTag); - } - - auto b = MessageBuilder( - raidEntryMessage, parseTagString(messageText), login, - displayName, color, calculateMessageTime(message).time()); - - b->flags.set(MessageFlag::Subscription); - if (mirrored) - { - b->flags.set(MessageFlag::SharedMessage); - } - auto newMessage = b.release(); - - QString channelName; - - if (message->parameters().size() < 1) - { - return; - } - - if (!trimChannelName(message->parameter(0), channelName)) - { - return; - } - - auto chan = twitchServer.getChannelOrEmpty(channelName); - - if (!chan->isEmpty()) - { - chan->addMessage(newMessage, MessageContext::Original); - } - - return; - } - } else if (msgType == "subgift") { if (auto monthsIt = tags.find("msg-param-gift-months"); @@ -1192,6 +733,20 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, } } } + + // subgifts are special because they include two users + auto msg = MessageBuilder::makeSubgiftMessage( + parseTagString(messageText), tags, + calculateMessageTime(message).time()); + + msg->flags.set(MessageFlag::Subscription); + if (mirrored) + { + msg->flags.set(MessageFlag::SharedMessage); + } + + sink.addMessage(msg, MessageContext::Original); + return; } else if (msgType == "sub" || msgType == "resub") { @@ -1225,134 +780,134 @@ void IrcMessageHandler::handleUserNoticeMessage(Communi::IrcMessage *message, } } - auto b = MessageBuilder(systemMessage, parseTagString(messageText), - calculateMessageTime(message).time()); + auto displayName = [&] { + if (msgType == u"raid") + { + return tags.value("msg-param-displayName").toString(); + } + return tags.value("display-name").toString(); + }(); + auto login = tags.value("login").toString(); + if (displayName.isEmpty()) + { + displayName = login; + } - b->flags.set(MessageFlag::Subscription); + MessageColor userColor = MessageColor::System; + if (auto colorTag = tags.value("color").value(); + colorTag.isValid()) + { + userColor = MessageColor(colorTag); + } + + auto msg = MessageBuilder::makeSystemMessageWithUser( + parseTagString(messageText), login, displayName, userColor, + calculateMessageTime(message).time()); + + msg->flags.set(MessageFlag::Subscription); if (mirrored) { - b->flags.set(MessageFlag::SharedMessage); - } - auto newMessage = b.release(); - - QString channelName; - - if (message->parameters().size() < 1) - { - return; + msg->flags.set(MessageFlag::SharedMessage); } - if (!trimChannelName(message->parameter(0), channelName)) - { - return; - } - - auto chan = twitchServer.getChannelOrEmpty(channelName); - - if (!chan->isEmpty()) - { - chan->addMessage(newMessage, MessageContext::Original); - } + sink.addMessage(msg, MessageContext::Original); } } void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message) { - auto builtMessages = parseNoticeMessage(message); + auto msg = parseNoticeMessage(message); - for (const auto &msg : builtMessages) + QString channelName; + if (!trimChannelName(message->target(), channelName) || + channelName == "jtv") { - QString channelName; - if (!trimChannelName(message->target(), channelName) || - channelName == "jtv") - { - // Notice wasn't targeted at a single channel, send to all twitch - // channels - getApp()->getTwitch()->forEachChannelAndSpecialChannels( - [msg](const auto &c) { - c->addMessage(msg, MessageContext::Original); - }); + // Notice wasn't targeted at a single channel, send to all twitch + // channels + getApp()->getTwitch()->forEachChannelAndSpecialChannels( + [msg](const auto &c) { + c->addMessage(msg, MessageContext::Original); + }); + return; + } + + auto channel = getApp()->getTwitch()->getChannelOrEmpty(channelName); + + if (channel->isEmpty()) + { + qCDebug(chatterinoTwitch) + << "[IrcManager:handleNoticeMessage] Channel" << channelName + << "not found in channel manager"; + return; + } + + QString tags = message->tags().value("msg-id").toString(); + if (tags == "usage_delete") + { + channel->addSystemMessage( + "Usage: /delete - Deletes the specified message. " + "Can't take more than one argument."); + } + else if (tags == "bad_delete_message_error") + { + channel->addSystemMessage( + "There was a problem deleting the message. " + "It might be from another channel or too old to delete."); + } + else if (tags == "host_on" || tags == "host_target_went_offline") + { + bool hostOn = (tags == "host_on"); + QStringList parts = msg->messageText.split(QLatin1Char(' ')); + if ((hostOn && parts.size() != 3) || (!hostOn && parts.size() != 7)) + { return; } - - auto channel = getApp()->getTwitch()->getChannelOrEmpty(channelName); - - if (channel->isEmpty()) + auto &hostedChannelName = hostOn ? parts[2] : parts[0]; + if (hostedChannelName.size() < 2) { - qCDebug(chatterinoTwitch) - << "[IrcManager:handleNoticeMessage] Channel" << channelName - << "not found in channel manager"; return; } - - QString tags = message->tags().value("msg-id").toString(); - if (tags == "usage_delete") + if (hostOn) { - channel->addSystemMessage( - "Usage: /delete - Deletes the specified message. " - "Can't take more than one argument."); + hostedChannelName.chop(1); } - else if (tags == "bad_delete_message_error") - { - channel->addSystemMessage( - "There was a problem deleting the message. " - "It might be from another channel or too old to delete."); - } - else if (tags == "host_on" || tags == "host_target_went_offline") - { - bool hostOn = (tags == "host_on"); - QStringList parts = msg->messageText.split(QLatin1Char(' ')); - if ((hostOn && parts.size() != 3) || (!hostOn && parts.size() != 7)) - { - return; - } - auto &hostedChannelName = hostOn ? parts[2] : parts[0]; - if (hostedChannelName.size() < 2) - { - return; - } - if (hostOn) - { - hostedChannelName.chop(1); - } - channel->addMessage(MessageBuilder::makeHostingSystemMessage( - hostedChannelName, hostOn), - MessageContext::Original); - } - else if (tags == "room_mods" || tags == "vips_success") - { - // /mods and /vips - // room_mods: The moderators of this channel are: ampzyh, antichriststollen, apa420, ... - // vips_success: The VIPs of this channel are: 8008, aiden, botfactory, ... + channel->addMessage( + MessageBuilder::makeHostingSystemMessage(hostedChannelName, hostOn), + MessageContext::Original); + } + else if (tags == "room_mods" || tags == "vips_success") + { + // /mods and /vips + // room_mods: The moderators of this channel are: ampzyh, antichriststollen, apa420, ... + // vips_success: The VIPs of this channel are: 8008, aiden, botfactory, ... - QString noticeText = msg->messageText; - if (tags == "vips_success") - { - // this one has a trailing period, need to get rid of it. - noticeText.chop(1); - } - - QStringList msgParts = noticeText.split(':'); - MessageBuilder builder; - - auto *tc = dynamic_cast(channel.get()); - assert(tc != nullptr && - "IrcMessageHandler::handleNoticeMessage. Twitch specific " - "functionality called in non twitch channel"); - - auto users = msgParts.at(1) - .mid(1) // there is a space before the first user - .split(", "); - users.sort(Qt::CaseInsensitive); - channel->addMessage(MessageBuilder::makeListOfUsersMessage( - msgParts.at(0), users, tc), - MessageContext::Original); - } - else + QString noticeText = msg->messageText; + if (tags == "vips_success") { - channel->addMessage(msg, MessageContext::Original); + // this one has a trailing period, need to get rid of it. + noticeText.chop(1); } + + QStringList msgParts = noticeText.split(':'); + MessageBuilder builder; + + auto *tc = dynamic_cast(channel.get()); + assert(tc != nullptr && + "IrcMessageHandler::handleNoticeMessage. Twitch specific " + "functionality called in non twitch channel"); + + auto users = msgParts.at(1) + .mid(1) // there is a space before the first user + .split(", "); + users.sort(Qt::CaseInsensitive); + channel->addMessage( + MessageBuilder::makeListOfUsersMessage(msgParts.at(0), users, tc), + MessageContext::Original); + } + else + { + channel->addMessage(msg, MessageContext::Original); } } @@ -1405,76 +960,13 @@ void IrcMessageHandler::handlePartMessage(Communi::IrcMessage *message) } } -float IrcMessageHandler::similarity( - const MessagePtr &msg, const LimitedQueueSnapshot &messages) -{ - float similarityPercent = 0.0F; - int checked = 0; - - for (size_t i = 1; i <= messages.size(); ++i) - { - if (checked >= getSettings()->hideSimilarMaxMessagesToCheck) - { - break; - } - const auto &prevMsg = messages[messages.size() - i]; - if (prevMsg->parseTime.secsTo(QTime::currentTime()) >= - getSettings()->hideSimilarMaxDelay) - { - break; - } - if (getSettings()->hideSimilarBySameUser && - msg->loginName != prevMsg->loginName) - { - continue; - } - ++checked; - similarityPercent = std::max( - similarityPercent, - relativeSimilarity(msg->messageText, prevMsg->messageText)); - } - - return similarityPercent; -} - -void IrcMessageHandler::setSimilarityFlags(const MessagePtr &message, - const ChannelPtr &channel) -{ - if (getSettings()->similarityEnabled) - { - bool isMyself = - message->loginName == - getApp()->getAccounts()->twitch.getCurrent()->getUserName(); - bool hideMyself = getSettings()->hideSimilarMyself; - - if (isMyself && !hideMyself) - { - return; - } - - if (IrcMessageHandler::similarity(message, - channel->getMessageSnapshot()) > - getSettings()->similarityPercentage) - { - message->flags.set(MessageFlag::Similar, true); - if (getSettings()->colorSimilarDisabled) - { - message->flags.set(MessageFlag::Disabled, true); - } - } - } -} - void IrcMessageHandler::addMessage(Communi::IrcMessage *message, - const ChannelPtr &chan, + MessageSink &sink, TwitchChannel *chan, const QString &originalContent, - ITwitchIrcServer &server, bool isSub, + ITwitchIrcServer &twitch, bool isSub, bool isAction) { - if (chan->isEmpty()) - { - return; - } + assert(chan); MessageParseArgs args; if (isSub) @@ -1489,8 +981,6 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, } args.isAction = isAction; - auto *channel = dynamic_cast(chan.get()); - const auto &tags = message->tags(); QString rewardId; if (const auto it = tags.find("custom-reward-id"); it != tags.end()) @@ -1506,13 +996,16 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, rewardId = msgId; } } - if (!rewardId.isEmpty() && !channel->isChannelPointRewardKnown(rewardId)) + if (!rewardId.isEmpty() && + sink.sinkTraits().has( + MessageSinkTrait::RequiresKnownChannelPointReward) && + !chan->isChannelPointRewardKnown(rewardId)) { // Need to wait for pubsub reward notification qCDebug(chatterinoTwitch) << "TwitchChannel reward added ADD " "callback since reward is not known:" << rewardId; - channel->addQueuedRedemption(rewardId, originalContent, message); + chan->addQueuedRedemption(rewardId, originalContent, message); return; } args.channelPointRewardId = rewardId; @@ -1526,9 +1019,9 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, it != tags.end()) { const QString replyID = it.value().toString(); - auto threadIt = channel->threads().find(replyID); + auto threadIt = chan->threads().find(replyID); std::shared_ptr rootThread; - if (threadIt != channel->threads().end() && !threadIt->second.expired()) + if (threadIt != chan->threads().end() && !threadIt->second.expired()) { // Thread already exists (has a reply) auto thread = threadIt->second.lock(); @@ -1539,7 +1032,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, else { // Thread does not yet exist, find root reply and create thread. - auto root = channel->findMessage(replyID); + auto root = sink.findMessageByID(replyID); if (root) { // Found root reply message @@ -1549,7 +1042,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, replyCtx.thread = newThread; rootThread = newThread; // Store weak reference to thread in channel - channel->addReplyThread(newThread); + chan->addReplyThread(newThread); } } @@ -1566,8 +1059,8 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, } else { - auto parentThreadIt = channel->threads().find(parentID); - if (parentThreadIt != channel->threads().end()) + auto parentThreadIt = chan->threads().find(parentID); + if (parentThreadIt != chan->threads().end()) { auto thread = parentThreadIt->second.lock(); if (thread) @@ -1577,7 +1070,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, } else { - auto parent = channel->findMessage(parentID); + auto parent = sink.findMessageByID(parentID); if (parent) { replyCtx.parent = parent; @@ -1589,7 +1082,7 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, args.allowIgnore = !isSub; auto [msg, alert] = MessageBuilder::makeIrcMessage( - channel, message, args, content, messageOffset, replyCtx.thread, + chan, message, args, content, messageOffset, replyCtx.thread, replyCtx.parent); if (msg) @@ -1600,29 +1093,27 @@ void IrcMessageHandler::addMessage(Communi::IrcMessage *message, msg->flags.unset(MessageFlag::Highlighted); } - IrcMessageHandler::setSimilarityFlags(msg, chan); + sink.applySimilarityFilters(msg); if (!msg->flags.has(MessageFlag::Similar) || (!getSettings()->hideSimilar && getSettings()->shownSimilarTriggerHighlights)) { - MessageBuilder::triggerHighlights(channel, alert); + MessageBuilder::triggerHighlights(chan, alert); } const auto highlighted = msg->flags.has(MessageFlag::Highlighted); const auto showInMentions = msg->flags.has(MessageFlag::ShowInMentions); - if (highlighted && showInMentions) + if (highlighted && showInMentions && + sink.sinkTraits().has(MessageSinkTrait::AddMentionsToGlobalChannel)) { - server.getMentionsChannel()->addMessage(msg, + twitch.getMentionsChannel()->addMessage(msg, MessageContext::Original); } - chan->addMessage(msg, MessageContext::Original); - if (auto *chatters = dynamic_cast(chan.get())) - { - chatters->addRecentChatter(msg->displayName); - } + sink.addMessage(msg, MessageContext::Original); + chan->addRecentChatter(msg->displayName); } } diff --git a/src/providers/twitch/IrcMessageHandler.hpp b/src/providers/twitch/IrcMessageHandler.hpp index ba6d2d983..60fcacd4b 100644 --- a/src/providers/twitch/IrcMessageHandler.hpp +++ b/src/providers/twitch/IrcMessageHandler.hpp @@ -16,6 +16,7 @@ struct Message; using MessagePtr = std::shared_ptr; class TwitchChannel; class TwitchMessageBuilder; +class MessageSink; struct ClearChatMessage { MessagePtr message; @@ -33,30 +34,34 @@ public: * Parse an IRC message into 0 or more Chatterino messages * Takes previously loaded messages into consideration to add reply contexts **/ - static std::vector parseMessageWithReply( - Channel *channel, Communi::IrcMessage *message, - std::vector &otherLoaded); + static void parseMessageInto(Communi::IrcMessage *message, + MessageSink &sink, TwitchChannel *channel); void handlePrivMessage(Communi::IrcPrivateMessage *message, ITwitchIrcServer &twitchServer); + static void parsePrivMessageInto(Communi::IrcPrivateMessage *message, + MessageSink &sink, TwitchChannel *channel); void handleRoomStateMessage(Communi::IrcMessage *message); void handleClearChatMessage(Communi::IrcMessage *message); void handleClearMessageMessage(Communi::IrcMessage *message); void handleUserStateMessage(Communi::IrcMessage *message); - void handleWhisperMessage(Communi::IrcMessage *ircMessage); + void handleWhisperMessage(Communi::IrcMessage *ircMessage); void handleUserNoticeMessage(Communi::IrcMessage *message, ITwitchIrcServer &twitchServer); + static void parseUserNoticeMessageInto(Communi::IrcMessage *message, + MessageSink &sink, + TwitchChannel *channel); void handleNoticeMessage(Communi::IrcNoticeMessage *message); void handleJoinMessage(Communi::IrcMessage *message); void handlePartMessage(Communi::IrcMessage *message); - void addMessage(Communi::IrcMessage *message, const ChannelPtr &chan, - const QString &originalContent, ITwitchIrcServer &server, - bool isSub, bool isAction); + static void addMessage(Communi::IrcMessage *message, MessageSink &sink, + TwitchChannel *chan, const QString &originalContent, + ITwitchIrcServer &twitch, bool isSub, bool isAction); private: static float similarity(const MessagePtr &msg, diff --git a/src/providers/twitch/PubSubActions.hpp b/src/providers/twitch/PubSubActions.hpp index 5f83b4051..58e1a35e3 100644 --- a/src/providers/twitch/PubSubActions.hpp +++ b/src/providers/twitch/PubSubActions.hpp @@ -1,5 +1,7 @@ #pragma once +#include "providers/twitch/pubsubmessages/AutoMod.hpp" + #include #include #include @@ -143,6 +145,7 @@ struct AutomodAction : PubSubAction { QString message; QString reason; + PubSubAutoModQueueMessage::Reason reasonCode; QString msgID; }; diff --git a/src/providers/twitch/PubSubManager.cpp b/src/providers/twitch/PubSubManager.cpp index 89a08327b..9a2f03848 100644 --- a/src/providers/twitch/PubSubManager.cpp +++ b/src/providers/twitch/PubSubManager.cpp @@ -349,40 +349,6 @@ PubSub::PubSub(const QString &host, std::chrono::seconds pingInterval) this->moderation.raidCanceled.invoke(action); }; - /* - // This handler is no longer required as we use the automod-queue topic now - this->moderationActionHandlers["automod_rejected"] = - [this](const auto &data, const auto &roomID) { - AutomodAction action(data, roomID); - - action.source.id = data.value("created_by_user_id").toString(); - action.source.login = data.value("created_by").toString(); - - action.target.id = data.value("target_user_id").toString(); - - const auto args = data.value("args").toArray(); - - if (args.isEmpty()) - { - return; - } - - action.msgID = data.value("msg_id").toString(); - - if (action.msgID.isEmpty()) - { - // Missing required msg_id parameter - return; - } - - action.target.login = args[0].toString(); - action.message = args[1].toString(); // May be omitted - action.reason = args[2].toString(); // May be omitted - - this->moderation.autoModMessageBlocked.invoke(action); - }; - */ - this->moderationActionHandlers["automod_message_rejected"] = [this](const auto &data, const auto &roomID) { AutomodInfoAction action(data, roomID); diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index 66f5cd7b8..e49f9b2e1 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -291,7 +291,7 @@ void TwitchChannel::refreshTwitchChannelEmotesFor( }; getHelix()->getFollowedChannel( - account->getUserId(), this->roomId(), + account->getUserId(), this->roomId(), nullptr, [weak{this->weak_from_this()}, makeEmotes](const auto &chan) { auto self = std::dynamic_pointer_cast(weak.lock()); if (!self || !chan) @@ -469,8 +469,8 @@ void TwitchChannel::addChannelPointReward(const ChannelPointReward &reward) if (reward.id == msg.rewardID) { IrcMessageHandler::instance().addMessage( - msg.message.get(), shared_from_this(), - msg.originalContent, *server, false, false); + msg.message.get(), *this, this, msg.originalContent, + *server, false, false); return true; } return false; @@ -1373,8 +1373,6 @@ void TwitchChannel::loadRecentMessages() { msgs.push_back(msg); } - - tc->addRecentChatter(msg->displayName); } getApp()->getTwitch()->getMentionsChannel()->fillInMissingMessages( diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index c4350772b..d0d366ed1 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -325,7 +325,7 @@ void TwitchIrcServer::initialize() postToThread([chan, action] { MessageBuilder msg(action); msg->flags.set(MessageFlag::PubSub); - chan->addOrReplaceTimeout(msg.release()); + chan->addOrReplaceTimeout(msg.release(), QTime::currentTime()); }); }); @@ -507,6 +507,7 @@ void TwitchIrcServer::initialize() action.msgID = msg.messageID; action.message = msg.messageText; + action.reasonCode = msg.reason; // this message also contains per-word automod data, which could be implemented diff --git a/src/providers/twitch/api/Helix.cpp b/src/providers/twitch/api/Helix.cpp index 593c6837f..977cbd5f6 100644 --- a/src/providers/twitch/api/Helix.cpp +++ b/src/providers/twitch/api/Helix.cpp @@ -3138,7 +3138,7 @@ void Helix::getUserEmotes( } void Helix::getFollowedChannel( - QString userID, QString broadcasterID, + QString userID, QString broadcasterID, const QObject *caller, ResultCallback> successCallback, FailureCallback failureCallback) { @@ -3147,6 +3147,7 @@ void Helix::getFollowedChannel( {u"user_id"_s, userID}, {u"broadcaster_id"_s, broadcasterID}, }) + .caller(caller) .onSuccess([successCallback](auto result) { if (result.status() != 200) { diff --git a/src/providers/twitch/api/Helix.hpp b/src/providers/twitch/api/Helix.hpp index 3a81a9908..e62920682 100644 --- a/src/providers/twitch/api/Helix.hpp +++ b/src/providers/twitch/api/Helix.hpp @@ -1143,7 +1143,7 @@ public: /// https://dev.twitch.tv/docs/api/reference/#get-followed-channels /// (non paginated) virtual void getFollowedChannel( - QString userID, QString broadcasterID, + QString userID, QString broadcasterID, const QObject *caller, ResultCallback> successCallback, FailureCallback failureCallback) = 0; @@ -1486,7 +1486,7 @@ public: /// https://dev.twitch.tv/docs/api/reference/#get-followed-channels /// (non paginated) void getFollowedChannel( - QString userID, QString broadcasterID, + QString userID, QString broadcasterID, const QObject *caller, ResultCallback> successCallback, FailureCallback failureCallback) final; diff --git a/src/providers/twitch/pubsubmessages/AutoMod.cpp b/src/providers/twitch/pubsubmessages/AutoMod.cpp index 697db1e32..3dd3d77df 100644 --- a/src/providers/twitch/pubsubmessages/AutoMod.cpp +++ b/src/providers/twitch/pubsubmessages/AutoMod.cpp @@ -15,6 +15,10 @@ PubSubAutoModQueueMessage::PubSubAutoModQueueMessage(const QJsonObject &root) this->type = oType.value(); } + this->reason = + qmagicenum::enumCast(data.value("reason_code").toString()) + .value_or(Reason::INVALID); + auto contentClassification = data.value("content_classification").toObject(); diff --git a/src/providers/twitch/pubsubmessages/AutoMod.hpp b/src/providers/twitch/pubsubmessages/AutoMod.hpp index 9f40d39da..3179abae3 100644 --- a/src/providers/twitch/pubsubmessages/AutoMod.hpp +++ b/src/providers/twitch/pubsubmessages/AutoMod.hpp @@ -13,15 +13,24 @@ struct PubSubAutoModQueueMessage { INVALID, }; + + enum class Reason { + AutoMod, + BlockedTerm, + + INVALID, + }; + QString typeString; Type type = Type::INVALID; + Reason reason = Reason::INVALID; QJsonObject data; QString status; QString contentCategory; - int contentLevel; + int contentLevel{}; QString messageID; QString messageText; @@ -51,3 +60,20 @@ constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name< return default_tag; } } + +template <> +constexpr magic_enum::customize::customize_t magic_enum::customize::enum_name< + chatterino::PubSubAutoModQueueMessage::Reason>( + chatterino::PubSubAutoModQueueMessage::Reason value) noexcept +{ + switch (value) + { + case chatterino::PubSubAutoModQueueMessage::Reason::AutoMod: + return "AutoModCaughtMessageReason"; + case chatterino::PubSubAutoModQueueMessage::Reason::BlockedTerm: + return "BlockedTermCaughtMessageReason"; + + default: + return default_tag; + } +} diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 94366dabe..fa039184e 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -69,6 +69,13 @@ enum class ChatSendProtocol : int { Helix = 2, }; +enum class ShowModerationState : int { + // Always show this moderation-related item + Always = 0, + // Never show this moderation-related item + Never = 1, +}; + enum StreamerModeSetting { Disabled = 0, Enabled = 1, @@ -345,6 +352,10 @@ public: IntSetting timeoutStackStyle = { "/moderation/timeoutStackStyle", static_cast(TimeoutStackStyle::Default)}; + EnumStringSetting showBlockedTermAutomodMessages = { + "/moderation/showBlockedTermAutomodMessages", + ShowModerationState::Always, + }; /// Highlighting // BoolSetting enableHighlights = {"/highlighting/enabled", true}; diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 88d5ec565..75d09bde7 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -140,6 +140,8 @@ WindowManager::WindowManager(const Paths &paths, Settings &settings, this->forceLayoutChannelViewsListener.add(settings.enableRedeemedHighlight); this->forceLayoutChannelViewsListener.add(settings.colorUsernames); this->forceLayoutChannelViewsListener.add(settings.boldUsernames); + this->forceLayoutChannelViewsListener.add( + settings.showBlockedTermAutomodMessages); this->layoutChannelViewsListener.add(settings.timestampFormat); this->layoutChannelViewsListener.add(fonts.fontChanged); diff --git a/src/util/VectorMessageSink.cpp b/src/util/VectorMessageSink.cpp new file mode 100644 index 000000000..3911fee89 --- /dev/null +++ b/src/util/VectorMessageSink.cpp @@ -0,0 +1,86 @@ +#include "util/VectorMessageSink.hpp" + +#include "messages/MessageSimilarity.hpp" +#include "util/ChannelHelpers.hpp" + +#include + +namespace chatterino { + +VectorMessageSink::VectorMessageSink(MessageSinkTraits traits, + MessageFlags additionalFlags) + : additionalFlags(additionalFlags) + , traits(traits){}; +VectorMessageSink::~VectorMessageSink() = default; + +void VectorMessageSink::addMessage(MessagePtr message, MessageContext ctx, + std::optional overridingFlags) +{ + assert(!overridingFlags.has_value()); + assert(ctx == MessageContext::Original); + + message->flags.set(this->additionalFlags); + this->messages_.emplace_back(std::move(message)); +} + +void VectorMessageSink::addOrReplaceTimeout(MessagePtr clearchatMessage, + QTime now) +{ + addOrReplaceChannelTimeout( + this->messages_, std::move(clearchatMessage), now, + [&](auto idx, auto /*msg*/, auto &&replacement) { + replacement->flags.set(this->additionalFlags); + this->messages_[idx] = replacement; + }, + [&](auto &&msg) { + this->messages_.emplace_back(msg); + }, + false); +} + +void VectorMessageSink::disableAllMessages() +{ + if (this->additionalFlags.has(MessageFlag::RecentMessage)) + { + return; // don't disable recent messages + } + + for (const auto &msg : this->messages_) + { + msg->flags.set(MessageFlag::Disabled); + } +} + +void VectorMessageSink::applySimilarityFilters(const MessagePtr &message) const +{ + setSimilarityFlags(message, this->messages_); +} + +MessagePtr VectorMessageSink::findMessageByID(QStringView id) +{ + for (const auto &msg : this->messages_ | std::views::reverse) + { + if (msg->id == id) + { + return msg; + } + } + return {}; +} + +const std::vector &VectorMessageSink::messages() const +{ + return this->messages_; +} + +std::vector VectorMessageSink::takeMessages() && +{ + return std::move(this->messages_); +} + +MessageSinkTraits VectorMessageSink::sinkTraits() const +{ + return this->traits; +} + +} // namespace chatterino diff --git a/src/util/VectorMessageSink.hpp b/src/util/VectorMessageSink.hpp new file mode 100644 index 000000000..c4ffcfa9c --- /dev/null +++ b/src/util/VectorMessageSink.hpp @@ -0,0 +1,36 @@ +#pragma once + +#include "messages/MessageSink.hpp" + +namespace chatterino { + +class VectorMessageSink final : public MessageSink +{ +public: + VectorMessageSink(MessageSinkTraits traits = {}, + MessageFlags additionalFlags = {}); + ~VectorMessageSink() override; + + void addMessage( + MessagePtr message, MessageContext ctx, + std::optional overridingFlags = std::nullopt) override; + void addOrReplaceTimeout(MessagePtr clearchatMessage, QTime now) override; + + void disableAllMessages() override; + + void applySimilarityFilters(const MessagePtr &message) const override; + + MessagePtr findMessageByID(QStringView id) override; + + MessageSinkTraits sinkTraits() const override; + + const std::vector &messages() const; + std::vector takeMessages() &&; + +private: + std::vector messages_; + MessageFlags additionalFlags; + MessageSinkTraits traits; +}; + +} // namespace chatterino diff --git a/src/widgets/DraggablePopup.cpp b/src/widgets/DraggablePopup.cpp index 6b7e9eaf9..b680e35bf 100644 --- a/src/widgets/DraggablePopup.cpp +++ b/src/widgets/DraggablePopup.cpp @@ -41,6 +41,7 @@ DraggablePopup::DraggablePopup(bool closeAutomatically, QWidget *parent) BaseWindow::ClearBuffersOnDpiChange, parent) , lifetimeHack_(std::make_shared(false)) + , closeAutomatically_(closeAutomatically) , dragTimer_(this) { @@ -128,4 +129,14 @@ Button *DraggablePopup::createPinButton() return this->pinButton_; } +bool DraggablePopup::ensurePinned() +{ + if (this->closeAutomatically_ && !this->isPinned_) + { + this->togglePinned(); + return true; + } + return false; +} + } // namespace chatterino diff --git a/src/widgets/DraggablePopup.hpp b/src/widgets/DraggablePopup.hpp index bf82af008..97217c0df 100644 --- a/src/widgets/DraggablePopup.hpp +++ b/src/widgets/DraggablePopup.hpp @@ -38,10 +38,18 @@ protected: // button pixmap void togglePinned(); + /// Ensures that this popup is pinned (if it's expected to close automatically) + /// + /// @returns `true` if the popup was pinned as a result (i.e. if the popup + /// was unpinned and said to automatically close before) + bool ensurePinned(); + private: // isMoving_ is set to true if the user is holding the left mouse button down and has moved the mouse a small amount away from the original click point (startPosDrag_) bool isMoving_ = false; + bool closeAutomatically_ = false; + // startPosDrag_ is the coordinates where the user originally pressed the mouse button down to start dragging QPoint startPosDrag_; diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp index 2a01020fc..53c6dfcfa 100644 --- a/src/widgets/Notebook.cpp +++ b/src/widgets/Notebook.cpp @@ -204,7 +204,7 @@ void Notebook::duplicatePage(QWidget *page) { newTabPosition = tabPosition + 1; } - auto newTabHighlightState = item->tab->highlightState(); + QString newTabTitle = ""; if (item->tab->hasCustomTitle()) { @@ -213,7 +213,7 @@ void Notebook::duplicatePage(QWidget *page) auto *tab = this->addPageAt(newContainer, newTabPosition, newTabTitle, false); - tab->setHighlightState(newTabHighlightState); + tab->copyHighlightStateAndSourcesFrom(item->tab); newContainer->setTab(tab); } diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index f8bec9b1b..3087da586 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -2,6 +2,7 @@ #include "Application.hpp" #include "common/Channel.hpp" +#include "common/Literals.hpp" #include "common/network/NetworkRequest.hpp" #include "common/QLogging.hpp" #include "controllers/accounts/AccountController.hpp" @@ -37,6 +38,8 @@ #include #include +#include +#include #include #include #include @@ -141,6 +144,8 @@ int calculateTimeoutDuration(TimeoutButton timeout) namespace chatterino { +using namespace literals; + UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split) : DraggablePopup(closeAutomatically, split) , split_(split) @@ -623,57 +628,72 @@ void UserInfoPopup::installEvents() return; } - switch (newState) + if (newState == Qt::Unchecked) { - case Qt::CheckState::Unchecked: { - this->ui_.block->setEnabled(false); + this->ui_.block->setEnabled(false); - getApp()->getAccounts()->twitch.getCurrent()->unblockUser( - this->userId_, this, - [this, reenableBlockCheckbox, currentUser] { - this->channel_->addSystemMessage( - QString("You successfully unblocked user %1") - .arg(this->userName_)); - reenableBlockCheckbox(); - }, - [this, reenableBlockCheckbox] { - this->channel_->addSystemMessage( - QString( - "User %1 couldn't be unblocked, an unknown " + getApp()->getAccounts()->twitch.getCurrent()->unblockUser( + this->userId_, this, + [this, reenableBlockCheckbox, currentUser] { + this->channel_->addSystemMessage( + QString("You successfully unblocked user %1") + .arg(this->userName_)); + reenableBlockCheckbox(); + }, + [this, reenableBlockCheckbox] { + this->channel_->addSystemMessage( + QString("User %1 couldn't be unblocked, an unknown " "error occurred!") - .arg(this->userName_)); - reenableBlockCheckbox(); - }); - } - break; - - case Qt::CheckState::PartiallyChecked: { - // We deliberately ignore this state - } - break; - - case Qt::CheckState::Checked: { - this->ui_.block->setEnabled(false); - - getApp()->getAccounts()->twitch.getCurrent()->blockUser( - this->userId_, this, - [this, reenableBlockCheckbox, currentUser] { - this->channel_->addSystemMessage( - QString("You successfully blocked user %1") - .arg(this->userName_)); - reenableBlockCheckbox(); - }, - [this, reenableBlockCheckbox] { - this->channel_->addSystemMessage( - QString( - "User %1 couldn't be blocked, an unknown " - "error occurred!") - .arg(this->userName_)); - reenableBlockCheckbox(); - }); - } - break; + .arg(this->userName_)); + reenableBlockCheckbox(); + }); + return; } + + if (newState == Qt::Checked) + { + this->ui_.block->setEnabled(false); + + bool wasPinned = this->ensurePinned(); + auto btn = QMessageBox::warning( + this, u"Blocking " % this->userName_, + u"Blocking %1 can cause unintended side-effects like unfollowing.\n\n"_s + "Are you sure you want to block %1?".arg(this->userName_), + QMessageBox::Yes | QMessageBox::Cancel, + QMessageBox::Cancel); + if (wasPinned) + { + this->togglePinned(); + } + if (btn != QMessageBox::Yes) + { + reenableBlockCheckbox(); + QSignalBlocker blocker(this->ui_.block); + this->ui_.block->setCheckState(Qt::Unchecked); + return; + } + + getApp()->getAccounts()->twitch.getCurrent()->blockUser( + this->userId_, this, + [this, reenableBlockCheckbox, currentUser] { + this->channel_->addSystemMessage( + QString("You successfully blocked user %1") + .arg(this->userName_)); + reenableBlockCheckbox(); + }, + [this, reenableBlockCheckbox] { + this->channel_->addSystemMessage( + QString("User %1 couldn't be blocked, an " + "unknown error occurred!") + .arg(this->userName_)); + reenableBlockCheckbox(); + }); + return; + } + + qCWarning(chatterinoWidget) + << "Unexpected check-state when blocking" << this->userName_ + << QMetaEnum::fromType().valueToKey(newState); }); // ignore highlights diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp index 7841d06b4..b0294c45a 100644 --- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp +++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp @@ -141,7 +141,7 @@ void QuickSwitcherPopup::updateSuggestions(const QString &text) * Timeout interval 0 means the call will be delayed until all window events * have been processed (cf. https://doc.qt.io/qt-5/qtimer.html#interval-prop). */ - QTimer::singleShot(0, [this] { + QTimer::singleShot(0, this, [this] { this->adjustSize(); }); } diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index dc0a98cbd..22cb629c4 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -967,10 +967,10 @@ void ChannelView::setChannel(const ChannelPtr &underlyingChannel) this->channelConnections_.managedConnect( underlyingChannel->messageReplaced, - [this](auto index, const auto &replacement) { + [this](auto index, const auto &prev, const auto &replacement) { if (this->shouldIncludeMessage(replacement)) { - this->channel_->replaceMessage(index, replacement); + this->channel_->replaceMessage(index, prev, replacement); } }); @@ -1051,8 +1051,9 @@ void ChannelView::setChannel(const ChannelPtr &underlyingChannel) // on message replaced this->channelConnections_.managedConnect( this->channel_->messageReplaced, - [this](size_t index, MessagePtr replacement) { - this->messageReplaced(index, replacement); + [this](size_t index, const MessagePtr &prev, + const MessagePtr &replacement) { + this->messageReplaced(index, prev, replacement); }); // on messages filled in @@ -1063,6 +1064,8 @@ void ChannelView::setChannel(const ChannelPtr &underlyingChannel) this->underlyingChannel_ = underlyingChannel; + this->updateID(); + this->performLayout(); this->queueUpdate(); @@ -1081,6 +1084,8 @@ void ChannelView::setChannel(const ChannelPtr &underlyingChannel) void ChannelView::setFilters(const QList &ids) { this->channelFilters_ = std::make_shared(ids); + + this->updateID(); } QList ChannelView::getFilterIds() const @@ -1258,19 +1263,21 @@ void ChannelView::messageAddedAtStart(std::vector &messages) this->queueLayout(); } -void ChannelView::messageReplaced(size_t index, MessagePtr &replacement) +void ChannelView::messageReplaced(size_t hint, const MessagePtr &prev, + const MessagePtr &replacement) { - auto oMessage = this->messages_.get(index); - if (!oMessage) + auto optItem = this->messages_.find(hint, [&](const auto &it) { + return it->getMessagePtr() == prev; + }); + if (!optItem) { return; } - - auto message = *oMessage; + const auto &[index, oldItem] = *optItem; auto newItem = std::make_shared(replacement); - if (message->flags.has(MessageLayoutFlag::AlternateBackground)) + if (oldItem->flags.has(MessageLayoutFlag::AlternateBackground)) { newItem->flags.set(MessageLayoutFlag::AlternateBackground); } @@ -1278,7 +1285,7 @@ void ChannelView::messageReplaced(size_t index, MessagePtr &replacement) this->scrollBar_->replaceHighlight(index, replacement->getScrollBarHighlight()); - this->messages_.replaceItem(message, newItem); + this->messages_.replaceItem(index, newItem); this->queueLayout(); } @@ -3240,4 +3247,27 @@ void ChannelView::pendingLinkInfoStateChanged() this->tooltipWidget_->applyLastBoundsCheck(); } +void ChannelView::updateID() +{ + if (!this->underlyingChannel_) + { + // cannot update + return; + } + + std::size_t seed = 0; + auto first = qHash(this->underlyingChannel_->getName()); + auto second = qHash(this->getFilterIds()); + + boost::hash_combine(seed, first); + boost::hash_combine(seed, second); + + this->id_ = seed; +} + +ChannelView::ChannelViewID ChannelView::getID() const +{ + return this->id_; +} + } // namespace chatterino diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp index 704210712..3c8f078f4 100644 --- a/src/widgets/helper/ChannelView.hpp +++ b/src/widgets/helper/ChannelView.hpp @@ -212,6 +212,14 @@ public: Scrollbar *scrollbar(); + using ChannelViewID = std::size_t; + /// + /// \brief Get the ID of this ChannelView + /// + /// The ID is made of the underlying channel's name + /// combined with the filter set IDs + ChannelViewID getID() const; + pajlada::Signals::Signal mouseDown; pajlada::Signals::NoArgSignal selectionChanged; pajlada::Signals::Signal tabHighlightRequested; @@ -268,7 +276,8 @@ private: std::optional overridingFlags); void messageAddedAtStart(std::vector &messages); void messageRemoveFromStart(MessagePtr &message); - void messageReplaced(size_t index, MessagePtr &replacement); + void messageReplaced(size_t hint, const MessagePtr &prev, + const MessagePtr &replacement); void messagesUpdated(); void performLayout(bool causedByScrollbar = false, @@ -314,6 +323,9 @@ private: void showReplyThreadPopup(const MessagePtr &message); bool canReplyToMessages() const; + void updateID(); + ChannelViewID id_{}; + bool layoutQueued_ = false; bool bufferInvalidationQueued_ = false; @@ -375,7 +387,7 @@ private: FilterSetPtr channelFilters_; // Returns true if message should be included - bool shouldIncludeMessage(const MessagePtr &m) const; + bool shouldIncludeMessage(const MessagePtr &message) const; // Returns whether the scrollbar should have highlights bool showScrollbarHighlights() const; diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp index be2b371a3..563084d39 100644 --- a/src/widgets/helper/NotebookTab.cpp +++ b/src/widgets/helper/NotebookTab.cpp @@ -1,6 +1,7 @@ #include "widgets/helper/NotebookTab.hpp" #include "Application.hpp" +#include "common/Channel.hpp" #include "common/Common.hpp" #include "controllers/hotkeys/HotkeyCategory.hpp" #include "controllers/hotkeys/HotkeyController.hpp" @@ -12,9 +13,11 @@ #include "widgets/dialogs/SettingsDialog.hpp" #include "widgets/Notebook.hpp" #include "widgets/splits/DraggedSplit.hpp" +#include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" #include +#include #include #include #include @@ -302,10 +305,134 @@ bool NotebookTab::isSelected() const return this->selected_; } +void NotebookTab::removeHighlightStateChangeSources( + const HighlightSources &toRemove) +{ + for (const auto &[source, _] : toRemove) + { + this->removeHighlightSource(source); + } +} + +void NotebookTab::removeHighlightSource( + const ChannelView::ChannelViewID &source) +{ + this->highlightSources_.erase(source); +} + +void NotebookTab::newHighlightSourceAdded(const ChannelView &channelViewSource) +{ + auto channelViewId = channelViewSource.getID(); + this->removeHighlightSource(channelViewId); + this->updateHighlightStateDueSourcesChange(); + + auto *splitNotebook = dynamic_cast(this->notebook_); + if (splitNotebook) + { + for (int i = 0; i < splitNotebook->getPageCount(); ++i) + { + auto *splitContainer = + dynamic_cast(splitNotebook->getPageAt(i)); + if (splitContainer) + { + auto *tab = splitContainer->getTab(); + if (tab && tab != this) + { + tab->removeHighlightSource(channelViewId); + tab->updateHighlightStateDueSourcesChange(); + } + } + } + } +} + +void NotebookTab::updateHighlightStateDueSourcesChange() +{ + if (std::ranges::any_of(this->highlightSources_, [](const auto &keyval) { + return keyval.second == HighlightState::Highlighted; + })) + { + assert(this->highlightState_ == HighlightState::Highlighted); + return; + } + + if (std::ranges::any_of(this->highlightSources_, [](const auto &keyval) { + return keyval.second == HighlightState::NewMessage; + })) + { + if (this->highlightState_ != HighlightState::NewMessage) + { + this->highlightState_ = HighlightState::NewMessage; + this->update(); + } + } + else + { + if (this->highlightState_ != HighlightState::None) + { + this->highlightState_ = HighlightState::None; + this->update(); + } + } + + assert(this->highlightState_ != HighlightState::Highlighted); +} + +void NotebookTab::copyHighlightStateAndSourcesFrom(const NotebookTab *sourceTab) +{ + if (this->isSelected()) + { + assert(this->highlightSources_.empty()); + assert(this->highlightState_ == HighlightState::None); + return; + } + + this->highlightSources_ = sourceTab->highlightSources_; + + if (!this->highlightEnabled_ && + sourceTab->highlightState_ == HighlightState::NewMessage) + { + return; + } + + if (this->highlightState_ == sourceTab->highlightState_ || + this->highlightState_ == HighlightState::Highlighted) + { + return; + } + + this->highlightState_ = sourceTab->highlightState_; + this->update(); +} + void NotebookTab::setSelected(bool value) { this->selected_ = value; + if (value) + { + auto *splitNotebook = dynamic_cast(this->notebook_); + if (splitNotebook) + { + for (int i = 0; i < splitNotebook->getPageCount(); ++i) + { + auto *splitContainer = + dynamic_cast(splitNotebook->getPageAt(i)); + if (splitContainer) + { + auto *tab = splitContainer->getTab(); + if (tab && tab != this) + { + tab->removeHighlightStateChangeSources( + this->highlightSources_); + tab->updateHighlightStateDueSourcesChange(); + } + } + } + } + } + + this->highlightSources_.clear(); this->highlightState_ = HighlightState::None; this->update(); @@ -358,13 +485,22 @@ bool NotebookTab::isLive() const return this->isLive_; } +HighlightState NotebookTab::highlightState() const +{ + return this->highlightState_; +} + void NotebookTab::setHighlightState(HighlightState newHighlightStyle) { if (this->isSelected()) { + assert(this->highlightSources_.empty()); + assert(this->highlightState_ == HighlightState::None); return; } + this->highlightSources_.clear(); + if (!this->highlightEnabled_ && newHighlightStyle == HighlightState::NewMessage) { @@ -381,9 +517,79 @@ void NotebookTab::setHighlightState(HighlightState newHighlightStyle) this->update(); } -HighlightState NotebookTab::highlightState() const +void NotebookTab::updateHighlightState(HighlightState newHighlightStyle, + const ChannelView &channelViewSource) { - return this->highlightState_; + if (this->isSelected()) + { + assert(this->highlightSources_.empty()); + assert(this->highlightState_ == HighlightState::None); + return; + } + + if (!this->shouldMessageHighlight(channelViewSource)) + { + return; + } + + if (!this->highlightEnabled_ && + newHighlightStyle == HighlightState::NewMessage) + { + return; + } + + // message is highlighting unvisible tab + + auto channelViewId = channelViewSource.getID(); + + switch (newHighlightStyle) + { + case HighlightState::Highlighted: + // override lower states + this->highlightSources_.insert_or_assign(channelViewId, + newHighlightStyle); + case HighlightState::NewMessage: { + // only insert if no state already there to avoid overriding + if (!this->highlightSources_.contains(channelViewId)) + { + this->highlightSources_.emplace(channelViewId, + newHighlightStyle); + } + break; + } + case HighlightState::None: + break; + } + + if (this->highlightState_ == newHighlightStyle || + this->highlightState_ == HighlightState::Highlighted) + { + return; + } + + this->highlightState_ = newHighlightStyle; + this->update(); +} + +bool NotebookTab::shouldMessageHighlight( + const ChannelView &channelViewSource) const +{ + auto *visibleSplitContainer = + dynamic_cast(this->notebook_->getSelectedPage()); + if (visibleSplitContainer != nullptr) + { + const auto &visibleSplits = visibleSplitContainer->getSplits(); + for (const auto &visibleSplit : visibleSplits) + { + if (channelViewSource.getID() == + visibleSplit->getChannelView().getID()) + { + return false; + } + } + } + + return true; } void NotebookTab::setHighlightsEnabled(const bool &newVal) diff --git a/src/widgets/helper/NotebookTab.hpp b/src/widgets/helper/NotebookTab.hpp index 6ae7802d0..ae3bfbc2f 100644 --- a/src/widgets/helper/NotebookTab.hpp +++ b/src/widgets/helper/NotebookTab.hpp @@ -2,6 +2,7 @@ #include "common/Common.hpp" #include "widgets/helper/Button.hpp" +#include "widgets/helper/ChannelView.hpp" #include "widgets/Notebook.hpp" #include @@ -59,11 +60,24 @@ public: **/ bool isLive() const; + /** + * @brief Sets the highlight state of this tab clearing highlight sources + * + * Obeys the HighlightsEnabled setting and highlight states hierarchy + */ void setHighlightState(HighlightState style); - HighlightState highlightState() const; - + /** + * @brief Updates the highlight state and highlight sources of this tab + * + * Obeys the HighlightsEnabled setting and the highlight state hierarchy and tracks the highlight state update sources + */ + void updateHighlightState(HighlightState style, + const ChannelView &channelViewSource); + void copyHighlightStateAndSourcesFrom(const NotebookTab *sourceTab); void setHighlightsEnabled(const bool &newVal); + void newHighlightSourceAdded(const ChannelView &channelViewSource); bool hasHighlightsEnabled() const; + HighlightState highlightState() const; void moveAnimated(QPoint targetPos, bool animated = true); @@ -107,6 +121,16 @@ private: int normalTabWidthForHeight(int height) const; + bool shouldMessageHighlight(const ChannelView &channelViewSource) const; + + using HighlightSources = + std::unordered_map; + HighlightSources highlightSources_; + + void removeHighlightStateChangeSources(const HighlightSources &toRemove); + void removeHighlightSource(const ChannelView::ChannelViewID &source); + void updateHighlightStateDueSourcesChange(); + QPropertyAnimation positionChangedAnimation_; QPoint positionAnimationDesiredPoint_; diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index 7103fb527..58cc37319 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -614,12 +614,16 @@ void GeneralPage::initLayout(GeneralPageView &layout) "Google", }, s.emojiSet); - layout.addCheckbox("Show BTTV global emotes", s.enableBTTVGlobalEmotes); - layout.addCheckbox("Show BTTV channel emotes", s.enableBTTVChannelEmotes); - layout.addCheckbox("Enable BTTV live emote updates (requires restart)", + layout.addCheckbox("Show BetterTTV global emotes", + s.enableBTTVGlobalEmotes); + layout.addCheckbox("Show BetterTTV channel emotes", + s.enableBTTVChannelEmotes); + layout.addCheckbox("Enable BetterTTV live emote updates (requires restart)", s.enableBTTVLiveUpdates); - layout.addCheckbox("Show FFZ global emotes", s.enableFFZGlobalEmotes); - layout.addCheckbox("Show FFZ channel emotes", s.enableFFZChannelEmotes); + layout.addCheckbox("Show FrankerFaceZ global emotes", + s.enableFFZGlobalEmotes); + layout.addCheckbox("Show FrankerFaceZ channel emotes", + s.enableFFZChannelEmotes); layout.addCheckbox("Show 7TV global emotes", s.enableSevenTVGlobalEmotes); layout.addCheckbox("Show 7TV channel emotes", s.enableSevenTVChannelEmotes); layout.addCheckbox("Enable 7TV live emote updates (requires restart)", @@ -1167,6 +1171,14 @@ void GeneralPage::initLayout(GeneralPageView &layout) layout.addIntInput("Usercard scrollback limit (requires restart)", s.scrollbackUsercardLimit, 100, 100000, 100); + layout.addDropdownEnumClass( + "Show blocked term automod messages", + qmagicenum::enumNames(), + s.showBlockedTermAutomodMessages, + "Show messages that are blocked by AutoMod for containing a public " + "blocked term in the current channel.", + {}); + layout.addDropdown( "Stack timeouts", {"Stack", "Stack until timeout", "Don't stack"}, s.timeoutStackStyle, diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp index 1cca478f0..430098f0e 100644 --- a/src/widgets/splits/SplitContainer.cpp +++ b/src/widgets/splits/SplitContainer.cpp @@ -214,13 +214,21 @@ void SplitContainer::addSplit(Split *split) auto &&conns = this->connectionsPerSplit_[split]; conns.managedConnect(split->getChannelView().tabHighlightRequested, - [this](HighlightState state) { + [this, split](HighlightState state) { if (this->tab_ != nullptr) { - this->tab_->setHighlightState(state); + this->tab_->updateHighlightState( + state, split->getChannelView()); } }); + conns.managedConnect(split->channelChanged, [this, split] { + if (this->tab_ != nullptr) + { + this->tab_->newHighlightSourceAdded(split->getChannelView()); + } + }); + conns.managedConnect(split->getChannelView().liveStatusChanged, [this]() { this->refreshTabLiveStatus(); }); diff --git a/tests/snapshots/IrcMessageHandler/announcement.json b/tests/snapshots/IrcMessageHandler/announcement.json index b3ddfd2e6..06b21210c 100644 --- a/tests/snapshots/IrcMessageHandler/announcement.json +++ b/tests/snapshots/IrcMessageHandler/announcement.json @@ -180,6 +180,7 @@ } ], "flags": "Collapsed|Subscription", + "highlightColor": "#64c466ff", "id": "8c26e1ab-b50c-4d9d-bc11-3fd57a941d90", "localizedName": "", "loginName": "supinic", diff --git a/tests/snapshots/IrcMessageHandler/bitsbadge.json b/tests/snapshots/IrcMessageHandler/bitsbadge.json index bd2b35324..0ebbeb0ec 100644 --- a/tests/snapshots/IrcMessageHandler/bitsbadge.json +++ b/tests/snapshots/IrcMessageHandler/bitsbadge.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ffff4500", + "userLoginName": "whoopiix", "words": [ "whoopiix" ] diff --git a/tests/snapshots/IrcMessageHandler/reply-child.json b/tests/snapshots/IrcMessageHandler/reply-child.json index 8862f7738..be8a17317 100644 --- a/tests/snapshots/IrcMessageHandler/reply-child.json +++ b/tests/snapshots/IrcMessageHandler/reply-child.json @@ -80,7 +80,7 @@ "trailingSpace": true, "type": "SingleLineTextElement", "words": [ - "a" + "b" ] }, { @@ -169,6 +169,7 @@ "localizedName": "", "loginName": "nerixyz", "messageText": "c", + "replyParent": "474f19ab-a1b0-410a-877a-5b0e2ae8be6d", "replyThread": { "replies": [ "474f19ab-a1b0-410a-877a-5b0e2ae8be6d", diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json index a6877c365..f612fd720 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json @@ -256,6 +256,7 @@ } ], "flags": "Collapsed|Subscription|SharedMessage", + "highlightColor": "#64c466ff", "id": "01cd601f-bc3f-49d5-ab4b-136fa9d6ec22", "localizedName": "", "loginName": "lahoooo", diff --git a/tests/snapshots/IrcMessageHandler/sub-first-gift.json b/tests/snapshots/IrcMessageHandler/sub-first-gift.json index 25ed044e1..9ad6339fa 100644 --- a/tests/snapshots/IrcMessageHandler/sub-first-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-first-gift.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ff00ff7f", + "userLoginName": "hyperbolicxd", "words": [ "hyperbolicxd" ] @@ -142,6 +145,24 @@ "to" ] }, + { + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", + "link": { + "type": "None", + "value": "" + }, + "style": "ChatMedium", + "tooltip": "", + "trailingSpace": false, + "type": "MentionElement", + "userColor": "System", + "userLoginName": "quote_if_nam", + "words": [ + "quote_if_nam" + ] + }, { "color": "System", "flags": "Text", @@ -154,7 +175,7 @@ "trailingSpace": true, "type": "TextElement", "words": [ - "quote_if_nam!" + "!" ] }, { diff --git a/tests/snapshots/IrcMessageHandler/sub-first-time.json b/tests/snapshots/IrcMessageHandler/sub-first-time.json index e1427a8b0..8fd22c06a 100644 --- a/tests/snapshots/IrcMessageHandler/sub-first-time.json +++ b/tests/snapshots/IrcMessageHandler/sub-first-time.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ff0000ff", + "userLoginName": "byebyeheart", "words": [ "byebyeheart" ] diff --git a/tests/snapshots/IrcMessageHandler/sub-gift.json b/tests/snapshots/IrcMessageHandler/sub-gift.json index 738fe14e4..f7c77da85 100644 --- a/tests/snapshots/IrcMessageHandler/sub-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-gift.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ff0000ff", + "userLoginName": "tww2", "words": [ "TWW2" ] @@ -142,6 +145,24 @@ "to" ] }, + { + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", + "link": { + "type": "None", + "value": "" + }, + "style": "ChatMedium", + "tooltip": "", + "trailingSpace": false, + "type": "MentionElement", + "userColor": "System", + "userLoginName": "mr_woodchuck", + "words": [ + "Mr_Woodchuck" + ] + }, { "color": "System", "flags": "Text", @@ -154,7 +175,7 @@ "trailingSpace": true, "type": "TextElement", "words": [ - "Mr_Woodchuck!" + "!" ] } ], diff --git a/tests/snapshots/IrcMessageHandler/sub-message.json b/tests/snapshots/IrcMessageHandler/sub-message.json index fd74777c5..8afca0272 100644 --- a/tests/snapshots/IrcMessageHandler/sub-message.json +++ b/tests/snapshots/IrcMessageHandler/sub-message.json @@ -243,6 +243,7 @@ } ], "flags": "Collapsed|Subscription", + "highlightColor": "#64c466ff", "id": "db25007f-7a18-43eb-9379-80131e44d633", "localizedName": "", "loginName": "ronni", @@ -289,8 +290,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -298,7 +300,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ff008000", + "userLoginName": "ronni", "words": [ "ronni" ] diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json index a98575565..02fd37398 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json @@ -217,6 +217,24 @@ "to" ] }, + { + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", + "link": { + "type": "None", + "value": "" + }, + "style": "ChatMedium", + "tooltip": "", + "trailingSpace": false, + "type": "MentionElement", + "userColor": "System", + "userLoginName": "mohammadrezadh", + "words": [ + "MohammadrezaDH" + ] + }, { "color": "System", "flags": "Text", @@ -229,7 +247,7 @@ "trailingSpace": true, "type": "TextElement", "words": [ - "MohammadrezaDH!" + "!" ] } ], diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json index 3b9d3b106..030f29845 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ffff8ea3", + "userLoginName": "inatsufn", "words": [ "iNatsuFN" ] @@ -187,6 +190,24 @@ "to" ] }, + { + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", + "link": { + "type": "None", + "value": "" + }, + "style": "ChatMedium", + "tooltip": "", + "trailingSpace": false, + "type": "MentionElement", + "userColor": "System", + "userLoginName": "kimmi_tm", + "words": [ + "kimmi_tm" + ] + }, { "color": "System", "flags": "Text", @@ -199,7 +220,7 @@ "trailingSpace": true, "type": "TextElement", "words": [ - "kimmi_tm!" + "!" ] }, { diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json index 65246a879..94eead088 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ffeb078d", + "userLoginName": "lucidfoxx", "words": [ "Lucidfoxx" ] @@ -187,6 +190,24 @@ "to" ] }, + { + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", + "link": { + "type": "None", + "value": "" + }, + "style": "ChatMedium", + "tooltip": "", + "trailingSpace": false, + "type": "MentionElement", + "userColor": "System", + "userLoginName": "ogprodigy", + "words": [ + "OGprodigy" + ] + }, { "color": "System", "flags": "Text", @@ -199,7 +220,7 @@ "trailingSpace": true, "type": "TextElement", "words": [ - "OGprodigy!" + "!" ] } ], diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json index 4878d3f4e..ffa926d54 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ff0000ff", + "userLoginName": "calm__like_a_tom", "words": [ "calm__like_a_tom" ] diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month.json b/tests/snapshots/IrcMessageHandler/sub-multi-month.json index 98f7e34a4..4adf9f17a 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "System", + "userLoginName": "foly__", "words": [ "foly__" ] diff --git a/tests/snapshots/IrcMessageHandler/sub-no-message.json b/tests/snapshots/IrcMessageHandler/sub-no-message.json index 01d589b90..7b866c3ae 100644 --- a/tests/snapshots/IrcMessageHandler/sub-no-message.json +++ b/tests/snapshots/IrcMessageHandler/sub-no-message.json @@ -38,8 +38,9 @@ "type": "TimestampElement" }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -47,7 +48,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ffcc00c2", + "userLoginName": "cspice", "words": [ "cspice" ] @@ -158,8 +161,9 @@ ] }, { - "color": "System", - "flags": "Text", + "color": "Text", + "fallbackColor": "System", + "flags": "Text|Mention", "link": { "type": "None", "value": "" @@ -167,7 +171,9 @@ "style": "ChatMedium", "tooltip": "", "trailingSpace": true, - "type": "TextElement", + "type": "MentionElement", + "userColor": "#ffcc00c2", + "userLoginName": "cspice", "words": [ "cspice" ] diff --git a/tests/src/IrcMessageHandler.cpp b/tests/src/IrcMessageHandler.cpp index a80e928ef..8ed4ee568 100644 --- a/tests/src/IrcMessageHandler.cpp +++ b/tests/src/IrcMessageHandler.cpp @@ -27,6 +27,7 @@ #include "singletons/Emotes.hpp" #include "Test.hpp" #include "util/IrcHelpers.hpp" +#include "util/VectorMessageSink.hpp" #include #include @@ -572,19 +573,14 @@ TEST_P(TestIrcMessageHandlerP, Run) { auto channel = makeMockTwitchChannel(u"pajlada"_s, *snapshot); - std::vector prevMessages; + VectorMessageSink sink; for (auto prevInput : snapshot->param("prevMessages").toArray()) { auto *ircMessage = Communi::IrcMessage::fromData( prevInput.toString().toUtf8(), nullptr); ASSERT_NE(ircMessage, nullptr); - auto builtMessages = IrcMessageHandler::parseMessageWithReply( - channel.get(), ircMessage, prevMessages); - for (const auto &builtMessage : builtMessages) - { - prevMessages.emplace_back(builtMessage); - } + IrcMessageHandler::parseMessageInto(ircMessage, sink, channel.get()); delete ircMessage; } @@ -592,13 +588,13 @@ TEST_P(TestIrcMessageHandlerP, Run) Communi::IrcMessage::fromData(snapshot->inputUtf8(), nullptr); ASSERT_NE(ircMessage, nullptr); - auto builtMessages = IrcMessageHandler::parseMessageWithReply( - channel.get(), ircMessage, prevMessages); + auto firstAddedMsg = sink.messages().size(); + IrcMessageHandler::parseMessageInto(ircMessage, sink, channel.get()); QJsonArray got; - for (const auto &msg : builtMessages) + for (auto i = firstAddedMsg; i < sink.messages().size(); i++) { - got.append(msg->toJson()); + got.append(sink.messages()[i]->toJson()); } delete ircMessage; diff --git a/tests/src/LimitedQueue.cpp b/tests/src/LimitedQueue.cpp index 0a94ea928..803969789 100644 --- a/tests/src/LimitedQueue.cpp +++ b/tests/src/LimitedQueue.cpp @@ -114,20 +114,153 @@ TEST(LimitedQueue, PushFront) TEST(LimitedQueue, ReplaceItem) { - LimitedQueue queue(5); + LimitedQueue queue(10); queue.pushBack(1); queue.pushBack(2); queue.pushBack(3); + queue.pushBack(4); + queue.pushBack(5); + queue.pushBack(6); int idex = queue.replaceItem(2, 10); EXPECT_EQ(idex, 1); - idex = queue.replaceItem(5, 11); + idex = queue.replaceItem(7, 11); EXPECT_EQ(idex, -1); - bool res = queue.replaceItem(std::size_t(0), 9); + int prev = -1; + bool res = queue.replaceItem(std::size_t(0), 9, &prev); EXPECT_TRUE(res); - res = queue.replaceItem(std::size_t(5), 4); + EXPECT_EQ(prev, 1); + res = queue.replaceItem(std::size_t(6), 4); EXPECT_FALSE(res); - SNAPSHOT_EQUALS(queue.getSnapshot(), {9, 10, 3}, "first snapshot"); + // correct hint + EXPECT_EQ(queue.replaceItem(3, 4, 11), 3); + // incorrect hints + EXPECT_EQ(queue.replaceItem(5, 11, 12), 3); + EXPECT_EQ(queue.replaceItem(0, 12, 13), 3); + // oob hint + EXPECT_EQ(queue.replaceItem(42, 13, 14), 3); + // bad needle + EXPECT_EQ(queue.replaceItem(0, 15, 16), -1); + + SNAPSHOT_EQUALS(queue.getSnapshot(), {9, 10, 3, 14, 5, 6}, + "first snapshot"); +} + +TEST(LimitedQueue, Find) +{ + LimitedQueue queue(10); + queue.pushBack(1); + queue.pushBack(2); + queue.pushBack(3); + queue.pushBack(4); + queue.pushBack(5); + queue.pushBack(6); + + // without hint + EXPECT_FALSE(queue + .find([](int i) { + return i == 0; + }) + .has_value()); + EXPECT_EQ(queue + .find([](int i) { + return i == 1; + }) + .value(), + 1); + EXPECT_EQ(queue + .find([](int i) { + return i == 2; + }) + .value(), + 2); + EXPECT_EQ(queue + .find([](int i) { + return i == 6; + }) + .value(), + 6); + EXPECT_FALSE(queue + .find([](int i) { + return i == 7; + }) + .has_value()); + EXPECT_FALSE(queue + .find([](int i) { + return i > 6; + }) + .has_value()); + EXPECT_FALSE(queue + .find([](int i) { + return i <= 0; + }) + .has_value()); + + using Pair = std::pair; + // with hint + EXPECT_FALSE(queue + .find(0, + [](int i) { + return i == 0; + }) + .has_value()); + // correct hint + EXPECT_EQ(queue + .find(0, + [](int i) { + return i == 1; + }) + .value(), + (Pair{0, 1})); + EXPECT_EQ(queue + .find(1, + [](int i) { + return i == 2; + }) + .value(), + (Pair{1, 2})); + // incorrect hint + EXPECT_EQ(queue + .find(1, + [](int i) { + return i == 1; + }) + .value(), + (Pair{0, 1})); + EXPECT_EQ(queue + .find(5, + [](int i) { + return i == 6; + }) + .value(), + (Pair{5, 6})); + // oob hint + EXPECT_EQ(queue + .find(6, + [](int i) { + return i == 3; + }) + .value(), + (Pair{2, 3})); + // non-existent items + EXPECT_FALSE(queue + .find(42, + [](int i) { + return i == 7; + }) + .has_value()); + EXPECT_FALSE(queue + .find(0, + [](int i) { + return i > 6; + }) + .has_value()); + EXPECT_FALSE(queue + .find(0, + [](int i) { + return i <= 0; + }) + .has_value()); }