chatterino2
Code Issues

refactor(eventsub): Respect "Hide moderation actions" explicitly (#6041)

Browse Source
This commit is contained in:
pajlada
2025-03-08 14:00:35 +01:00
committed by GitHub
parent 0835064375
commit 77c4d858f9
79 changed files with 153 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -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)
mocks/include/mocks/DisabledStreamerMode.hpp
+5
View File
@@ -10,6 +10,11 @@ public:
return false;
}
bool shouldHideModActions() const override
{
return false;
}
void start() override
{
}
src/messages/MessageBuilder.cpp
+9 -7
View File
@@ -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<TimestampElement>();
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<TimestampElement>();
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<TextElement>("A message from", MessageElementFlag::Text,
@@ -1503,7 +1505,7 @@ MessagePtr MessageBuilder::makeDeletionMessageFromPubSub(
builder.emplace<TimestampElement>();
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<TextElement>(action.source.login, MessageElementFlag::Username,
@@ -1710,7 +1712,7 @@ std::pair<MessagePtr, MessagePtr> 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<MessagePtr, MessagePtr> MessageBuilder::makeAutomodMessage(
builder2.emplace<TwitchModerationElement>();
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<TimestampElement>(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())
src/messages/MessageFlag.hpp
+7
View File
@@ -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<MessageFlag>;
src/messages/layouts/MessageLayout.cpp
+7 -8
View File
@@ -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;
}
src/providers/twitch/TwitchIrcServer.cpp
+9 -6
View File
@@ -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);
src/providers/twitch/eventsub/Connection.cpp
-6
View File
@@ -281,12 +281,6 @@ void Connection::onChannelSuspiciousUserMessage(
return;
}
if (getSettings()->streamerModeHideModActions &&
getApp()->getStreamerMode()->isEnabled())
{
return;
}
auto *channel = dynamic_cast<TwitchChannel *>(
getApp()
->getTwitch()
src/providers/twitch/eventsub/MessageBuilder.cpp
+17 -10
View File
@@ -143,7 +143,6 @@ EventSubMessageBuilder::EventSubMessageBuilder(TwitchChannel *channel,
{
this->emplace<TimestampElement>(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<BadgeElement>(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<BadgeElement>(makeAutoModBadge(),
src/providers/twitch/eventsub/MessageHandlers.cpp
+2 -1
View File
@@ -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();
src/singletons/StreamerMode.cpp
+5
View File
@@ -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();
src/singletons/StreamerMode.hpp
+5
View File
@@ -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:
src/util/ChannelHelpers.hpp
+4 -4
View File
@@ -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
tests/snapshots/EventSub/automod-message-hold/automod-category.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-hold/blocked-term.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-hold/localized-name.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-update/approved.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-update/denied.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/automod-message-update/expired.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/channel-chat-user-message-hold/message-held.json
+1 -1
View File
@@ -90,7 +90,7 @@
]
}
],
"flags": "Timeout|PubSub|AutoMod|EventSub",
"flags": "PubSub|AutoMod|EventSub",
"id": "automod_e39e3c58-3d25-49fd-8c94-e776ef57a7f8",
"localizedName": "",
"loginName": "automod",
tests/snapshots/EventSub/channel-chat-user-message-update/message-approved.json
+1 -1
View File
@@ -83,7 +83,7 @@
]
}
],
"flags": "Timeout|PubSub|AutoMod|EventSub",
"flags": "PubSub|AutoMod|EventSub",
"id": "automod_5686ec52-e02c-4042-ac21-1dfd8cab0f9f",
"localizedName": "",
"loginName": "automod",
tests/snapshots/EventSub/channel-chat-user-message-update/message-denied.json
+1 -1
View File
@@ -89,7 +89,7 @@
]
}
],
"flags": "Timeout|PubSub|AutoMod|EventSub",
"flags": "PubSub|AutoMod|EventSub",
"id": "automod_fc90dc3b-0634-41c3-8365-f40719f076ab",
"localizedName": "",
"loginName": "automod",
tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json
+1 -1
View File
@@ -192,7 +192,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/add-blocked-term.json
+1 -1
View File
@@ -202,7 +202,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json
+1 -1
View File
@@ -190,7 +190,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/add-permitted-term.json
+1 -1
View File
@@ -202,7 +202,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/ban-reason.json
+1 -1
View File
@@ -157,7 +157,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Timeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/ban.json
+1 -1
View File
@@ -141,7 +141,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Timeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/clear.json
+1 -1
View File
@@ -105,7 +105,7 @@
]
}
],
"flags": "System|DoNotTriggerNotification|PubSub|ClearChat",
"flags": "System|DoNotTriggerNotification|PubSub|ClearChat|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/EventSub/channel-moderate/delete-long.json
+1 -1
View File
@@ -159,7 +159,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "testaccount_420",
tests/snapshots/EventSub/channel-moderate/delete.json
+1 -1
View File
@@ -159,7 +159,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "testaccount_420",
tests/snapshots/EventSub/channel-moderate/emoteonly-off.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/emoteonly.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/followers-0s.json
+1 -1
View File
@@ -150,7 +150,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/followers-off.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/followers.json
+1 -1
View File
@@ -166,7 +166,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/mod.json
+1 -1
View File
@@ -140,7 +140,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "uint128",
tests/snapshots/EventSub/channel-moderate/raid.json
+1 -1
View File
@@ -144,7 +144,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "pajlada",
tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json
+1 -1
View File
@@ -194,7 +194,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json
+1 -1
View File
@@ -202,7 +202,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/remove-permitted-term-from-automod.json
+1 -1
View File
@@ -202,7 +202,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json
+1 -1
View File
@@ -202,7 +202,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json
+1 -1
View File
@@ -191,7 +191,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Timeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/shared-ban.json
+1 -1
View File
@@ -174,7 +174,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Timeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/shared-delete-long.json
+1 -1
View File
@@ -192,7 +192,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "testaccount_420",
tests/snapshots/EventSub/channel-moderate/shared-delete.json
+1 -1
View File
@@ -192,7 +192,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "testaccount_420",
tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources.json
+3 -3
View File
@@ -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",
tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking-diff-sources2.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/channel-moderate/shared-timeout.json
+1 -1
View File
@@ -198,7 +198,7 @@
]
}
],
"flags": "System|Timeout|PubSub|SharedMessage|EventSub",
"flags": "System|Timeout|PubSub|SharedMessage|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/shared-unban.json
+1 -1
View File
@@ -173,7 +173,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Untimeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/shared-untimeout.json
+1 -1
View File
@@ -173,7 +173,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Untimeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/slow-off.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/slow.json
+1 -1
View File
@@ -166,7 +166,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/subscribers-off.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/subscribers.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/channel-moderate/timeout-stacking.json
+2 -2
View File
@@ -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",
tests/snapshots/EventSub/channel-moderate/timeout.json
+1 -1
View File
@@ -183,7 +183,7 @@
]
}
],
"flags": "System|Timeout|PubSub|EventSub",
"flags": "System|Timeout|PubSub|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/unban.json
+1 -1
View File
@@ -140,7 +140,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Untimeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/uniquechat-off.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/uniquechat.json
+1 -1
View File
@@ -148,7 +148,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/unmod.json
+1 -1
View File
@@ -140,7 +140,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "uint128",
tests/snapshots/EventSub/channel-moderate/unraid.json
+1 -1
View File
@@ -143,7 +143,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub",
"id": "",
"localizedName": "",
"loginName": "pajlada",
tests/snapshots/EventSub/channel-moderate/untimeout.json
+1 -1
View File
@@ -140,7 +140,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|Untimeout|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "nerixyz",
tests/snapshots/EventSub/channel-moderate/warn-shared.json
+1 -1
View File
@@ -159,7 +159,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "quotrok",
tests/snapshots/EventSub/channel-moderate/warn.json
+1 -1
View File
@@ -159,7 +159,7 @@
]
}
],
"flags": "System|Timeout|EventSub",
"flags": "System|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "quotrok",
tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json
+1 -1
View File
@@ -119,7 +119,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "uint128",
tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json
+1 -1
View File
@@ -119,7 +119,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "uint128",
tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json
+1 -1
View File
@@ -119,7 +119,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification|EventSub",
"flags": "System|DoNotTriggerNotification|EventSub|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "uint128",
tests/snapshots/IrcMessageHandler/clearchat-stack-always.json
+1 -1
View File
@@ -61,7 +61,7 @@
]
}
],
"flags": "System|DoNotTriggerNotification|ClearChat",
"flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/clearchat-stack-never.json
+1 -1
View File
@@ -59,7 +59,7 @@
]
}
],
"flags": "System|DoNotTriggerNotification|ClearChat",
"flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json
+1 -1
View File
@@ -61,7 +61,7 @@
]
}
],
"flags": "System|DoNotTriggerNotification|ClearChat",
"flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/clearchat.json
+1 -1
View File
@@ -59,7 +59,7 @@
]
}
],
"flags": "System|DoNotTriggerNotification|ClearChat",
"flags": "System|DoNotTriggerNotification|ClearChat|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/timeout-stack-always.json
+1 -1
View File
@@ -75,7 +75,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification",
"flags": "System|Timeout|DoNotTriggerNotification|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/timeout-stack-never.json
+1 -1
View File
@@ -75,7 +75,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification",
"flags": "System|Timeout|DoNotTriggerNotification|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",
tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json
+2 -2
View File
@@ -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": "",
tests/snapshots/IrcMessageHandler/timeout.json
+1 -1
View File
@@ -73,7 +73,7 @@
]
}
],
"flags": "System|Timeout|DoNotTriggerNotification",
"flags": "System|Timeout|DoNotTriggerNotification|ModerationAction",
"id": "",
"localizedName": "",
"loginName": "",