From 77c4d858f9f75aac265772baf7d061ab6b0e0543 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 8 Mar 2025 14:00:35 +0100 Subject: [PATCH] refactor(eventsub): Respect "Hide moderation actions" explicitly (#6041) --- CHANGELOG.md | 2 +- mocks/include/mocks/DisabledStreamerMode.hpp | 5 ++++ src/messages/MessageBuilder.cpp | 16 ++++++----- src/messages/MessageFlag.hpp | 7 +++++ src/messages/layouts/MessageLayout.cpp | 15 +++++------ src/providers/twitch/TwitchIrcServer.cpp | 15 ++++++----- src/providers/twitch/eventsub/Connection.cpp | 6 ----- .../twitch/eventsub/MessageBuilder.cpp | 27 ++++++++++++------- .../twitch/eventsub/MessageHandlers.cpp | 3 ++- src/singletons/StreamerMode.cpp | 5 ++++ src/singletons/StreamerMode.hpp | 5 ++++ src/util/ChannelHelpers.hpp | 8 +++--- .../automod-category.json | 4 +-- .../blocked-term-enclosed.json | 4 +-- .../automod-message-hold/blocked-term.json | 4 +-- .../automod-message-hold/blocked-terms-4.json | 4 +-- .../automod-message-hold/localized-name.json | 4 +-- .../automod-message-update/approved.json | 4 +-- .../automod-message-update/denied.json | 4 +-- .../automod-message-update/expired.json | 4 +-- .../message-held.json | 2 +- .../message-approved.json | 2 +- .../message-denied.json | 2 +- .../add-blocked-term-three.json | 2 +- .../channel-moderate/add-blocked-term.json | 2 +- .../add-permitted-term-two.json | 2 +- .../channel-moderate/add-permitted-term.json | 2 +- .../EventSub/channel-moderate/ban-reason.json | 2 +- .../EventSub/channel-moderate/ban.json | 2 +- .../EventSub/channel-moderate/clear.json | 2 +- .../channel-moderate/delete-long.json | 2 +- .../EventSub/channel-moderate/delete.json | 2 +- .../channel-moderate/emoteonly-off.json | 2 +- .../EventSub/channel-moderate/emoteonly.json | 2 +- .../channel-moderate/followers-0s.json | 2 +- .../channel-moderate/followers-off.json | 2 +- .../EventSub/channel-moderate/followers.json | 2 +- .../EventSub/channel-moderate/mod.json | 2 +- .../EventSub/channel-moderate/raid.json | 2 +- .../remove-blocked-term-four.json | 2 +- .../channel-moderate/remove-blocked-term.json | 2 +- .../remove-permitted-term-from-automod.json | 2 +- .../remove-permitted-term.json | 2 +- .../channel-moderate/shared-ban-reason.json | 2 +- .../EventSub/channel-moderate/shared-ban.json | 2 +- .../channel-moderate/shared-delete-long.json | 2 +- .../channel-moderate/shared-delete.json | 2 +- .../shared-timeout-stacking-diff-sources.json | 6 ++--- ...shared-timeout-stacking-diff-sources2.json | 4 +-- .../shared-timeout-stacking.json | 4 +-- .../channel-moderate/shared-timeout.json | 2 +- .../channel-moderate/shared-unban.json | 2 +- .../channel-moderate/shared-untimeout.json | 2 +- .../EventSub/channel-moderate/slow-off.json | 2 +- .../EventSub/channel-moderate/slow.json | 2 +- .../channel-moderate/subscribers-off.json | 2 +- .../channel-moderate/subscribers.json | 2 +- .../timeout-stacking-reason.json | 4 +-- .../channel-moderate/timeout-stacking.json | 4 +-- .../EventSub/channel-moderate/timeout.json | 2 +- .../EventSub/channel-moderate/unban.json | 2 +- .../channel-moderate/uniquechat-off.json | 2 +- .../EventSub/channel-moderate/uniquechat.json | 2 +- .../EventSub/channel-moderate/unmod.json | 2 +- .../EventSub/channel-moderate/unraid.json | 2 +- .../EventSub/channel-moderate/untimeout.json | 2 +- .../channel-moderate/warn-shared.json | 2 +- .../EventSub/channel-moderate/warn.json | 2 +- .../monitored.json | 2 +- .../no-treatment.json | 2 +- .../restricted.json | 2 +- .../clearchat-stack-always.json | 2 +- .../clearchat-stack-never.json | 2 +- .../clearchat-stack-no-user.json | 2 +- .../IrcMessageHandler/clearchat.json | 2 +- .../timeout-stack-always.json | 2 +- .../timeout-stack-never.json | 2 +- .../timeout-stack-no-user.json | 4 +-- .../snapshots/IrcMessageHandler/timeout.json | 2 +- 79 files changed, 153 insertions(+), 125 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b04962d..a44f5641 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ - Bugfix: Fixed color input thinking blue is also red. (#5982) - Bugfix: Fixed an issue where commands would sometimes reset if Chatterino was improperly shut down. (#6011) - Dev: Subscriptions to PubSub channel points redemption topics now use no auth token, making it continue to work during PubSub shutdown. (#5947) -- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943, #5952, #5953, #5968, #5973, #5974, #5980, #5981, #5985, #5990, #5992, #5993, #5996, #5995, #6000, #6001, #6002, #6003, #6005, #6007, #6010, #6008, #6012, #6013, #6015, #6017, #6027, #6028, #6035, #6036, #6040) +- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943, #5952, #5953, #5968, #5973, #5974, #5980, #5981, #5985, #5990, #5992, #5993, #5996, #5995, #6000, #6001, #6002, #6003, #6005, #6007, #6010, #6008, #6012, #6013, #6015, #6017, #6027, #6028, #6035, #6036, #6040, #6041) - Dev: Remove unneeded platform specifier for toasts. (#5914) - Dev: Highlight checks now use non-capturing groups for the boundaries. (#5784) - Dev: Removed unused PubSub whisper code. (#5898) diff --git a/mocks/include/mocks/DisabledStreamerMode.hpp b/mocks/include/mocks/DisabledStreamerMode.hpp index 747fdd0a..20409d46 100644 --- a/mocks/include/mocks/DisabledStreamerMode.hpp +++ b/mocks/include/mocks/DisabledStreamerMode.hpp @@ -10,6 +10,11 @@ public: return false; } + bool shouldHideModActions() const override + { + return false; + } + void start() override { } diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index 2adf5d06..139401d2 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -729,6 +729,7 @@ MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &username, this->message().flags.set(MessageFlag::System); this->message().flags.set(MessageFlag::Timeout); + this->message().flags.set(MessageFlag::ModerationAction); this->message().flags.set(MessageFlag::DoNotTriggerNotification); this->message().timeoutUser = username; @@ -747,6 +748,7 @@ MessageBuilder::MessageBuilder(const BanAction &action, const QDateTime &time, this->emplace(); this->message().flags.set(MessageFlag::System); this->message().flags.set(MessageFlag::Timeout); + this->message().flags.set(MessageFlag::ModerationAction); this->message().timeoutUser = action.target.login; this->message().loginName = action.source.login; this->message().count = count; @@ -1464,7 +1466,7 @@ MessagePtr MessageBuilder::makeDeletionMessageFromIRC( builder.emplace(); builder.message().flags.set(MessageFlag::System); builder.message().flags.set(MessageFlag::DoNotTriggerNotification); - builder.message().flags.set(MessageFlag::Timeout); + builder.message().flags.set(MessageFlag::ModerationAction); // TODO(mm2pl): If or when jumping to a single message gets implemented a link, // add a link to the originalMessage builder.emplace("A message from", MessageElementFlag::Text, @@ -1503,7 +1505,7 @@ MessagePtr MessageBuilder::makeDeletionMessageFromPubSub( builder.emplace(); builder.message().flags.set(MessageFlag::System); builder.message().flags.set(MessageFlag::DoNotTriggerNotification); - builder.message().flags.set(MessageFlag::Timeout); + builder.message().flags.set(MessageFlag::ModerationAction); builder .emplace(action.source.login, MessageElementFlag::Username, @@ -1710,7 +1712,7 @@ std::pair MessageBuilder::makeAutomodMessage( builder.message().loginName = "automod"; builder.message().channelName = channelName; builder.message().flags.set(MessageFlag::PubSub); - builder.message().flags.set(MessageFlag::Timeout); + builder.message().flags.set(MessageFlag::ModerationAction); builder.message().flags.set(MessageFlag::AutoMod); builder.message().flags.set(MessageFlag::AutoModOffendingMessageHeader); @@ -1761,7 +1763,7 @@ std::pair MessageBuilder::makeAutomodMessage( builder2.emplace(); builder2.message().loginName = action.target.login; builder2.message().flags.set(MessageFlag::PubSub); - builder2.message().flags.set(MessageFlag::Timeout); + builder2.message().flags.set(MessageFlag::ModerationAction); builder2.message().flags.set(MessageFlag::AutoMod); builder2.message().flags.set(MessageFlag::AutoModOffendingMessage); @@ -2063,9 +2065,9 @@ MessagePtrMut MessageBuilder::makeClearChatMessage(const QDateTime &now, builder.emplace(now.time()); builder->count = count; builder->serverReceivedTime = now; - builder.message().flags.set(MessageFlag::System, - MessageFlag::DoNotTriggerNotification, - MessageFlag::ClearChat); + builder.message().flags.set( + MessageFlag::System, MessageFlag::DoNotTriggerNotification, + MessageFlag::ClearChat, MessageFlag::ModerationAction); QString messageText; if (actor.isEmpty()) diff --git a/src/messages/MessageFlag.hpp b/src/messages/MessageFlag.hpp index 8923856d..48eacaf6 100644 --- a/src/messages/MessageFlag.hpp +++ b/src/messages/MessageFlag.hpp @@ -58,6 +58,13 @@ enum class MessageFlag : std::int64_t { ClearChat = (1LL << 39), /// The message is built from EventSub EventSub = (1LL << 40), + /// The message is a moderation action. + /// Example messages that would count as moderation actions: + /// - forsen has been banned + /// - forsen deleted message from forsen + /// - forsen added "blockedterm" as a blocked term + /// - Your message is being checked by mods and has not been sent + ModerationAction = (1LL << 41), }; using MessageFlags = FlagsEnum; diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index dc51113f..184db353 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -166,16 +166,14 @@ void MessageLayout::actuallyLayout(const MessageLayoutContext &ctx) continue; } - if (this->message_->flags.has(MessageFlag::Timeout) || - this->message_->flags.has(MessageFlag::Untimeout)) + if (this->message_->flags.has(MessageFlag::ModerationAction)) { - // 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())) + getApp()->getStreamerMode()->shouldHideModActions()) { + // Message is being hidden because we consider the message + // a moderation action (something a streamer is unlikely to + // want to share if they briefly show their chat on stream) continue; } } @@ -515,7 +513,8 @@ bool MessageLayout::isReplyable() const if (this->message_->flags.hasAny( {MessageFlag::System, MessageFlag::Subscription, - MessageFlag::Timeout, MessageFlag::Whisper})) + MessageFlag::Timeout, MessageFlag::Whisper, + MessageFlag::ModerationAction})) { return false; } diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index 19322b3a..54c919e7 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -431,9 +431,10 @@ void TwitchIrcServer::initialize() return; } - if (getSettings()->streamerModeHideModActions && - getApp()->getStreamerMode()->isEnabled()) + if (getApp()->getStreamerMode()->shouldHideModActions()) { + // NOTE: This completely stops the building of this action, rathern than only hiding it. + // If the user disabled streamer mode or the setting, there will be messages missing return; } @@ -476,9 +477,10 @@ void TwitchIrcServer::initialize() return; } - if (getSettings()->streamerModeHideModActions && - getApp()->getStreamerMode()->isEnabled()) + if (getApp()->getStreamerMode()->shouldHideModActions()) { + // NOTE: This completely stops the building of this action, rathern than only hiding it. + // If the user disabled streamer mode or the setting, there will be messages missing return; } @@ -680,9 +682,10 @@ void TwitchIrcServer::initialize() this->connections_.managedConnect( getApp()->getTwitchPubSub()->moderation.automodUserMessage, [this](const auto &action) { - if (getSettings()->streamerModeHideModActions && - getApp()->getStreamerMode()->isEnabled()) + if (getApp()->getStreamerMode()->shouldHideModActions()) { + // NOTE: This completely stops the building of this action, rathern than only hiding it. + // If the user disabled streamer mode or the setting, there will be messages missing return; } auto chan = this->getChannelOrEmptyByID(action.roomID); diff --git a/src/providers/twitch/eventsub/Connection.cpp b/src/providers/twitch/eventsub/Connection.cpp index e81f196d..272e2257 100644 --- a/src/providers/twitch/eventsub/Connection.cpp +++ b/src/providers/twitch/eventsub/Connection.cpp @@ -281,12 +281,6 @@ void Connection::onChannelSuspiciousUserMessage( return; } - if (getSettings()->streamerModeHideModActions && - getApp()->getStreamerMode()->isEnabled()) - { - return; - } - auto *channel = dynamic_cast( getApp() ->getTwitch() diff --git a/src/providers/twitch/eventsub/MessageBuilder.cpp b/src/providers/twitch/eventsub/MessageBuilder.cpp index 057a6801..93375c4d 100644 --- a/src/providers/twitch/eventsub/MessageBuilder.cpp +++ b/src/providers/twitch/eventsub/MessageBuilder.cpp @@ -143,7 +143,6 @@ EventSubMessageBuilder::EventSubMessageBuilder(TwitchChannel *channel, { this->emplace(time.time()); this->message().flags.set(MessageFlag::System, MessageFlag::EventSub); - this->message().flags.set(MessageFlag::Timeout); // do we need this? this->message().serverReceivedTime = time; } @@ -217,6 +216,7 @@ void makeModerateMessage(EventSubMessageBuilder &builder, const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::Warn &action) { + builder->flags.set(MessageFlag::ModerationAction); QString text; builder.appendUser(event.moderatorUserName, event.moderatorUserLogin, text); @@ -255,6 +255,8 @@ void makeModerateMessage(EventSubMessageBuilder &builder, const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::Ban &action) { + builder->flags.set(MessageFlag::ModerationAction, MessageFlag::Timeout); + QString text; bool isShared = event.isFromSharedChat(); @@ -288,6 +290,8 @@ void makeModerateMessage( const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::Unban &action) { + builder->flags.set(MessageFlag::ModerationAction, MessageFlag::Untimeout); + QString text; bool isShared = event.isFromSharedChat(); @@ -313,10 +317,11 @@ void makeModerateMessage( const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::Untimeout &action) { + builder->flags.set(MessageFlag::ModerationAction, MessageFlag::Untimeout); + QString text; bool isShared = event.isFromSharedChat(); - builder->flags.set(MessageFlag::Timeout); builder.appendUser(event.moderatorUserName, event.moderatorUserLogin, text); builder.emplaceSystemTextAndUpdate("untimedout", text); builder.appendUser(action.userName, action.userLogin, text, isShared); @@ -339,7 +344,8 @@ void makeModerateMessage( const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::Delete &action) { - builder.message().flags.set(MessageFlag::DoNotTriggerNotification); + builder->flags.set(MessageFlag::DoNotTriggerNotification, + MessageFlag::ModerationAction); QString text; bool isShared = event.isFromSharedChat(); @@ -465,6 +471,8 @@ void makeModerateMessage( const lib::payload::channel_moderate::v2::Event &event, const lib::payload::channel_moderate::v2::AutomodTerms &action) { + builder->flags.set(MessageFlag::ModerationAction); + QString text; builder.appendUser(event.moderatorUserName, event.moderatorUserLogin, text); @@ -589,7 +597,7 @@ MessagePtr makeAutomodHoldMessageHeader( builder->id = u"automod_" % event.messageID.qt(); builder->loginName = u"automod"_s; builder->channelName = event.broadcasterUserLogin.qt(); - builder->flags.set(MessageFlag::PubSub, MessageFlag::Timeout, + builder->flags.set(MessageFlag::PubSub, MessageFlag::ModerationAction, MessageFlag::AutoMod, MessageFlag::AutoModOffendingMessageHeader); builder->flags.set( @@ -637,7 +645,7 @@ MessagePtr makeAutomodHoldMessageBody( { EventSubMessageBuilder builder(channel); builder->serverReceivedTime = time; - builder->flags.set(MessageFlag::PubSub, MessageFlag::Timeout, + builder->flags.set(MessageFlag::PubSub, MessageFlag::ModerationAction, MessageFlag::AutoMod, MessageFlag::AutoModOffendingMessage); builder->flags.set( @@ -784,7 +792,8 @@ MessagePtr makeSuspiciousUserUpdate( const lib::payload::channel_suspicious_user_update::v1::Event &event) { EventSubMessageBuilder builder(channel, time); - builder->flags.set(MessageFlag::DoNotTriggerNotification); + builder->flags.set(MessageFlag::DoNotTriggerNotification, + MessageFlag::ModerationAction); builder->loginName = event.moderatorUserLogin.qt(); QString text; @@ -833,8 +842,7 @@ MessagePtr makeUserMessageHeldMessage( builder->id = u"automod_" % event.messageID.qt(); builder->loginName = u"automod"_s; builder->channelName = event.broadcasterUserLogin.qt(); - builder->flags.set(MessageFlag::PubSub, MessageFlag::Timeout, - MessageFlag::AutoMod); + builder->flags.set(MessageFlag::PubSub, MessageFlag::AutoMod); // AutoMod shield badge builder.emplace(makeAutoModBadge(), @@ -863,8 +871,7 @@ MessagePtr makeUserMessageUpdateMessage( builder->id = u"automod_" % event.messageID.qt(); builder->loginName = u"automod"_s; builder->channelName = event.broadcasterUserLogin.qt(); - builder->flags.set(MessageFlag::PubSub, MessageFlag::Timeout, - MessageFlag::AutoMod); + builder->flags.set(MessageFlag::PubSub, MessageFlag::AutoMod); // AutoMod shield badge builder.emplace(makeAutoModBadge(), diff --git a/src/providers/twitch/eventsub/MessageHandlers.cpp b/src/providers/twitch/eventsub/MessageHandlers.cpp index 1af73ec0..d0803588 100644 --- a/src/providers/twitch/eventsub/MessageHandlers.cpp +++ b/src/providers/twitch/eventsub/MessageHandlers.cpp @@ -45,7 +45,8 @@ void handleModerateMessage( EventSubMessageBuilder builder(chan, time); builder->loginName = event.moderatorUserLogin.qt(); // pretend we're pubsub - builder->flags.set(MessageFlag::PubSub); + builder->flags.set(MessageFlag::PubSub, MessageFlag::Timeout, + MessageFlag::ModerationAction); QString text; bool isShared = event.isFromSharedChat(); diff --git a/src/singletons/StreamerMode.cpp b/src/singletons/StreamerMode.cpp index 33a08900..1548365a 100644 --- a/src/singletons/StreamerMode.cpp +++ b/src/singletons/StreamerMode.cpp @@ -202,6 +202,11 @@ bool StreamerMode::isEnabled() const return this->private_->isEnabled(); } +bool StreamerMode::shouldHideModActions() const +{ + return getSettings()->streamerModeHideModActions && this->isEnabled(); +} + void StreamerMode::start() { this->private_->start(); diff --git a/src/singletons/StreamerMode.hpp b/src/singletons/StreamerMode.hpp index 457d6721..1f736d0b 100644 --- a/src/singletons/StreamerMode.hpp +++ b/src/singletons/StreamerMode.hpp @@ -20,6 +20,9 @@ public: [[nodiscard]] virtual bool isEnabled() const = 0; + /// Returns true if streamer mode is enabled & the settings to hide mod actions is enabled + [[nodiscard]] virtual bool shouldHideModActions() const = 0; + virtual void start() = 0; Q_SIGNALS: @@ -39,6 +42,8 @@ public: bool isEnabled() const override; + bool shouldHideModActions() const override; + void start() override; private: diff --git a/src/util/ChannelHelpers.hpp b/src/util/ChannelHelpers.hpp index 75c1cf61..7a9436f3 100644 --- a/src/util/ChannelHelpers.hpp +++ b/src/util/ChannelHelpers.hpp @@ -55,8 +55,8 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message, if (timeoutStackStyle == TimeoutStackStyle::DontStackBeyondUserMessage) { if (s->loginName == message->timeoutUser && - s->flags.hasNone({MessageFlag::Disabled, MessageFlag::Timeout, - MessageFlag::Untimeout})) + s->flags.hasNone( + {MessageFlag::Disabled, MessageFlag::ModerationAction})) { break; } @@ -114,8 +114,8 @@ void addOrReplaceChannelTimeout(const Buf &buffer, MessagePtr message, { auto &s = buffer[i]; if (s->loginName == message->timeoutUser && - s->flags.hasNone({MessageFlag::Timeout, MessageFlag::Untimeout, - MessageFlag::Whisper})) + s->flags.hasNone( + {MessageFlag::ModerationAction, MessageFlag::Whisper})) { // FOURTF: disabled for now // PAJLADA: Shitty solution described in Message.hpp diff --git a/tests/snapshots/EventSub/automod-message-hold/automod-category.json b/tests/snapshots/EventSub/automod-message-hold/automod-category.json index 42d302d6..3db21f37 100644 --- a/tests/snapshots/EventSub/automod-message-hold/automod-category.json +++ b/tests/snapshots/EventSub/automod-message-hold/automod-category.json @@ -136,7 +136,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub|ModerationAction", "id": "automod_19d067ff-89b5-4790-a720-97599894eb6b", "localizedName": "", "loginName": "automod", @@ -242,7 +242,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json b/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json index 035c75c6..2cd32fd8 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json @@ -148,7 +148,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub|ModerationAction", "id": "automod_0cbb6e48-1606-46c6-b1ac-c97626e1c5cb", "localizedName": "", "loginName": "automod", @@ -256,7 +256,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-hold/blocked-term.json b/tests/snapshots/EventSub/automod-message-hold/blocked-term.json index 56859de9..8eed979d 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-term.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-term.json @@ -142,7 +142,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub|ModerationAction", "id": "automod_c0fac418-25a9-41b8-adf3-5bd637fca1e1", "localizedName": "", "loginName": "automod", @@ -248,7 +248,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json b/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json index f7d04ed3..e2b7a343 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json @@ -194,7 +194,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessageHeader|AutoModBlockedTerm|EventSub|ModerationAction", "id": "automod_45a63ca1-1b0c-46ef-9075-d112f9a9f376", "localizedName": "", "loginName": "automod", @@ -306,7 +306,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|AutoModBlockedTerm|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-hold/localized-name.json b/tests/snapshots/EventSub/automod-message-hold/localized-name.json index abe8a004..59022479 100644 --- a/tests/snapshots/EventSub/automod-message-hold/localized-name.json +++ b/tests/snapshots/EventSub/automod-message-hold/localized-name.json @@ -136,7 +136,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub|ModerationAction", "id": "automod_19d067ff-89b5-4790-a720-97599894eb6b", "localizedName": "", "loginName": "automod", @@ -242,7 +242,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "testaccount_420", diff --git a/tests/snapshots/EventSub/automod-message-update/approved.json b/tests/snapshots/EventSub/automod-message-update/approved.json index a18d6088..e07652f1 100644 --- a/tests/snapshots/EventSub/automod-message-update/approved.json +++ b/tests/snapshots/EventSub/automod-message-update/approved.json @@ -176,7 +176,7 @@ ] } ], - "flags": "Timeout|Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub", + "flags": "Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub|ModerationAction", "id": "automod_19d067ff-89b5-4790-a720-97599894eb6b", "localizedName": "", "loginName": "automod", @@ -282,7 +282,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-update/denied.json b/tests/snapshots/EventSub/automod-message-update/denied.json index 7883eea3..0200dcd3 100644 --- a/tests/snapshots/EventSub/automod-message-update/denied.json +++ b/tests/snapshots/EventSub/automod-message-update/denied.json @@ -176,7 +176,7 @@ ] } ], - "flags": "Timeout|Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub", + "flags": "Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub|ModerationAction", "id": "automod_19d067ff-89b5-4790-a720-97599894eb6b", "localizedName": "", "loginName": "automod", @@ -282,7 +282,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/automod-message-update/expired.json b/tests/snapshots/EventSub/automod-message-update/expired.json index e33b9fab..8665e2bb 100644 --- a/tests/snapshots/EventSub/automod-message-update/expired.json +++ b/tests/snapshots/EventSub/automod-message-update/expired.json @@ -176,7 +176,7 @@ ] } ], - "flags": "Timeout|Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub", + "flags": "Disabled|PubSub|AutoMod|AutoModOffendingMessageHeader|EventSub|ModerationAction", "id": "automod_19d067ff-89b5-4790-a720-97599894eb6b", "localizedName": "", "loginName": "automod", @@ -282,7 +282,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|AutoModOffendingMessage|EventSub", + "flags": "PubSub|AutoMod|AutoModOffendingMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-chat-user-message-hold/message-held.json b/tests/snapshots/EventSub/channel-chat-user-message-hold/message-held.json index 0cc6c809..49c45b65 100644 --- a/tests/snapshots/EventSub/channel-chat-user-message-hold/message-held.json +++ b/tests/snapshots/EventSub/channel-chat-user-message-hold/message-held.json @@ -90,7 +90,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|EventSub", + "flags": "PubSub|AutoMod|EventSub", "id": "automod_e39e3c58-3d25-49fd-8c94-e776ef57a7f8", "localizedName": "", "loginName": "automod", diff --git a/tests/snapshots/EventSub/channel-chat-user-message-update/message-approved.json b/tests/snapshots/EventSub/channel-chat-user-message-update/message-approved.json index 7fa13818..5464b165 100644 --- a/tests/snapshots/EventSub/channel-chat-user-message-update/message-approved.json +++ b/tests/snapshots/EventSub/channel-chat-user-message-update/message-approved.json @@ -83,7 +83,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|EventSub", + "flags": "PubSub|AutoMod|EventSub", "id": "automod_5686ec52-e02c-4042-ac21-1dfd8cab0f9f", "localizedName": "", "loginName": "automod", diff --git a/tests/snapshots/EventSub/channel-chat-user-message-update/message-denied.json b/tests/snapshots/EventSub/channel-chat-user-message-update/message-denied.json index 26ad8ea0..ca0877a2 100644 --- a/tests/snapshots/EventSub/channel-chat-user-message-update/message-denied.json +++ b/tests/snapshots/EventSub/channel-chat-user-message-update/message-denied.json @@ -89,7 +89,7 @@ ] } ], - "flags": "Timeout|PubSub|AutoMod|EventSub", + "flags": "PubSub|AutoMod|EventSub", "id": "automod_fc90dc3b-0634-41c3-8365-f40719f076ab", "localizedName": "", "loginName": "automod", diff --git a/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json b/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json index e0d5389b..270b2dfd 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json +++ b/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json @@ -192,7 +192,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json b/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json index 0bb29486..3dbaac20 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json +++ b/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json @@ -202,7 +202,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json b/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json index dd6e01c6..b2516a7e 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json +++ b/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json @@ -190,7 +190,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json b/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json index 8eb88cc4..35b36498 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json +++ b/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json @@ -202,7 +202,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/ban-reason.json b/tests/snapshots/EventSub/channel-moderate/ban-reason.json index f4556cc9..e935e0d2 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/ban-reason.json @@ -157,7 +157,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Timeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/ban.json b/tests/snapshots/EventSub/channel-moderate/ban.json index 43785d63..13cb4be6 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban.json +++ b/tests/snapshots/EventSub/channel-moderate/ban.json @@ -141,7 +141,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Timeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/clear.json b/tests/snapshots/EventSub/channel-moderate/clear.json index 29df6d01..5df237f3 100644 --- a/tests/snapshots/EventSub/channel-moderate/clear.json +++ b/tests/snapshots/EventSub/channel-moderate/clear.json @@ -105,7 +105,7 @@ ] } ], - "flags": "System|DoNotTriggerNotification|PubSub|ClearChat", + "flags": "System|DoNotTriggerNotification|PubSub|ClearChat|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/EventSub/channel-moderate/delete-long.json b/tests/snapshots/EventSub/channel-moderate/delete-long.json index 90c6814e..55519bd3 100644 --- a/tests/snapshots/EventSub/channel-moderate/delete-long.json +++ b/tests/snapshots/EventSub/channel-moderate/delete-long.json @@ -159,7 +159,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "testaccount_420", diff --git a/tests/snapshots/EventSub/channel-moderate/delete.json b/tests/snapshots/EventSub/channel-moderate/delete.json index 13dcdac6..efa8c200 100644 --- a/tests/snapshots/EventSub/channel-moderate/delete.json +++ b/tests/snapshots/EventSub/channel-moderate/delete.json @@ -159,7 +159,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "testaccount_420", diff --git a/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json b/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json index 4209178c..d9a5a5ef 100644 --- a/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json +++ b/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/emoteonly.json b/tests/snapshots/EventSub/channel-moderate/emoteonly.json index d4f563f8..1f378743 100644 --- a/tests/snapshots/EventSub/channel-moderate/emoteonly.json +++ b/tests/snapshots/EventSub/channel-moderate/emoteonly.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/followers-0s.json b/tests/snapshots/EventSub/channel-moderate/followers-0s.json index 3d81109e..a42fe896 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers-0s.json +++ b/tests/snapshots/EventSub/channel-moderate/followers-0s.json @@ -150,7 +150,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/followers-off.json b/tests/snapshots/EventSub/channel-moderate/followers-off.json index f3d47934..df97ec10 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers-off.json +++ b/tests/snapshots/EventSub/channel-moderate/followers-off.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/followers.json b/tests/snapshots/EventSub/channel-moderate/followers.json index 6929753d..0613776d 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers.json +++ b/tests/snapshots/EventSub/channel-moderate/followers.json @@ -166,7 +166,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/mod.json b/tests/snapshots/EventSub/channel-moderate/mod.json index f1e09cfb..5e629fc2 100644 --- a/tests/snapshots/EventSub/channel-moderate/mod.json +++ b/tests/snapshots/EventSub/channel-moderate/mod.json @@ -140,7 +140,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "uint128", diff --git a/tests/snapshots/EventSub/channel-moderate/raid.json b/tests/snapshots/EventSub/channel-moderate/raid.json index ba596115..b6637995 100644 --- a/tests/snapshots/EventSub/channel-moderate/raid.json +++ b/tests/snapshots/EventSub/channel-moderate/raid.json @@ -144,7 +144,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "pajlada", diff --git a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json index f0428d44..6de2eab3 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json @@ -194,7 +194,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json index 648aa082..47c1d3ab 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json @@ -202,7 +202,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term-from-automod.json b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term-from-automod.json index bb2b8a0e..264ce840 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term-from-automod.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term-from-automod.json @@ -202,7 +202,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json index a41a50d7..99b50079 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json @@ -202,7 +202,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json b/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json index 4c75af18..4beae419 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json @@ -191,7 +191,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Timeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban.json b/tests/snapshots/EventSub/channel-moderate/shared-ban.json index 577e352f..c96afe0f 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban.json @@ -174,7 +174,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Timeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json b/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json index d256e198..0b2f0ca7 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json @@ -192,7 +192,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "testaccount_420", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-delete.json b/tests/snapshots/EventSub/channel-moderate/shared-delete.json index 678ca4a7..b401f239 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-delete.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-delete.json @@ -192,7 +192,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "testaccount_420", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources.json index 6b712b1b..ae0086f9 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources.json @@ -294,7 +294,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -433,7 +433,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", @@ -602,7 +602,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources2.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources2.json index d415ac17..ec7de7d0 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources2.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources2.json @@ -254,7 +254,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -423,7 +423,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json index b77cc472..4704dcc2 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json @@ -254,7 +254,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -393,7 +393,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout.json index f07d2265..eb05d9e8 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout.json @@ -198,7 +198,7 @@ ] } ], - "flags": "System|Timeout|PubSub|SharedMessage|EventSub", + "flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-unban.json b/tests/snapshots/EventSub/channel-moderate/shared-unban.json index 4026208f..16513546 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-unban.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-unban.json @@ -173,7 +173,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Untimeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json b/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json index cbc0bb1c..e15ebd11 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json @@ -173,7 +173,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Untimeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/slow-off.json b/tests/snapshots/EventSub/channel-moderate/slow-off.json index b5a74f1e..452bfb96 100644 --- a/tests/snapshots/EventSub/channel-moderate/slow-off.json +++ b/tests/snapshots/EventSub/channel-moderate/slow-off.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/slow.json b/tests/snapshots/EventSub/channel-moderate/slow.json index dcd3132a..af8d6ad8 100644 --- a/tests/snapshots/EventSub/channel-moderate/slow.json +++ b/tests/snapshots/EventSub/channel-moderate/slow.json @@ -166,7 +166,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/subscribers-off.json b/tests/snapshots/EventSub/channel-moderate/subscribers-off.json index 1dc59e43..05556df8 100644 --- a/tests/snapshots/EventSub/channel-moderate/subscribers-off.json +++ b/tests/snapshots/EventSub/channel-moderate/subscribers-off.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/subscribers.json b/tests/snapshots/EventSub/channel-moderate/subscribers.json index 4616b65e..4816962c 100644 --- a/tests/snapshots/EventSub/channel-moderate/subscribers.json +++ b/tests/snapshots/EventSub/channel-moderate/subscribers.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json b/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json index 0cd29d27..40dc4c76 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json @@ -224,7 +224,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -378,7 +378,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json b/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json index 9d94aa50..7215ac46 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json @@ -223,7 +223,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -362,7 +362,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/timeout.json b/tests/snapshots/EventSub/channel-moderate/timeout.json index a70b6663..f18fd40f 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout.json @@ -183,7 +183,7 @@ ] } ], - "flags": "System|Timeout|PubSub|EventSub", + "flags": "System|Timeout|PubSub|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/unban.json b/tests/snapshots/EventSub/channel-moderate/unban.json index f5b8f607..a3e448f5 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban.json +++ b/tests/snapshots/EventSub/channel-moderate/unban.json @@ -140,7 +140,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Untimeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json b/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json index d3db2f08..8d9cefc4 100644 --- a/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json +++ b/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/uniquechat.json b/tests/snapshots/EventSub/channel-moderate/uniquechat.json index 5ea4cdfd..a4ffee10 100644 --- a/tests/snapshots/EventSub/channel-moderate/uniquechat.json +++ b/tests/snapshots/EventSub/channel-moderate/uniquechat.json @@ -148,7 +148,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/unmod.json b/tests/snapshots/EventSub/channel-moderate/unmod.json index ae4666ed..8a770b02 100644 --- a/tests/snapshots/EventSub/channel-moderate/unmod.json +++ b/tests/snapshots/EventSub/channel-moderate/unmod.json @@ -140,7 +140,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "uint128", diff --git a/tests/snapshots/EventSub/channel-moderate/unraid.json b/tests/snapshots/EventSub/channel-moderate/unraid.json index 90883630..d80896fd 100644 --- a/tests/snapshots/EventSub/channel-moderate/unraid.json +++ b/tests/snapshots/EventSub/channel-moderate/unraid.json @@ -143,7 +143,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub", "id": "", "localizedName": "", "loginName": "pajlada", diff --git a/tests/snapshots/EventSub/channel-moderate/untimeout.json b/tests/snapshots/EventSub/channel-moderate/untimeout.json index 9c6f479f..ef1ecc5d 100644 --- a/tests/snapshots/EventSub/channel-moderate/untimeout.json +++ b/tests/snapshots/EventSub/channel-moderate/untimeout.json @@ -140,7 +140,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|Untimeout|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "nerixyz", diff --git a/tests/snapshots/EventSub/channel-moderate/warn-shared.json b/tests/snapshots/EventSub/channel-moderate/warn-shared.json index dcf5daba..ca2f6232 100644 --- a/tests/snapshots/EventSub/channel-moderate/warn-shared.json +++ b/tests/snapshots/EventSub/channel-moderate/warn-shared.json @@ -159,7 +159,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "quotrok", diff --git a/tests/snapshots/EventSub/channel-moderate/warn.json b/tests/snapshots/EventSub/channel-moderate/warn.json index 91412ee3..81b185f3 100644 --- a/tests/snapshots/EventSub/channel-moderate/warn.json +++ b/tests/snapshots/EventSub/channel-moderate/warn.json @@ -159,7 +159,7 @@ ] } ], - "flags": "System|Timeout|EventSub", + "flags": "System|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "quotrok", diff --git a/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json b/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json index 946669d4..9d7f7bf3 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json @@ -119,7 +119,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "uint128", diff --git a/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json b/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json index 1b686bf1..08bea7f8 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json @@ -119,7 +119,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "uint128", diff --git a/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json b/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json index a5f80244..5f8b1602 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json @@ -119,7 +119,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification|EventSub", + "flags": "System|DoNotTriggerNotification|EventSub|ModerationAction", "id": "", "localizedName": "", "loginName": "uint128", diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json index dbb0fab0..5165de2d 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json @@ -61,7 +61,7 @@ ] } ], - "flags": "System|DoNotTriggerNotification|ClearChat", + "flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json index 9c3b194a..c9a11ac4 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json @@ -59,7 +59,7 @@ ] } ], - "flags": "System|DoNotTriggerNotification|ClearChat", + "flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json index 85521959..375013fc 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json @@ -61,7 +61,7 @@ ] } ], - "flags": "System|DoNotTriggerNotification|ClearChat", + "flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/clearchat.json b/tests/snapshots/IrcMessageHandler/clearchat.json index 45a24923..2ecf8dee 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat.json +++ b/tests/snapshots/IrcMessageHandler/clearchat.json @@ -59,7 +59,7 @@ ] } ], - "flags": "System|DoNotTriggerNotification|ClearChat", + "flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json index 99431aa7..5f7c985e 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json @@ -75,7 +75,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification", + "flags": "System|Timeout|DoNotTriggerNotification|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json index f83d8545..1d482428 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json @@ -75,7 +75,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification", + "flags": "System|Timeout|DoNotTriggerNotification|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json b/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json index d4e49b57..b3d1ba33 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json @@ -73,7 +73,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification", + "flags": "System|Timeout|DoNotTriggerNotification|ModerationAction", "id": "", "localizedName": "", "loginName": "", @@ -274,7 +274,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification", + "flags": "System|Timeout|DoNotTriggerNotification|ModerationAction", "id": "", "localizedName": "", "loginName": "", diff --git a/tests/snapshots/IrcMessageHandler/timeout.json b/tests/snapshots/IrcMessageHandler/timeout.json index 70612a79..52d623ac 100644 --- a/tests/snapshots/IrcMessageHandler/timeout.json +++ b/tests/snapshots/IrcMessageHandler/timeout.json @@ -73,7 +73,7 @@ ] } ], - "flags": "System|Timeout|DoNotTriggerNotification", + "flags": "System|Timeout|DoNotTriggerNotification|ModerationAction", "id": "", "localizedName": "", "loginName": "",