From 18e3d7c72b7b4ed15e9fc3bff9c713e8503ff599 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 4 Jan 2026 12:52:02 +0100 Subject: [PATCH] refactor: rename Badge to TwitchBadge (#6706) this change is made to clarify that the previously-called Badge object is actually specialized for Twitch badges --- src/controllers/filters/lang/Filter.cpp | 8 ++-- src/controllers/highlights/HighlightBadge.cpp | 4 +- src/controllers/highlights/HighlightBadge.hpp | 6 +-- src/controllers/highlights/HighlightCheck.hpp | 9 ++-- .../highlights/HighlightController.cpp | 47 ++++++++++--------- .../highlights/HighlightController.hpp | 13 +++-- src/messages/Message.cpp | 16 +++---- src/messages/Message.hpp | 11 +++-- src/messages/MessageBuilder.cpp | 15 +++--- src/messages/search/BadgePredicate.cpp | 2 +- src/messages/search/SubtierPredicate.cpp | 2 +- src/providers/twitch/TwitchBadge.cpp | 4 +- src/providers/twitch/TwitchBadge.hpp | 6 +-- src/providers/twitch/TwitchIrc.cpp | 8 ++-- src/providers/twitch/TwitchIrc.hpp | 4 +- .../automod-category.json | 16 +++---- .../blocked-term-enclosed.json | 16 +++---- .../automod-message-hold/blocked-term.json | 16 +++---- .../automod-message-hold/blocked-terms-4.json | 16 +++---- .../automod-message-hold/localized-name.json | 16 +++---- .../automod-message-update/approved.json | 16 +++---- .../automod-message-update/denied.json | 16 +++---- .../automod-message-update/expired.json | 16 +++---- .../message-held.json | 8 ++-- .../message-approved.json | 8 ++-- .../message-denied.json | 8 ++-- .../add-blocked-term-three.json | 8 ++-- .../channel-moderate/add-blocked-term.json | 8 ++-- .../add-permitted-term-two.json | 8 ++-- .../channel-moderate/add-permitted-term.json | 8 ++-- .../EventSub/channel-moderate/ban-reason.json | 8 ++-- .../channel-moderate/ban-stacking-reason.json | 16 +++---- .../channel-moderate/ban-stacking.json | 16 +++---- .../EventSub/channel-moderate/ban.json | 8 ++-- .../EventSub/channel-moderate/clear.json | 8 ++-- .../channel-moderate/delete-long.json | 8 ++-- .../EventSub/channel-moderate/delete.json | 8 ++-- .../channel-moderate/emoteonly-off.json | 8 ++-- .../EventSub/channel-moderate/emoteonly.json | 8 ++-- .../channel-moderate/followers-0s.json | 8 ++-- .../channel-moderate/followers-off.json | 8 ++-- .../EventSub/channel-moderate/followers.json | 8 ++-- .../EventSub/channel-moderate/mod.json | 8 ++-- .../EventSub/channel-moderate/raid.json | 8 ++-- .../remove-blocked-term-four.json | 8 ++-- .../channel-moderate/remove-blocked-term.json | 8 ++-- .../remove-permitted-term-from-automod.json | 8 ++-- .../remove-permitted-term.json | 8 ++-- .../channel-moderate/shared-ban-reason.json | 8 ++-- .../shared-ban-stacking-diff-sources.json | 16 +++---- .../channel-moderate/shared-ban-stacking.json | 8 ++-- .../EventSub/channel-moderate/shared-ban.json | 8 ++-- .../channel-moderate/shared-delete-long.json | 8 ++-- .../channel-moderate/shared-delete.json | 8 ++-- .../shared-timeout-stacking-diff-sources.json | 24 +++++----- ...shared-timeout-stacking-diff-sources2.json | 16 +++---- .../shared-timeout-stacking.json | 16 +++---- .../channel-moderate/shared-timeout.json | 8 ++-- .../channel-moderate/shared-unban.json | 8 ++-- .../channel-moderate/shared-untimeout.json | 8 ++-- .../EventSub/channel-moderate/slow-off.json | 8 ++-- .../EventSub/channel-moderate/slow.json | 8 ++-- .../channel-moderate/subscribers-off.json | 8 ++-- .../channel-moderate/subscribers.json | 8 ++-- .../timeout-stacking-reason.json | 16 +++---- .../channel-moderate/timeout-stacking.json | 16 +++---- .../EventSub/channel-moderate/timeout.json | 8 ++-- .../unban-request-approve-message.json | 8 ++-- .../unban-request-approve.json | 8 ++-- .../unban-request-deny-message.json | 8 ++-- .../channel-moderate/unban-request-deny.json | 8 ++-- .../EventSub/channel-moderate/unban.json | 8 ++-- .../channel-moderate/uniquechat-off.json | 8 ++-- .../EventSub/channel-moderate/uniquechat.json | 8 ++-- .../EventSub/channel-moderate/unmod.json | 8 ++-- .../EventSub/channel-moderate/unraid.json | 8 ++-- .../EventSub/channel-moderate/untimeout.json | 8 ++-- .../channel-moderate/warn-shared.json | 8 ++-- .../EventSub/channel-moderate/warn.json | 8 ++-- .../restricted-bad-type.json | 16 +++---- .../restricted-ban-evader.json | 16 +++---- .../restricted-emote.json | 16 +++---- .../restricted.json | 16 +++---- .../monitored.json | 8 ++-- .../no-treatment.json | 8 ++-- .../restricted.json | 8 ++-- tests/snapshots/IrcMessageHandler/action.json | 16 +++---- .../IrcMessageHandler/all-usernames.json | 12 ++--- .../IrcMessageHandler/announcement.json | 24 +++++----- .../IrcMessageHandler/bad-emotes.json | 10 ++-- .../IrcMessageHandler/bad-emotes2.json | 10 ++-- .../IrcMessageHandler/bad-emotes3.json | 8 ++-- .../IrcMessageHandler/bad-emotes4.json | 8 ++-- .../IrcMessageHandler/badges-invalid.json | 10 ++-- tests/snapshots/IrcMessageHandler/badges.json | 12 ++--- .../IrcMessageHandler/bitsbadge.json | 8 ++-- tests/snapshots/IrcMessageHandler/cheer1.json | 10 ++-- tests/snapshots/IrcMessageHandler/cheer2.json | 10 ++-- tests/snapshots/IrcMessageHandler/cheer3.json | 10 ++-- tests/snapshots/IrcMessageHandler/cheer4.json | 10 ++-- .../clearchat-stack-always.json | 24 +++++----- .../clearchat-stack-never.json | 8 ++-- .../clearchat-stack-no-user.json | 8 ++-- .../IrcMessageHandler/clearchat.json | 8 ++-- .../clearmsg-non-truncated.json | 8 ++-- .../IrcMessageHandler/clearmsg-truncated.json | 8 ++-- .../IrcMessageHandler/custom-mod.json | 14 +++--- .../IrcMessageHandler/custom-vip.json | 14 +++--- .../IrcMessageHandler/emote-emoji.json | 16 +++---- tests/snapshots/IrcMessageHandler/emote.json | 10 ++-- .../IrcMessageHandler/emoteonly-on.json | 8 ++-- tests/snapshots/IrcMessageHandler/emotes.json | 10 ++-- .../snapshots/IrcMessageHandler/emotes2.json | 12 ++--- .../snapshots/IrcMessageHandler/emotes3.json | 12 ++--- .../snapshots/IrcMessageHandler/emotes4.json | 8 ++-- .../snapshots/IrcMessageHandler/emotes5.json | 8 ++-- .../IrcMessageHandler/first-msg.json | 14 +++--- .../IrcMessageHandler/highlight1.json | 8 ++-- .../IrcMessageHandler/highlight2.json | 12 ++--- .../IrcMessageHandler/highlight3.json | 12 ++--- .../IrcMessageHandler/hype-chat-invalid.json | 14 +++--- .../IrcMessageHandler/hype-chat0.json | 22 ++++----- .../IrcMessageHandler/hype-chat1.json | 26 +++++----- .../IrcMessageHandler/hype-chat2.json | 22 ++++----- .../IrcMessageHandler/ignore-block1.json | 12 ++--- .../IrcMessageHandler/ignore-infinite.json | 12 ++--- .../IrcMessageHandler/ignore-replace.json | 12 ++--- .../IrcMessageHandler/justinfan.json | 12 ++--- tests/snapshots/IrcMessageHandler/links.json | 12 ++--- .../snapshots/IrcMessageHandler/mentions.json | 12 ++--- tests/snapshots/IrcMessageHandler/mod.json | 14 +++--- .../snapshots/IrcMessageHandler/nickname.json | 12 ++--- .../snapshots/IrcMessageHandler/no-nick.json | 12 ++--- .../snapshots/IrcMessageHandler/no-tags.json | 8 ++-- tests/snapshots/IrcMessageHandler/raid.json | 8 ++-- .../IrcMessageHandler/redeemed-highlight.json | 12 ++--- .../IrcMessageHandler/reply-action.json | 12 ++--- .../IrcMessageHandler/reply-block.json | 12 ++--- .../IrcMessageHandler/reply-blocked-user.json | 12 ++--- .../IrcMessageHandler/reply-child.json | 12 ++--- .../IrcMessageHandler/reply-ignore.json | 12 ++--- .../IrcMessageHandler/reply-no-prev.json | 12 ++--- .../IrcMessageHandler/reply-root.json | 12 ++--- .../IrcMessageHandler/reply-single.json | 12 ++--- .../IrcMessageHandler/reward-bits.json | 12 ++--- .../IrcMessageHandler/reward-empty.json | 12 ++--- .../IrcMessageHandler/reward-known.json | 12 ++--- .../IrcMessageHandler/reward-unknown.json | 12 ++--- .../IrcMessageHandler/rm-deleted.json | 12 ++--- .../shared-chat-announcement.json | 20 ++++---- .../IrcMessageHandler/shared-chat-emotes.json | 12 ++--- .../IrcMessageHandler/shared-chat-known.json | 12 ++--- .../shared-chat-moderator-both-channels.json | 10 ++-- ...hared-chat-moderator-external-channel.json | 10 ++-- .../shared-chat-same-channel.json | 12 ++--- .../shared-chat-unknown.json | 12 ++--- .../shared-chat-vip-both-channels.json | 10 ++-- .../shared-chat-vip-external-channel.json | 10 ++-- tests/snapshots/IrcMessageHandler/simple.json | 14 +++--- .../IrcMessageHandler/sub-first-gift.json | 8 ++-- .../IrcMessageHandler/sub-first-time.json | 8 ++-- .../IrcMessageHandler/sub-gift-02.json | 8 ++-- .../snapshots/IrcMessageHandler/sub-gift.json | 8 ++-- .../sub-message-user-color-override.json | 22 ++++----- .../IrcMessageHandler/sub-message.json | 22 ++++----- .../sub-multi-month-anon-gift.json | 8 ++-- .../sub-multi-month-gift-count.json | 8 ++-- .../sub-multi-month-gift.json | 8 ++-- .../sub-multi-month-resub.json | 8 ++-- .../IrcMessageHandler/sub-multi-month.json | 8 ++-- .../IrcMessageHandler/sub-no-message.json | 8 ++-- .../timeout-stack-always.json | 16 +++---- .../timeout-stack-never.json | 16 +++---- .../timeout-stack-no-user.json | 24 +++++----- .../snapshots/IrcMessageHandler/timeout.json | 8 ++-- .../IrcMessageHandler/username-localized.json | 12 ++--- .../username-localized2.json | 12 ++--- .../snapshots/IrcMessageHandler/username.json | 12 ++--- tests/snapshots/IrcMessageHandler/vip.json | 14 +++--- tests/snapshots/PluginMessageCtor/empty.json | 8 ++-- .../PluginMessageCtor/linebreak-element.json | 8 ++-- .../PluginMessageCtor/mention-element.json | 8 ++-- .../PluginMessageCtor/properties.json | 8 ++-- .../reply-curve-element.json | 8 ++-- .../single-line-text-element.json | 8 ++-- .../PluginMessageCtor/text-element.json | 8 ++-- .../PluginMessageCtor/timestamp-element.json | 8 ++-- .../PluginMessageCtor/twitch-moderation.json | 8 ++-- tests/src/HighlightController.cpp | 2 +- tests/src/TwitchIrc.cpp | 24 +++++----- 190 files changed, 1058 insertions(+), 1049 deletions(-) diff --git a/src/controllers/filters/lang/Filter.cpp b/src/controllers/filters/lang/Filter.cpp index 24704031..42de6fd1 100644 --- a/src/controllers/filters/lang/Filter.cpp +++ b/src/controllers/filters/lang/Filter.cpp @@ -95,8 +95,8 @@ ContextMap buildContextMap(const MessagePtr &m, chatterino::Channel *channel) using MessageFlag = chatterino::MessageFlag; QStringList badges; - badges.reserve(m->badges.size()); - for (const auto &e : m->badges) + badges.reserve(m->twitchBadges.size()); + for (const auto &e : m->twitchBadges) { badges << e.key_; } @@ -114,9 +114,9 @@ ContextMap buildContextMap(const MessagePtr &m, chatterino::Channel *channel) continue; } subscribed = true; - if (m->badgeInfos.find(subBadge) != m->badgeInfos.end()) + if (m->twitchBadgeInfos.find(subBadge) != m->twitchBadgeInfos.end()) { - subLength = m->badgeInfos.at(subBadge).toInt(); + subLength = m->twitchBadgeInfos.at(subBadge).toInt(); } } ContextMap vars = { diff --git a/src/controllers/highlights/HighlightBadge.cpp b/src/controllers/highlights/HighlightBadge.cpp index 4fe7f44d..47f543cb 100644 --- a/src/controllers/highlights/HighlightBadge.cpp +++ b/src/controllers/highlights/HighlightBadge.cpp @@ -73,7 +73,7 @@ bool HighlightBadge::hasSound() const return this->hasSound_; } -bool HighlightBadge::isMatch(const Badge &badge) const +bool HighlightBadge::isMatch(const TwitchBadge &badge) const { if (this->isMulti_) { @@ -92,7 +92,7 @@ bool HighlightBadge::isMatch(const Badge &badge) const } } -bool HighlightBadge::compare(const QString &id, const Badge &badge) const +bool HighlightBadge::compare(const QString &id, const TwitchBadge &badge) const { if (this->hasVersions_) { diff --git a/src/controllers/highlights/HighlightBadge.hpp b/src/controllers/highlights/HighlightBadge.hpp index 0be6895d..a6e9c2cd 100644 --- a/src/controllers/highlights/HighlightBadge.hpp +++ b/src/controllers/highlights/HighlightBadge.hpp @@ -12,7 +12,7 @@ namespace chatterino { -class Badge; +class TwitchBadge; class HighlightBadge { @@ -32,7 +32,7 @@ public: bool showInMentions() const; bool hasAlert() const; bool hasSound() const; - bool isMatch(const Badge &badge) const; + bool isMatch(const TwitchBadge &badge) const; /** * @brief Check if this highlight phrase has a custom sound set. @@ -55,7 +55,7 @@ public: static QColor FALLBACK_HIGHLIGHT_COLOR; private: - bool compare(const QString &id, const Badge &badge) const; + bool compare(const QString &id, const TwitchBadge &badge) const; QString badgeName_; QString displayName_; diff --git a/src/controllers/highlights/HighlightCheck.hpp b/src/controllers/highlights/HighlightCheck.hpp index 84997376..12f04463 100644 --- a/src/controllers/highlights/HighlightCheck.hpp +++ b/src/controllers/highlights/HighlightCheck.hpp @@ -13,16 +13,17 @@ namespace chatterino { struct HighlightResult; struct MessageParseArgs; -class Badge; +class TwitchBadge; enum class MessageFlag : std::int64_t; using MessageFlags = FlagsEnum; struct HighlightCheck { using Checker = std::function( - const MessageParseArgs &args, const std::vector &badges, - const QString &senderName, const QString &originalMessage, - const MessageFlags &messageFlags, bool self)>; + const MessageParseArgs &args, + const std::vector &twitchBadges, const QString &senderName, + const QString &originalMessage, const MessageFlags &messageFlags, + bool self)>; Checker cb; }; diff --git a/src/controllers/highlights/HighlightController.cpp b/src/controllers/highlights/HighlightController.cpp index 7275559b..8ec00025 100644 --- a/src/controllers/highlights/HighlightController.cpp +++ b/src/controllers/highlights/HighlightController.cpp @@ -21,14 +21,14 @@ using namespace chatterino; auto highlightPhraseCheck(const HighlightPhrase &highlight) -> HighlightCheck { return HighlightCheck{ - [highlight](const auto &args, const auto &badges, + [highlight](const auto &args, const auto &twitchBadges, const auto &senderName, const auto &originalMessage, const auto &flags, const auto self) -> std::optional { - (void)args; // unused - (void)badges; // unused - (void)senderName; // unused - (void)flags; // unused + (void)args; // unused + (void)twitchBadges; // unused + (void)senderName; // unused + (void)flags; // unused if (self) { @@ -72,10 +72,11 @@ void rebuildSubscriptionHighlights(Settings &settings, // The custom sub highlight color is handled in ColorProvider checks.emplace_back(HighlightCheck{ - [=](const auto &args, const auto &badges, const auto &senderName, - const auto &originalMessage, const auto &flags, + [=](const auto &args, const auto &twitchBadges, + const auto &senderName, const auto &originalMessage, + const auto &flags, const auto self) -> std::optional { - (void)badges; // unused + (void)twitchBadges; // unused (void)senderName; // unused (void)originalMessage; // unused (void)flags; // unused @@ -118,10 +119,11 @@ void rebuildWhisperHighlights(Settings &settings, // The custom whisper highlight color is handled in ColorProvider checks.emplace_back(HighlightCheck{ - [=](const auto &args, const auto &badges, const auto &senderName, - const auto &originalMessage, const auto &flags, + [=](const auto &args, const auto &twitchBadges, + const auto &senderName, const auto &originalMessage, + const auto &flags, const auto self) -> std::optional { - (void)badges; // unused + (void)twitchBadges; // unused (void)senderName; // unused (void)originalMessage; // unused (void)flags; // unused @@ -160,7 +162,7 @@ void rebuildReplyThreadHighlight(Settings &settings, auto highlightInMentions = settings.showThreadHighlightInMentions.getValue(); checks.emplace_back(HighlightCheck{ - [=](const auto & /*args*/, const auto & /*badges*/, + [=](const auto & /*args*/, const auto & /*twitchBadges*/, const auto & /*senderName*/, const auto & /*originalMessage*/, const auto &flags, const auto self) -> std::optional { @@ -218,7 +220,7 @@ void rebuildMessageHighlights(Settings &settings, ColorProvider::instance().color(ColorType::AutomodHighlight); checks.emplace_back(HighlightCheck{ - [=](const auto & /*args*/, const auto & /*badges*/, + [=](const auto & /*args*/, const auto & /*twitchBadges*/, const auto & /*senderName*/, const auto & /*originalMessage*/, const auto &flags, const auto /*self*/) -> std::optional { @@ -255,11 +257,12 @@ void rebuildUserHighlights(Settings &settings, checks.emplace_back(HighlightCheck{ [showInMentions]( - const auto &args, const auto &badges, const auto &senderName, - const auto &originalMessage, const auto &flags, + const auto &args, const auto &twitchBadges, + const auto &senderName, const auto &originalMessage, + const auto &flags, const auto self) -> std::optional { (void)args; //unused - (void)badges; //unused + (void)twitchBadges; //unused (void)senderName; //unused (void)flags; //unused (void)originalMessage; //unused @@ -281,12 +284,12 @@ void rebuildUserHighlights(Settings &settings, for (const auto &highlight : *userHighlights) { checks.emplace_back(HighlightCheck{ - [highlight](const auto &args, const auto &badges, + [highlight](const auto &args, const auto &twitchBadges, const auto &senderName, const auto &originalMessage, const auto &flags, const auto self) -> std::optional { (void)args; // unused - (void)badges; // unused + (void)twitchBadges; // unused (void)originalMessage; // unused (void)flags; // unused (void)self; // unused @@ -321,7 +324,7 @@ void rebuildBadgeHighlights(Settings &settings, for (const auto &highlight : *badgeHighlights) { checks.emplace_back(HighlightCheck{ - [highlight](const auto &args, const auto &badges, + [highlight](const auto &args, const auto &twitchBadges, const auto &senderName, const auto &originalMessage, const auto &flags, const auto self) -> std::optional { @@ -331,7 +334,7 @@ void rebuildBadgeHighlights(Settings &settings, (void)flags; // unused (void)self; // unused - for (const Badge &badge : badges) + for (const TwitchBadge &badge : twitchBadges) { if (highlight.isMatch(badge)) { @@ -460,7 +463,7 @@ void HighlightController::rebuildChecks(Settings &settings) } std::pair HighlightController::check( - const MessageParseArgs &args, const std::vector &badges, + const MessageParseArgs &args, const std::vector &twitchBadges, const QString &senderName, const QString &originalMessage, const MessageFlags &messageFlags) const { @@ -475,7 +478,7 @@ std::pair HighlightController::check( for (const auto &check : *checks) { - if (auto checkResult = check.cb(args, badges, senderName, + if (auto checkResult = check.cb(args, twitchBadges, senderName, originalMessage, messageFlags, self); checkResult) { diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp index 23536cef..56baf4b6 100644 --- a/src/controllers/highlights/HighlightController.hpp +++ b/src/controllers/highlights/HighlightController.hpp @@ -8,18 +8,17 @@ #include #include #include +#include #include #include #include -#include -#include -#include #include +#include namespace chatterino { -class Badge; +class TwitchBadge; struct MessageParseArgs; class AccountController; enum class MessageFlag : std::int64_t; @@ -34,9 +33,9 @@ public: * @brief Checks the given message parameters if it matches our internal checks, and returns a result **/ [[nodiscard]] std::pair check( - const MessageParseArgs &args, const std::vector &badges, - const QString &senderName, const QString &originalMessage, - const MessageFlags &messageFlags) const; + const MessageParseArgs &args, + const std::vector &twitchBadges, const QString &senderName, + const QString &originalMessage, const MessageFlags &messageFlags) const; private: /** diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp index 3cc81889..270ce1a0 100644 --- a/src/messages/Message.cpp +++ b/src/messages/Message.cpp @@ -118,19 +118,19 @@ QJsonObject Message::toJson() const {"frozen"_L1, this->frozen}, }; - QJsonArray badges; - for (const auto &badge : this->badges) + QJsonArray twitchBadges; + for (const auto &badge : this->twitchBadges) { - badges.append(badge.key_); + twitchBadges.append(badge.key_); } - msg["badges"_L1] = badges; + msg["twitchBadges"_L1] = twitchBadges; - QJsonObject badgeInfos; - for (const auto &[key, value] : this->badgeInfos) + QJsonObject twitchBadgeInfos; + for (const auto &[key, value] : this->twitchBadgeInfos) { - badgeInfos.insert(key, value); + twitchBadgeInfos.insert(key, value); } - msg["badgeInfos"_L1] = badgeInfos; + msg["twitchBadgeInfos"_L1] = twitchBadgeInfos; if (this->highlightColor) { diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp index 408caeb7..b98cbafa 100644 --- a/src/messages/Message.hpp +++ b/src/messages/Message.hpp @@ -17,7 +17,7 @@ class QJsonObject; namespace chatterino { class MessageElement; class MessageThread; -class Badge; +class TwitchBadge; class ScrollbarHighlight; struct Message; @@ -54,8 +54,13 @@ struct Message { QString channelName; QColor usernameColor; QDateTime serverReceivedTime; - std::vector badges; - std::unordered_map badgeInfos; + + /// List of Twitch badges associated with this message + std::vector twitchBadges; + + /// Map of extra data associated with each Twitch badge + std::unordered_map twitchBadgeInfos; + std::shared_ptr highlightColor; // Each reply holds a reference to the thread. When every reply is dropped, // the reply thread will be cleaned up by the TwitchChannel. diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp index 7c1233e9..115c2bf2 100644 --- a/src/messages/MessageBuilder.cpp +++ b/src/messages/MessageBuilder.cpp @@ -236,7 +236,7 @@ QString stylizeUsername(const QString &username, const Message &message) return usernameText; } -std::optional getTwitchBadge(const Badge &badge, +std::optional getTwitchBadge(const TwitchBadge &badge, const TwitchChannel *twitchChannel) { if (auto channelBadge = @@ -254,7 +254,8 @@ std::optional getTwitchBadge(const Badge &badge, return std::nullopt; } -void appendBadges(MessageBuilder *builder, const std::vector &badges, +void appendBadges(MessageBuilder *builder, + const std::vector &badges, const std::unordered_map &badgeInfos, const TwitchChannel *twitchChannel) { @@ -344,15 +345,15 @@ void appendBadges(MessageBuilder *builder, const std::vector &badges, ->setTooltip(tooltip); } - builder->message().badges = badges; - builder->message().badgeInfos = badgeInfos; + builder->message().twitchBadges = badges; + builder->message().twitchBadgeInfos = badgeInfos; } -std::vector appendSharedChatBadges( - MessageBuilder *builder, const std::vector &sharedBadges, +std::vector appendSharedChatBadges( + MessageBuilder *builder, const std::vector &sharedBadges, const QString &sharedChannelName, const TwitchChannel *twitchChannel) { - auto appendedBadges = std::vector{}; + auto appendedBadges = std::vector{}; for (const auto &badge : sharedBadges) { if (badge.key_ != "moderator" && badge.key_ != "vip") diff --git a/src/messages/search/BadgePredicate.cpp b/src/messages/search/BadgePredicate.cpp index fb5705fb..c61aafea 100644 --- a/src/messages/search/BadgePredicate.cpp +++ b/src/messages/search/BadgePredicate.cpp @@ -33,7 +33,7 @@ BadgePredicate::BadgePredicate(const QString &badges, bool negate) bool BadgePredicate::appliesToImpl(const Message &message) { - for (const Badge &badge : message.badges) + for (const TwitchBadge &badge : message.twitchBadges) { if (this->badges_.contains(badge.key_, Qt::CaseInsensitive)) { diff --git a/src/messages/search/SubtierPredicate.cpp b/src/messages/search/SubtierPredicate.cpp index b6306e86..53d704a9 100644 --- a/src/messages/search/SubtierPredicate.cpp +++ b/src/messages/search/SubtierPredicate.cpp @@ -17,7 +17,7 @@ SubtierPredicate::SubtierPredicate(const QString &subtiers, bool negate) bool SubtierPredicate::appliesToImpl(const Message &message) { - for (const Badge &badge : message.badges) + for (const TwitchBadge &badge : message.twitchBadges) { if (badge.key_ == "subscriber") { diff --git a/src/providers/twitch/TwitchBadge.cpp b/src/providers/twitch/TwitchBadge.cpp index 1e2302e5..bfb81d9e 100644 --- a/src/providers/twitch/TwitchBadge.cpp +++ b/src/providers/twitch/TwitchBadge.cpp @@ -12,7 +12,7 @@ const QSet channelAuthority{"lead_moderator", "moderator", "vip", "broadcaster"}; const QSet subBadges{"subscriber", "founder"}; -Badge::Badge(QString key, QString value) +TwitchBadge::TwitchBadge(QString key, QString value) : key_(std::move(key)) , value_(std::move(value)) { @@ -34,7 +34,7 @@ Badge::Badge(QString key, QString value) } } -bool Badge::operator==(const Badge &other) const +bool TwitchBadge::operator==(const TwitchBadge &other) const { return this->key_ == other.key_ && this->value_ == other.value_; } diff --git a/src/providers/twitch/TwitchBadge.hpp b/src/providers/twitch/TwitchBadge.hpp index f3267687..25c37b01 100644 --- a/src/providers/twitch/TwitchBadge.hpp +++ b/src/providers/twitch/TwitchBadge.hpp @@ -6,12 +6,12 @@ namespace chatterino { -class Badge +class TwitchBadge { public: - Badge(QString key, QString value); + TwitchBadge(QString key, QString value); - bool operator==(const Badge &other) const; + bool operator==(const TwitchBadge &other) const; // Class members are fetched from both "badges" and "badge-info" tags // E.g.: "badges": "subscriber/18", "badge-info": "subscriber/22" diff --git a/src/providers/twitch/TwitchIrc.cpp b/src/providers/twitch/TwitchIrc.cpp index c5ae7f9a..53fd01f6 100644 --- a/src/providers/twitch/TwitchIrc.cpp +++ b/src/providers/twitch/TwitchIrc.cpp @@ -106,10 +106,10 @@ std::unordered_map parseBadgeInfoTag(const QVariantMap &tags) return infoMap; } -std::vector parseBadgeTag(const QVariantMap &tags, - const QString &tagName) +std::vector parseBadgeTag(const QVariantMap &tags, + const QString &tagName) { - std::vector b; + std::vector b; auto badgesIt = tags.constFind(tagName); if (badgesIt == tags.end()) @@ -127,7 +127,7 @@ std::vector parseBadgeTag(const QVariantMap &tags, } auto pair = slashKeyValue(badge); - b.emplace_back(Badge{pair.first, pair.second}); + b.emplace_back(TwitchBadge{pair.first, pair.second}); } return b; diff --git a/src/providers/twitch/TwitchIrc.hpp b/src/providers/twitch/TwitchIrc.hpp index 049680d2..300558fe 100644 --- a/src/providers/twitch/TwitchIrc.hpp +++ b/src/providers/twitch/TwitchIrc.hpp @@ -47,8 +47,8 @@ std::unordered_map parseBadgeInfoTag(const QVariantMap &tags); /// @param tags The tags of the IRC message /// @param tagName The name of the tag to read badges from /// @returns A list of badges (name and version) -std::vector parseBadgeTag(const QVariantMap &tags, - const QString &tagName = "badges"); +std::vector parseBadgeTag(const QVariantMap &tags, + const QString &tagName = "badges"); /// @brief Parses Twitch emotes in an IRC message /// diff --git a/tests/snapshots/EventSub/automod-message-hold/automod-category.json b/tests/snapshots/EventSub/automod-message-hold/automod-category.json index 144fe3e5..099acdf5 100644 --- a/tests/snapshots/EventSub/automod-message-hold/automod-category.json +++ b/tests/snapshots/EventSub/automod-message-hold/automod-category.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -145,14 +141,14 @@ "searchText": "AutoMod: Held a message for reason: swearing level 4. Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -252,6 +248,10 @@ "searchText": "nerixyz: ass", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 ff74401b..2f3ef5e0 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-term-enclosed.json @@ -44,10 +44,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -157,14 +153,14 @@ "searchText": "AutoMod: Held a message for reason: matches 1 blocked term \"🍋‍🟩blockedterm😂\". Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -266,6 +262,10 @@ "searchText": "nerixyz: 😂 😂 🍋‍🟩blockedterm😂", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/automod-message-hold/blocked-term.json b/tests/snapshots/EventSub/automod-message-hold/blocked-term.json index 2b9f73f1..9d8626ff 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-term.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-term.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -151,14 +147,14 @@ "searchText": "AutoMod: Held a message for reason: matches 1 blocked term \"blockedterm\". Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -258,6 +254,10 @@ "searchText": "nerixyz: blockedterm", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 c72d7afa..c8648d09 100644 --- a/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json +++ b/tests/snapshots/EventSub/automod-message-hold/blocked-terms-4.json @@ -88,10 +88,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -203,14 +199,14 @@ "searchText": "AutoMod: Held a message for reason: matches 3 blocked terms \"🍋‍🟩\", \"blockedterm\", \"🍩\". Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -316,6 +312,10 @@ "searchText": "nerixyz: 😂 😂 🍋‍🟩 blockedterm 😂 🍩", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/automod-message-hold/localized-name.json b/tests/snapshots/EventSub/automod-message-hold/localized-name.json index b8225948..329e847a 100644 --- a/tests/snapshots/EventSub/automod-message-hold/localized-name.json +++ b/tests/snapshots/EventSub/automod-message-hold/localized-name.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -145,14 +141,14 @@ "searchText": "AutoMod: Held a message for reason: swearing level 4. Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -252,6 +248,10 @@ "searchText": "testaccount_420(테스트계정420): ass", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/automod-message-update/approved.json b/tests/snapshots/EventSub/automod-message-update/approved.json index 1edecd8f..8569ee18 100644 --- a/tests/snapshots/EventSub/automod-message-update/approved.json +++ b/tests/snapshots/EventSub/automod-message-update/approved.json @@ -74,10 +74,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -185,14 +181,14 @@ "searchText": "AutoMod: Held a message for reason: swearing level 4. Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -292,6 +288,10 @@ "searchText": "nerixyz: ass", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/automod-message-update/denied.json b/tests/snapshots/EventSub/automod-message-update/denied.json index 5097fa4d..22d37f5b 100644 --- a/tests/snapshots/EventSub/automod-message-update/denied.json +++ b/tests/snapshots/EventSub/automod-message-update/denied.json @@ -74,10 +74,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -185,14 +181,14 @@ "searchText": "AutoMod: Held a message for reason: swearing level 4. Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -292,6 +288,10 @@ "searchText": "nerixyz: ass", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/automod-message-update/expired.json b/tests/snapshots/EventSub/automod-message-update/expired.json index b0f8718a..8683164a 100644 --- a/tests/snapshots/EventSub/automod-message-update/expired.json +++ b/tests/snapshots/EventSub/automod-message-update/expired.json @@ -74,10 +74,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -185,14 +181,14 @@ "searchText": "AutoMod: Held a message for reason: swearing level 4. Allow will post it in chat. Allow Deny", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -292,6 +288,10 @@ "searchText": "nerixyz: ass", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 2aa247b8..2de8662a 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 @@ -21,10 +21,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -99,6 +95,10 @@ "searchText": "AutoMod: Hey! Your message is being checked by mods and has not been sent.", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 4d570bd5..a8c3e42a 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 @@ -22,10 +22,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -92,6 +88,10 @@ "searchText": "AutoMod: Mods have accepted your message.", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 488eb592..806e6941 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 @@ -28,10 +28,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -98,6 +94,10 @@ "searchText": "AutoMod: Mods have denied your message.", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 5a81711a..755bf681 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json +++ b/tests/snapshots/EventSub/channel-moderate/add-blocked-term-three.json @@ -43,10 +43,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -201,6 +197,10 @@ "searchText": "nerixyz added \"my phrase\", \"two\", and \"three\" as blocked terms on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json b/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json index 5bbb37c2..9f24257e 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json +++ b/tests/snapshots/EventSub/channel-moderate/add-blocked-term.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -211,6 +207,10 @@ "searchText": "nerixyz added \"my phrase\" as a blocked term on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 f6d25006..3b0253d3 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json +++ b/tests/snapshots/EventSub/channel-moderate/add-permitted-term-two.json @@ -42,10 +42,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -199,6 +195,10 @@ "searchText": "nerixyz added \"my phrase\" and \"two\" as permitted terms on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json b/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json index 64908baf..4154f545 100644 --- a/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json +++ b/tests/snapshots/EventSub/channel-moderate/add-permitted-term.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -211,6 +207,10 @@ "searchText": "nerixyz added \"my phrase\" as a permitted term on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/ban-reason.json b/tests/snapshots/EventSub/channel-moderate/ban-reason.json index a5b4464d..a23ab756 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/ban-reason.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -166,6 +162,10 @@ "searchText": "nerixyz banned uint128: my reason ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/ban-stacking-reason.json b/tests/snapshots/EventSub/channel-moderate/ban-stacking-reason.json index 1c44b4c9..3145fdf9 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban-stacking-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/ban-stacking-reason.json @@ -120,10 +120,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -229,14 +225,14 @@ "searchText": "nerixyz banned uint128: my reason (2 times) ", "serverReceivedTime": "2025-02-22T17:53:50Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -360,6 +356,10 @@ "searchText": "nerixyz banned uint128: my reason ", "serverReceivedTime": "2025-02-22T17:54:50Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/ban-stacking.json b/tests/snapshots/EventSub/channel-moderate/ban-stacking.json index db39c329..f6b669b4 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/ban-stacking.json @@ -120,10 +120,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -227,14 +223,14 @@ "searchText": "nerixyz banned uint128. (2 times) ", "serverReceivedTime": "2025-02-22T17:53:50Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -342,6 +338,10 @@ "searchText": "nerixyz banned uint128. ", "serverReceivedTime": "2025-02-22T17:54:50Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/ban.json b/tests/snapshots/EventSub/channel-moderate/ban.json index bc7555af..e940324e 100644 --- a/tests/snapshots/EventSub/channel-moderate/ban.json +++ b/tests/snapshots/EventSub/channel-moderate/ban.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -150,6 +146,10 @@ "searchText": "nerixyz banned uint128. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/clear.json b/tests/snapshots/EventSub/channel-moderate/clear.json index 28dc5935..3ccd8950 100644 --- a/tests/snapshots/EventSub/channel-moderate/clear.json +++ b/tests/snapshots/EventSub/channel-moderate/clear.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -114,6 +110,10 @@ "searchText": "nerixyz cleared the chat. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "nerixyz", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/delete-long.json b/tests/snapshots/EventSub/channel-moderate/delete-long.json index fa2acd9a..54bfbf40 100644 --- a/tests/snapshots/EventSub/channel-moderate/delete-long.json +++ b/tests/snapshots/EventSub/channel-moderate/delete-long.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -168,6 +164,10 @@ "searchText": "testaccount_420 deleted message from testaccount_420 saying: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa…", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "testaccount_420", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/delete.json b/tests/snapshots/EventSub/channel-moderate/delete.json index 07334c77..f2cf3f4e 100644 --- a/tests/snapshots/EventSub/channel-moderate/delete.json +++ b/tests/snapshots/EventSub/channel-moderate/delete.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -168,6 +164,10 @@ "searchText": "testaccount_420 deleted message from testaccount_420 saying: asd", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "testaccount_420", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json b/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json index 041dcec1..aeaa4230 100644 --- a/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json +++ b/tests/snapshots/EventSub/channel-moderate/emoteonly-off.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned off emote-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/emoteonly.json b/tests/snapshots/EventSub/channel-moderate/emoteonly.json index 9bffaacb..894f9404 100644 --- a/tests/snapshots/EventSub/channel-moderate/emoteonly.json +++ b/tests/snapshots/EventSub/channel-moderate/emoteonly.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned on emote-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/followers-0s.json b/tests/snapshots/EventSub/channel-moderate/followers-0s.json index ed715328..9cf0f223 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers-0s.json +++ b/tests/snapshots/EventSub/channel-moderate/followers-0s.json @@ -36,10 +36,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -159,6 +155,10 @@ "searchText": "nerixyz turned on followers-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/followers-off.json b/tests/snapshots/EventSub/channel-moderate/followers-off.json index 9f0a5143..fbda6ef5 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers-off.json +++ b/tests/snapshots/EventSub/channel-moderate/followers-off.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned off followers-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/followers.json b/tests/snapshots/EventSub/channel-moderate/followers.json index c68aca9b..048770ae 100644 --- a/tests/snapshots/EventSub/channel-moderate/followers.json +++ b/tests/snapshots/EventSub/channel-moderate/followers.json @@ -36,10 +36,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -175,6 +171,10 @@ "searchText": "nerixyz turned on followers-only mode. (15 minutes) ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/mod.json b/tests/snapshots/EventSub/channel-moderate/mod.json index 098e3b69..591ff383 100644 --- a/tests/snapshots/EventSub/channel-moderate/mod.json +++ b/tests/snapshots/EventSub/channel-moderate/mod.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -149,6 +145,10 @@ "searchText": "uint128 modded forsen. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/raid.json b/tests/snapshots/EventSub/channel-moderate/raid.json index 2f5327f6..fe3b6064 100644 --- a/tests/snapshots/EventSub/channel-moderate/raid.json +++ b/tests/snapshots/EventSub/channel-moderate/raid.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -153,6 +149,10 @@ "searchText": "pajlada initiated a raid to bajlada. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 6cbf641b..eac48ba6 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term-four.json @@ -44,10 +44,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -203,6 +199,10 @@ "searchText": "nerixyz removed \"my phrase\", \"term\", \"wow\", and \"🥲\" as blocked terms on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json index 77522e3f..9dad6ad9 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-blocked-term.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -211,6 +207,10 @@ "searchText": "nerixyz removed \"my phrase\" as a blocked term on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 e5e295ff..155c1e3b 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 @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -211,6 +207,10 @@ "searchText": "nerixyz removed \"my phrase\" as a permitted term on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json index c9e301f5..f4480d7e 100644 --- a/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json +++ b/tests/snapshots/EventSub/channel-moderate/remove-permitted-term.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -211,6 +207,10 @@ "searchText": "nerixyz removed \"my phrase\" as a permitted term on AutoMod. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json b/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json index 24197f54..b8d83f9d 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban-reason.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 1, "displayName": "", @@ -200,6 +196,10 @@ "searchText": "nerixyz banned twitchdev in testaccount_420: a reason 😂 ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking-diff-sources.json b/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking-diff-sources.json index a16c5cca..1ebcb85b 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking-diff-sources.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking-diff-sources.json @@ -120,10 +120,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 2, "displayName": "", @@ -257,14 +253,14 @@ "searchText": "nerixyz banned twitchdev in testaccount_420. (2 times) ", "serverReceivedTime": "2025-02-22T17:54:05Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "forsen", "count": 1, "displayName": "", @@ -405,6 +401,10 @@ "searchText": "nerixyz banned twitchdev in forsen. ", "serverReceivedTime": "2025-02-22T17:54:06Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking.json b/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking.json index 9ba1d05d..2ea33b41 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban-stacking.json @@ -120,10 +120,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 3, "displayName": "", @@ -257,6 +253,10 @@ "searchText": "nerixyz banned twitchdev in testaccount_420. (3 times) ", "serverReceivedTime": "2025-02-22T17:54:06Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-ban.json b/tests/snapshots/EventSub/channel-moderate/shared-ban.json index 71bdfc1a..46f3c8d2 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-ban.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-ban.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 1, "displayName": "", @@ -183,6 +179,10 @@ "searchText": "nerixyz banned twitchdev in testaccount_420. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json b/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json index fab5ebc7..43d61c8c 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-delete-long.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -201,6 +197,10 @@ "searchText": "testaccount_420 deleted message from testaccount_420 in bajlada saying: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa…", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "testaccount_420", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-delete.json b/tests/snapshots/EventSub/channel-moderate/shared-delete.json index 046f3997..0242a289 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-delete.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-delete.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -201,6 +197,10 @@ "searchText": "testaccount_420 deleted message from testaccount_420 in bajlada saying: dfg", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "testaccount_420", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 d103bf20..d4f6dd2b 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 @@ -163,10 +163,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 2, "displayName": "", @@ -303,14 +299,14 @@ "searchText": "nerixyz timed out twitchdev for 10m in testaccount_420. (2 times) ", "serverReceivedTime": "2025-02-22T17:54:05Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -443,14 +439,14 @@ "searchText": "nerixyz timed out twitchdev for 10m. ", "serverReceivedTime": "2025-02-22T17:54:06Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "forsen", "count": 1, "displayName": "", @@ -613,6 +609,10 @@ "searchText": "nerixyz timed out twitchdev for 10m in forsen. ", "serverReceivedTime": "2025-02-22T17:54:07Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 ee36fbc0..be6cb729 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 @@ -123,10 +123,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 2, "displayName": "", @@ -263,14 +259,14 @@ "searchText": "nerixyz timed out twitchdev for 10m in testaccount_420. (2 times) ", "serverReceivedTime": "2025-02-22T17:54:05Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "forsen", "count": 1, "displayName": "", @@ -433,6 +429,10 @@ "searchText": "nerixyz timed out twitchdev for 10m in forsen. ", "serverReceivedTime": "2025-02-22T17:54:06Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json index 8b9c799b..156f304c 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout-stacking.json @@ -123,10 +123,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 2, "displayName": "", @@ -263,14 +259,14 @@ "searchText": "nerixyz timed out twitchdev for 10m in testaccount_420. (2 times) ", "serverReceivedTime": "2025-02-22T17:54:05Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -403,6 +399,10 @@ "searchText": "nerixyz timed out twitchdev for 10m. ", "serverReceivedTime": "2025-02-22T17:54:06Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-timeout.json b/tests/snapshots/EventSub/channel-moderate/shared-timeout.json index cd5aba87..01804b3a 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-timeout.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-timeout.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "testaccount_420", "count": 1, "displayName": "", @@ -207,6 +203,10 @@ "searchText": "nerixyz timed out twitchdev for 10m in testaccount_420. ", "serverReceivedTime": "2025-02-22T17:54:04Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-unban.json b/tests/snapshots/EventSub/channel-moderate/shared-unban.json index c2b4d902..c437a7c2 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-unban.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-unban.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -182,6 +178,10 @@ "searchText": "nerixyz unbanned uint128 in testaccount_420. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json b/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json index f5a85a23..a06abaea 100644 --- a/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json +++ b/tests/snapshots/EventSub/channel-moderate/shared-untimeout.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -182,6 +178,10 @@ "searchText": "nerixyz untimedout uint128 in testaccount_420. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/slow-off.json b/tests/snapshots/EventSub/channel-moderate/slow-off.json index 62a7d3ff..8c92890f 100644 --- a/tests/snapshots/EventSub/channel-moderate/slow-off.json +++ b/tests/snapshots/EventSub/channel-moderate/slow-off.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned off slow mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/slow.json b/tests/snapshots/EventSub/channel-moderate/slow.json index a34d3a64..9d2b2a58 100644 --- a/tests/snapshots/EventSub/channel-moderate/slow.json +++ b/tests/snapshots/EventSub/channel-moderate/slow.json @@ -36,10 +36,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -175,6 +171,10 @@ "searchText": "nerixyz turned on slow mode. (10 seconds) ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/subscribers-off.json b/tests/snapshots/EventSub/channel-moderate/subscribers-off.json index 7b530636..e7f97c4e 100644 --- a/tests/snapshots/EventSub/channel-moderate/subscribers-off.json +++ b/tests/snapshots/EventSub/channel-moderate/subscribers-off.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned off subscribers-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/subscribers.json b/tests/snapshots/EventSub/channel-moderate/subscribers.json index e6fc5bd6..76786910 100644 --- a/tests/snapshots/EventSub/channel-moderate/subscribers.json +++ b/tests/snapshots/EventSub/channel-moderate/subscribers.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned on subscribers-only mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json b/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json index 4a4ac8f3..067eee0b 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout-stacking-reason.json @@ -123,10 +123,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -233,14 +229,14 @@ "searchText": "nerixyz timed out twitchdev for 1s: pajlada (2 times) ", "serverReceivedTime": "2025-02-22T17:53:50Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -388,6 +384,10 @@ "searchText": "nerixyz timed out twitchdev for 1s: pajlada ", "serverReceivedTime": "2025-02-22T17:54:50Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json b/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json index 940b5e4e..6fde7fb4 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout-stacking.json @@ -123,10 +123,6 @@ ], "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -232,14 +228,14 @@ "searchText": "nerixyz timed out twitchdev for 1s. (2 times) ", "serverReceivedTime": "2025-02-22T17:53:50Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -372,6 +368,10 @@ "searchText": "nerixyz timed out twitchdev for 1s. ", "serverReceivedTime": "2025-02-22T17:54:50Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/timeout.json b/tests/snapshots/EventSub/channel-moderate/timeout.json index 05bec94c..16505a8c 100644 --- a/tests/snapshots/EventSub/channel-moderate/timeout.json +++ b/tests/snapshots/EventSub/channel-moderate/timeout.json @@ -41,10 +41,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -192,6 +188,10 @@ "searchText": "nerixyz timed out twitchdev for 1s: test ", "serverReceivedTime": "2025-02-22T17:53:49Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unban-request-approve-message.json b/tests/snapshots/EventSub/channel-moderate/unban-request-approve-message.json index f7477a6c..fb3f9ba8 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban-request-approve-message.json +++ b/tests/snapshots/EventSub/channel-moderate/unban-request-approve-message.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -159,6 +155,10 @@ "searchText": "nerixyz approved the unban request from uint128: Ok you are unbanned ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unban-request-approve.json b/tests/snapshots/EventSub/channel-moderate/unban-request-approve.json index 50cbf994..c5c81521 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban-request-approve.json +++ b/tests/snapshots/EventSub/channel-moderate/unban-request-approve.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -155,6 +151,10 @@ "searchText": "nerixyz approved the unban request from uint128. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unban-request-deny-message.json b/tests/snapshots/EventSub/channel-moderate/unban-request-deny-message.json index da8ea486..fbcad807 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban-request-deny-message.json +++ b/tests/snapshots/EventSub/channel-moderate/unban-request-deny-message.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -160,6 +156,10 @@ "searchText": "nerixyz denied the unban request from uint128: Nah, no unban for you ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unban-request-deny.json b/tests/snapshots/EventSub/channel-moderate/unban-request-deny.json index 065e9a07..e66d63f3 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban-request-deny.json +++ b/tests/snapshots/EventSub/channel-moderate/unban-request-deny.json @@ -40,10 +40,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -155,6 +151,10 @@ "searchText": "nerixyz denied the unban request from uint128. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unban.json b/tests/snapshots/EventSub/channel-moderate/unban.json index 28f44eba..0d7cbfb3 100644 --- a/tests/snapshots/EventSub/channel-moderate/unban.json +++ b/tests/snapshots/EventSub/channel-moderate/unban.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -149,6 +145,10 @@ "searchText": "nerixyz unbanned uint128. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json b/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json index 52ea4545..c06763ce 100644 --- a/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json +++ b/tests/snapshots/EventSub/channel-moderate/uniquechat-off.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned off unique-chat mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/uniquechat.json b/tests/snapshots/EventSub/channel-moderate/uniquechat.json index 12f241b1..5e91ea2c 100644 --- a/tests/snapshots/EventSub/channel-moderate/uniquechat.json +++ b/tests/snapshots/EventSub/channel-moderate/uniquechat.json @@ -34,10 +34,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -157,6 +153,10 @@ "searchText": "nerixyz turned on unique-chat mode. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unmod.json b/tests/snapshots/EventSub/channel-moderate/unmod.json index 70ee00f6..f28ce4c2 100644 --- a/tests/snapshots/EventSub/channel-moderate/unmod.json +++ b/tests/snapshots/EventSub/channel-moderate/unmod.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -149,6 +145,10 @@ "searchText": "uint128 unmodded forsen. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/unraid.json b/tests/snapshots/EventSub/channel-moderate/unraid.json index 511e24fb..9acbcc2a 100644 --- a/tests/snapshots/EventSub/channel-moderate/unraid.json +++ b/tests/snapshots/EventSub/channel-moderate/unraid.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -152,6 +148,10 @@ "searchText": "pajlada canceled the raid to bajlada. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/untimeout.json b/tests/snapshots/EventSub/channel-moderate/untimeout.json index 511288a7..80952c3f 100644 --- a/tests/snapshots/EventSub/channel-moderate/untimeout.json +++ b/tests/snapshots/EventSub/channel-moderate/untimeout.json @@ -38,10 +38,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -149,6 +145,10 @@ "searchText": "nerixyz untimedout uint128. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "uint128", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/warn-shared.json b/tests/snapshots/EventSub/channel-moderate/warn-shared.json index 1cb56ef3..cbd13c3d 100644 --- a/tests/snapshots/EventSub/channel-moderate/warn-shared.json +++ b/tests/snapshots/EventSub/channel-moderate/warn-shared.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -168,6 +164,10 @@ "searchText": "quotrok has warned twitchdev: cut it out ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-moderate/warn.json b/tests/snapshots/EventSub/channel-moderate/warn.json index a2d0ec4f..6fab3574 100644 --- a/tests/snapshots/EventSub/channel-moderate/warn.json +++ b/tests/snapshots/EventSub/channel-moderate/warn.json @@ -39,10 +39,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -168,6 +164,10 @@ "searchText": "quotrok has warned twitchdev: cut it out ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-bad-type.json b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-bad-type.json index 4ac0ce80..2c27401d 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-bad-type.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-bad-type.json @@ -27,10 +27,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -94,14 +90,14 @@ "searchText": "Suspicious User: Restricted", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -201,6 +197,10 @@ "searchText": "nerixyz: FeelsDankMan", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-ban-evader.json b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-ban-evader.json index 3c99deaa..6ee881b6 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-ban-evader.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-ban-evader.json @@ -27,10 +27,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -99,14 +95,14 @@ "searchText": "Suspicious User: Restricted. Detected as possible ban evader", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -206,6 +202,10 @@ "searchText": "nerixyz: FeelsDankMan", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-emote.json b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-emote.json index b3a52c8e..fcea50e5 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-emote.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted-emote.json @@ -30,10 +30,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -97,14 +93,14 @@ "searchText": "Suspicious User: Restricted", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -204,6 +200,10 @@ "searchText": "nerixyz: Kappa", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted.json b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted.json index 21c707be..30caaf9f 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-message/restricted.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-message/restricted.json @@ -27,10 +27,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -94,14 +90,14 @@ "searchText": "Suspicious User: Restricted", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -201,6 +197,10 @@ "searchText": "nerixyz: FeelsDankMan", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json b/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json index fae1c419..f5d4d8f1 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/monitored.json @@ -13,10 +13,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -128,6 +124,10 @@ "searchText": "uint128 removed nerixyz from the suspicious user list. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } 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 0995a7ce..6904640a 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/no-treatment.json @@ -13,10 +13,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -128,6 +124,10 @@ "searchText": "uint128 removed nerixyz from the suspicious user list. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json b/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json index 0713c486..90febc7d 100644 --- a/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json +++ b/tests/snapshots/EventSub/channel-suspicious-user-update/restricted.json @@ -13,10 +13,6 @@ }, "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -128,6 +124,10 @@ "searchText": "uint128 added nerixyz as a restricted suspicious chatter. ", "serverReceivedTime": "2024-05-14T12:31:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/action.json b/tests/snapshots/IrcMessageHandler/action.json index f60c2a07..28a96360 100644 --- a/tests/snapshots/IrcMessageHandler/action.json +++ b/tests/snapshots/IrcMessageHandler/action.json @@ -2,14 +2,6 @@ "input": "@badge-info=subscriber/80;badges=broadcaster/1,subscriber/3072,partner/1;color=#CC44FF;display-name=pajlada;emote-only=1;emotes=25:0-4;first-msg=0;flags=;id=90ef1e46-8baa-4bf2-9c54-272f39d6fa11;mod=0;returning-chatter=0;room-id=11148817;subscriber=1;tmi-sent-ts=1662206235860;turbo=0;user-id=11148817;user-type= :pajlada!pajlada@pajlada.tmi.twitch.tv PRIVMSG #pajlada :\u0001ACTION Kappa\u0001", "output": [ { - "badgeInfos": { - "subscriber": "80" - }, - "badges": [ - "broadcaster", - "subscriber", - "partner" - ], "channelName": "pajlada", "count": 1, "displayName": "pajlada", @@ -171,6 +163,14 @@ "searchText": "pajlada pajlada: Kappa ", "serverReceivedTime": "2022-09-03T11:57:15Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "80" + }, + "twitchBadges": [ + "broadcaster", + "subscriber", + "partner" + ], "userID": "11148817", "usernameColor": "#ffcc44ff" } diff --git a/tests/snapshots/IrcMessageHandler/all-usernames.json b/tests/snapshots/IrcMessageHandler/all-usernames.json index d8f4c491..93d0e60f 100644 --- a/tests/snapshots/IrcMessageHandler/all-usernames.json +++ b/tests/snapshots/IrcMessageHandler/all-usernames.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726689518974;subscriber=1;id=438b85cc-fa67-4c03-bc38-c4ec2527822c;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@TwitchDev TwitchDev UserColor @UserColor UserColor! UserColorKappa UserChatter usercolor UserColor2 @UserColor2 ?!", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -289,6 +283,12 @@ "searchText": "nerixyz nerixyz: @TwitchDev TwitchDev UserColor @UserColor UserColor! UserColorKappa UserChatter usercolor UserColor2 @UserColor2 ?! ", "serverReceivedTime": "2024-09-18T19:58:38Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/announcement.json b/tests/snapshots/IrcMessageHandler/announcement.json index 4b50b900..74fa8d90 100644 --- a/tests/snapshots/IrcMessageHandler/announcement.json +++ b/tests/snapshots/IrcMessageHandler/announcement.json @@ -2,14 +2,6 @@ "input": "@badge-info=subscriber/47;badges=broadcaster/1,subscriber/3012,twitchconAmsterdam2020/1;color=#FF0000;display-name=Supinic;emotes=;flags=;id=8c26e1ab-b50c-4d9d-bc11-3fd57a941d90;login=supinic;mod=0;msg-id=announcement;msg-param-color=PRIMARY;room-id=11148817;subscriber=1;system-msg=;tmi-sent-ts=1648762219962;user-id=31400525;user-type= :tmi.twitch.tv USERNOTICE #pajlada :mm test lol", "output": [ { - "badgeInfos": { - "subscriber": "47" - }, - "badges": [ - "broadcaster", - "subscriber", - "twitchconAmsterdam2020" - ], "channelName": "pajlada", "count": 1, "displayName": "Supinic", @@ -148,14 +140,18 @@ "searchText": "supinic supinic: mm test lol ", "serverReceivedTime": "2022-03-31T21:30:19Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "47" + }, + "twitchBadges": [ + "broadcaster", + "subscriber", + "twitchconAmsterdam2020" + ], "userID": "31400525", "usernameColor": "#ffff0000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -212,6 +208,10 @@ "searchText": "Announcement", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes.json b/tests/snapshots/IrcMessageHandler/bad-emotes.json index 52009b54..5e2e9c76 100644 --- a/tests/snapshots/IrcMessageHandler/bad-emotes.json +++ b/tests/snapshots/IrcMessageHandler/bad-emotes.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=no_audio/1;color=#DAA520;display-name=Mm2PL;emote-only=1;emotes=25:04;first-msg=0;flags=;id=7be87072-bf24-4fa3-b3df-0ea6fa5f1474;mod=0;returning-chatter=0;room-id=11148817;subscriber=0;tmi-sent-ts=1662201102276;turbo=0;user-id=117691339;user-type= :mm2pl!mm2pl@mm2pl.tmi.twitch.tv PRIVMSG #pajlada :Kappa", "output": [ { - "badgeInfos": { - }, - "badges": [ - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "Mm2PL", @@ -139,6 +134,11 @@ "searchText": "mm2pl mm2pl: Kappa ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "no_audio" + ], "userID": "117691339", "usernameColor": "#ffdaa521" } diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes2.json b/tests/snapshots/IrcMessageHandler/bad-emotes2.json index 20c1816e..cfc109f3 100644 --- a/tests/snapshots/IrcMessageHandler/bad-emotes2.json +++ b/tests/snapshots/IrcMessageHandler/bad-emotes2.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=no_audio/1;color=#DAA520;display-name=Mm2PL;emote-only=1;emotes=25:4-0;first-msg=0;flags=;id=7be87072-bf24-4fa3-b3df-0ea6fa5f1474;mod=0;returning-chatter=0;room-id=11148817;subscriber=0;tmi-sent-ts=1662201102276;turbo=0;user-id=117691339;user-type= :mm2pl!mm2pl@mm2pl.tmi.twitch.tv PRIVMSG #pajlada :Kappa", "output": [ { - "badgeInfos": { - }, - "badges": [ - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "Mm2PL", @@ -139,6 +134,11 @@ "searchText": "mm2pl mm2pl: Kappa ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "no_audio" + ], "userID": "117691339", "usernameColor": "#ffdaa521" } diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes3.json b/tests/snapshots/IrcMessageHandler/bad-emotes3.json index 5cc1e4a6..4f226e31 100644 --- a/tests/snapshots/IrcMessageHandler/bad-emotes3.json +++ b/tests/snapshots/IrcMessageHandler/bad-emotes3.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1662201102276;emotes=84608:0-15 :test!test@test.tmi.twitch.tv PRIVMSG #pajlada :foo bar", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -116,6 +112,10 @@ "searchText": "test test: foo bar ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes4.json b/tests/snapshots/IrcMessageHandler/bad-emotes4.json index fa9fabb8..8fc100fa 100644 --- a/tests/snapshots/IrcMessageHandler/bad-emotes4.json +++ b/tests/snapshots/IrcMessageHandler/bad-emotes4.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1662201102276;emotes=84608:9-10 :test!test@test.tmi.twitch.tv PRIVMSG #pajlada :foo bar", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -116,6 +112,10 @@ "searchText": "test test: foo bar ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/badges-invalid.json b/tests/snapshots/IrcMessageHandler/badges-invalid.json index 93973aff..b51fe261 100644 --- a/tests/snapshots/IrcMessageHandler/badges-invalid.json +++ b/tests/snapshots/IrcMessageHandler/badges-invalid.json @@ -2,11 +2,6 @@ "input": "@tmi-sent-ts=1726764056444;subscriber=1;id=546c42a6-21d0-4f3d-a6a0-c77f78d7b131;room-id=11148817;user-id=123456;display-name=badgy;badges=subscriber24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :badgy!badgy@badgy.tmi.twitch.tv PRIVMSG #pajlada :badge", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "badgy", @@ -223,6 +218,11 @@ "searchText": "badgy badgy: badge ", "serverReceivedTime": "2024-09-19T16:40:56Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + ], "userID": "123456", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/badges.json b/tests/snapshots/IrcMessageHandler/badges.json index 5b72485e..5bdc9760 100644 --- a/tests/snapshots/IrcMessageHandler/badges.json +++ b/tests/snapshots/IrcMessageHandler/badges.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726764056444;subscriber=1;id=546c42a6-21d0-4f3d-a6a0-c77f78d7b131;room-id=11148817;user-id=123456;display-name=badgy;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :badgy!badgy@badgy.tmi.twitch.tv PRIVMSG #pajlada :badge", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "badgy", @@ -224,6 +218,12 @@ "searchText": "badgy badgy: badge ", "serverReceivedTime": "2024-09-19T16:40:56Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "123456", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/bitsbadge.json b/tests/snapshots/IrcMessageHandler/bitsbadge.json index 46cde794..200235bb 100644 --- a/tests/snapshots/IrcMessageHandler/bitsbadge.json +++ b/tests/snapshots/IrcMessageHandler/bitsbadge.json @@ -2,10 +2,6 @@ "input": "@badge-info=subscriber/2;badges=subscriber/2,bits/1000;color=#FF4500;display-name=whoopiix;emotes=;flags=;id=d2b32a02-3071-4c52-b2ce-bc3716acdc44;login=whoopiix;mod=0;msg-id=bitsbadgetier;msg-param-threshold=1000;room-id=11148817;subscriber=1;system-msg=bits\\sbadge\\stier\\snotification;tmi-sent-ts=1594520403813;user-id=104252055;user-type= :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -86,6 +82,10 @@ "searchText": "whoopiix just earned a new 1K Bits badge!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/cheer1.json b/tests/snapshots/IrcMessageHandler/cheer1.json index d9ed82fe..f35262c7 100644 --- a/tests/snapshots/IrcMessageHandler/cheer1.json +++ b/tests/snapshots/IrcMessageHandler/cheer1.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=bits-leader/3;bits=5;color=;display-name=slyckity;emotes=;flags=;id=fd6c5507-3a4e-4d24-8f6e-fadf07f520d3;mod=0;room-id=111448817;subscriber=0;tmi-sent-ts=1567824273752;turbo=0;user-id=143114011;user-type= :slyckity!slyckity@slyckity.tmi.twitch.tv PRIVMSG #pajlada :Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits-leader" - ], "channelName": "pajlada", "count": 1, "displayName": "slyckity", @@ -417,6 +412,11 @@ "searchText": "slyckity slyckity: Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c ", "serverReceivedTime": "2019-09-07T02:44:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits-leader" + ], "userID": "143114011", "usernameColor": "#ff0000ff" } diff --git a/tests/snapshots/IrcMessageHandler/cheer2.json b/tests/snapshots/IrcMessageHandler/cheer2.json index 28d4efe5..7fd46fed 100644 --- a/tests/snapshots/IrcMessageHandler/cheer2.json +++ b/tests/snapshots/IrcMessageHandler/cheer2.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=bits-leader/3;bits=5;color=;display-name=slyckity;emotes=;flags=;id=fd6c5507-3a4e-4d24-8f6e-fadf07f520d3;mod=0;room-id=111448817;subscriber=0;tmi-sent-ts=1567824273752;turbo=0;user-id=143114011;user-type= :slyckity!slyckity@slyckity.tmi.twitch.tv PRIVMSG #pajlada :Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits-leader" - ], "channelName": "pajlada", "count": 1, "displayName": "slyckity", @@ -191,6 +186,11 @@ "searchText": "slyckity slyckity: Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c ", "serverReceivedTime": "2019-09-07T02:44:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits-leader" + ], "userID": "143114011", "usernameColor": "#ff0000ff" } diff --git a/tests/snapshots/IrcMessageHandler/cheer3.json b/tests/snapshots/IrcMessageHandler/cheer3.json index d7cad8e2..07cdee11 100644 --- a/tests/snapshots/IrcMessageHandler/cheer3.json +++ b/tests/snapshots/IrcMessageHandler/cheer3.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=bits-leader/3;bits=5;color=;display-name=slyckity;emotes=;flags=;id=fd6c5507-3a4e-4d24-8f6e-fadf07f520d3;mod=0;room-id=111448817;subscriber=0;tmi-sent-ts=1567824273752;turbo=0;user-id=143114011;user-type= :slyckity!slyckity@slyckity.tmi.twitch.tv PRIVMSG #pajlada :Cheer100", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits-leader" - ], "channelName": "pajlada", "count": 1, "displayName": "slyckity", @@ -174,6 +169,11 @@ "searchText": "slyckity slyckity: Cheer100 ", "serverReceivedTime": "2019-09-07T02:44:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits-leader" + ], "userID": "143114011", "usernameColor": "#ff0000ff" } diff --git a/tests/snapshots/IrcMessageHandler/cheer4.json b/tests/snapshots/IrcMessageHandler/cheer4.json index 81f7fc0c..ef3baad2 100644 --- a/tests/snapshots/IrcMessageHandler/cheer4.json +++ b/tests/snapshots/IrcMessageHandler/cheer4.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=bits/1;bits=10;color=#00FF7F;display-name=EXDE_HUN;emotes=;flags=;id=60d8835b-23fa-418c-96ca-5874e5d5e8ba;mod=0;room-id=111448817;subscriber=0;tmi-sent-ts=1566654664248;turbo=0;user-id=129793695;user-type= :exde_hun!exde_hun@exde_hun.tmi.twitch.tv PRIVMSG #pajlada :PogChamp10", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits" - ], "channelName": "pajlada", "count": 1, "displayName": "EXDE_HUN", @@ -136,6 +131,11 @@ "searchText": "exde_hun exde_hun: PogChamp10 ", "serverReceivedTime": "2019-08-24T13:51:04Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits" + ], "userID": "129793695", "usernameColor": "#ff00ff7f" } diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json index 92dec60a..9f85af8d 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1736678514028;room-id=11148817;badges=;badge-info=;flags=;user-type=;emotes= :tmi.twitch.tv CLEARCHAT #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 4, "displayName": "", @@ -70,18 +66,14 @@ "searchText": "Chat has been cleared by a moderator. (4 times) ", "serverReceivedTime": "2025-01-12T10:41:54Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - "subscriber": "108" - }, - "badges": [ - "broadcaster", - "subscriber", - "partner" - ], "channelName": "pajlada", "count": 1, "displayName": "pajlada", @@ -239,6 +231,14 @@ "searchText": "pajlada pajlada: asd ", "serverReceivedTime": "2025-01-12T10:41:52Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "108" + }, + "twitchBadges": [ + "broadcaster", + "subscriber", + "partner" + ], "userID": "11148817", "usernameColor": "#ffcc44ff" } diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json index da1579db..795e0874 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1736369068441;rm-received-ts=1736369068532;historical=1;room-id=111448817 :tmi.twitch.tv CLEARCHAT #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -68,6 +64,10 @@ "searchText": "Chat has been cleared by a moderator. ", "serverReceivedTime": "2025-01-08T20:44:28Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json index 74993395..84420840 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json +++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1736369068441;rm-received-ts=1736369068532;historical=1;room-id=111448817 :tmi.twitch.tv CLEARCHAT #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -70,6 +66,10 @@ "searchText": "Chat has been cleared by a moderator. (2 times) ", "serverReceivedTime": "2025-01-08T20:44:28Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/clearchat.json b/tests/snapshots/IrcMessageHandler/clearchat.json index c307348e..faecba5e 100644 --- a/tests/snapshots/IrcMessageHandler/clearchat.json +++ b/tests/snapshots/IrcMessageHandler/clearchat.json @@ -2,10 +2,6 @@ "input": "@room-id=11148817;rm-received-ts=1729627607652;tmi-sent-ts=1729627607545;historical=1 :tmi.twitch.tv CLEARCHAT #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -68,6 +64,10 @@ "searchText": "Chat has been cleared by a moderator. ", "serverReceivedTime": "2024-10-22T20:06:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/clearmsg-non-truncated.json b/tests/snapshots/IrcMessageHandler/clearmsg-non-truncated.json index 9ef8a0df..98a01e50 100644 --- a/tests/snapshots/IrcMessageHandler/clearmsg-non-truncated.json +++ b/tests/snapshots/IrcMessageHandler/clearmsg-non-truncated.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1757929420105;room-id=111448817;target-msg-id=862716db-9a7c-4563-8480-af799769ae81;rm-received-ts=1757929420186;login=kooby_ :tmi.twitch.tv CLEARMSG #pajlada sup", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -110,6 +106,10 @@ "searchText": "A message from kooby_ was deleted: sup", "serverReceivedTime": "", "timeoutUser": "msg:862716db-9a7c-4563-8480-af799769ae81", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/clearmsg-truncated.json b/tests/snapshots/IrcMessageHandler/clearmsg-truncated.json index 5dbb262b..14aac258 100644 --- a/tests/snapshots/IrcMessageHandler/clearmsg-truncated.json +++ b/tests/snapshots/IrcMessageHandler/clearmsg-truncated.json @@ -2,10 +2,6 @@ "input": "@rm-received-ts=1757929422007;login=kooby_;room-id=111448817;tmi-sent-ts=1757929421924;target-msg-id=ee436bee-aaac-49db-9a87-755c29105f6a :tmi.twitch.tv CLEARMSG #pajlada :Hello! its me Winston! Go to your fridge and stuff your big belly with food. I need you big and fat. FAT. FATTER. FATTER... FATTER! I need you to gain weight and get bulbous.", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -119,6 +115,10 @@ "searchText": "A message from kooby_ was deleted: Hello! its me Winston! Go to your fridge and stuff…", "serverReceivedTime": "", "timeoutUser": "msg:ee436bee-aaac-49db-9a87-755c29105f6a", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/custom-mod.json b/tests/snapshots/IrcMessageHandler/custom-mod.json index c8dce62d..a82d0577 100644 --- a/tests/snapshots/IrcMessageHandler/custom-mod.json +++ b/tests/snapshots/IrcMessageHandler/custom-mod.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/34;badges=moderator/1,subscriber/24;color=#FF0000;display-name=테스트계정420;emotes=;flags=;id=97c28382-e8d2-45a0-bb5d-2305fc4ef139;mod=1;room-id=11148817;subscriber=1;tmi-sent-ts=1590922036771;turbo=0;user-id=117166826;user-type=mod :testaccount_420!testaccount_420@testaccount_420.tmi.twitch.tv PRIVMSG #pajlada :foo", "output": [ { - "badgeInfos": { - "subscriber": "34" - }, - "badges": [ - "moderator", - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "testaccount_420", @@ -125,6 +118,13 @@ "searchText": "testaccount_420(테스트계정420) 테스트계정420 testaccount_420: foo ", "serverReceivedTime": "2020-05-31T10:47:16Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "34" + }, + "twitchBadges": [ + "moderator", + "subscriber" + ], "userID": "117166826", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/custom-vip.json b/tests/snapshots/IrcMessageHandler/custom-vip.json index a27522d7..3e39612b 100644 --- a/tests/snapshots/IrcMessageHandler/custom-vip.json +++ b/tests/snapshots/IrcMessageHandler/custom-vip.json @@ -2,13 +2,6 @@ "input": "@tmi-sent-ts=1726920321214;subscriber=1;vip=1;id=97bb0dfb-a35f-446d-8634-7522d8ef73ed;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=vip/1,subscriber/48;badge-info=subscriber/64;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :a", "output": [ { - "badgeInfos": { - "subscriber": "64" - }, - "badges": [ - "vip", - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -135,6 +128,13 @@ "searchText": "nerixyz nerixyz: a ", "serverReceivedTime": "2024-09-21T12:05:21Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "64" + }, + "twitchBadges": [ + "vip", + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/emote-emoji.json b/tests/snapshots/IrcMessageHandler/emote-emoji.json index 40415991..1847b497 100644 --- a/tests/snapshots/IrcMessageHandler/emote-emoji.json +++ b/tests/snapshots/IrcMessageHandler/emote-emoji.json @@ -2,14 +2,6 @@ "input": "@badge-info=subscriber/80;badges=broadcaster/1,subscriber/3072,partner/1;color=#CC44FF;display-name=pajlada;emotes=25:0-4,8-12;first-msg=0;flags=;id=44f85d39-b5fb-475d-8555-f4244f2f7e82;mod=0;returning-chatter=0;room-id=11148817;subscriber=1;tmi-sent-ts=1662204423418;turbo=0;user-id=11148817;user-type= :pajlada!pajlada@pajlada.tmi.twitch.tv PRIVMSG #pajlada :Kappa 😂 Kappa", "output": [ { - "badgeInfos": { - "subscriber": "80" - }, - "badges": [ - "broadcaster", - "subscriber", - "partner" - ], "channelName": "pajlada", "count": 1, "displayName": "pajlada", @@ -207,6 +199,14 @@ "searchText": "pajlada pajlada: Kappa 😂 Kappa ", "serverReceivedTime": "2022-09-03T11:27:03Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "80" + }, + "twitchBadges": [ + "broadcaster", + "subscriber", + "partner" + ], "userID": "11148817", "usernameColor": "#ffcc44ff" } diff --git a/tests/snapshots/IrcMessageHandler/emote.json b/tests/snapshots/IrcMessageHandler/emote.json index b3b925ab..b434caca 100644 --- a/tests/snapshots/IrcMessageHandler/emote.json +++ b/tests/snapshots/IrcMessageHandler/emote.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=no_audio/1;color=#DAA520;display-name=Mm2PL;emote-only=1;emotes=1902:0-4;first-msg=0;flags=;id=9b1c3cb9-7817-47ea-add1-f9d4a9b4f846;mod=0;returning-chatter=0;room-id=11148817;subscriber=0;tmi-sent-ts=1662201095690;turbo=0;user-id=117691339;user-type= :mm2pl!mm2pl@mm2pl.tmi.twitch.tv PRIVMSG #pajlada :Keepo", "output": [ { - "badgeInfos": { - }, - "badges": [ - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "Mm2PL", @@ -139,6 +134,11 @@ "searchText": "mm2pl mm2pl: Keepo ", "serverReceivedTime": "2022-09-03T10:31:35Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "no_audio" + ], "userID": "117691339", "usernameColor": "#ffdaa521" } diff --git a/tests/snapshots/IrcMessageHandler/emoteonly-on.json b/tests/snapshots/IrcMessageHandler/emoteonly-on.json index dbb9099c..f89bc842 100644 --- a/tests/snapshots/IrcMessageHandler/emoteonly-on.json +++ b/tests/snapshots/IrcMessageHandler/emoteonly-on.json @@ -2,10 +2,6 @@ "input": "@historical=1;rm-received-ts=1729627965650;msg-id=emote_only_on :tmi.twitch.tv NOTICE #pajlada :This room is now in emote-only mode.", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -68,6 +64,10 @@ "searchText": "This room is now in emote-only mode.", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/emotes.json b/tests/snapshots/IrcMessageHandler/emotes.json index e3a58f76..a158a36b 100644 --- a/tests/snapshots/IrcMessageHandler/emotes.json +++ b/tests/snapshots/IrcMessageHandler/emotes.json @@ -2,11 +2,6 @@ "input": "@badge-info=;badges=no_audio/1;color=#DAA520;display-name=Mm2PL;emote-only=1;emotes=25:0-4/1902:6-10/305954156:12-19;first-msg=0;flags=;id=7be87072-bf24-4fa3-b3df-0ea6fa5f1474;mod=0;returning-chatter=0;room-id=11148817;subscriber=0;tmi-sent-ts=1662201102276;turbo=0;user-id=117691339;user-type= :mm2pl!mm2pl@mm2pl.tmi.twitch.tv PRIVMSG #pajlada :Kappa Keepo PogChamp", "output": [ { - "badgeInfos": { - }, - "badges": [ - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "Mm2PL", @@ -177,6 +172,11 @@ "searchText": "mm2pl mm2pl: Kappa Keepo PogChamp ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "no_audio" + ], "userID": "117691339", "usernameColor": "#ffdaa521" } diff --git a/tests/snapshots/IrcMessageHandler/emotes2.json b/tests/snapshots/IrcMessageHandler/emotes2.json index 684fbd12..eae299b3 100644 --- a/tests/snapshots/IrcMessageHandler/emotes2.json +++ b/tests/snapshots/IrcMessageHandler/emotes2.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726868573676;subscriber=1;id=23c8b81c-7c73-44e4-84f1-7d37e99714e4;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=25:10-14/305954156:50-57/1902:69-73 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :BTTVEmote Kappa 7TVEmote 7TVEmote0w 7TVEmote0w 😂😂 PogChamp 7TVGlobal Keepo FFZEmote FFZGlobal", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -345,6 +339,12 @@ "searchText": "nerixyz nerixyz: BTTVEmote Kappa 7TVEmote 7TVEmote0w 7TVEmote0w 😂😂 PogChamp 7TVGlobal Keepo FFZEmote FFZGlobal ", "serverReceivedTime": "2024-09-20T21:42:53Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/emotes3.json b/tests/snapshots/IrcMessageHandler/emotes3.json index f46c918f..1e094067 100644 --- a/tests/snapshots/IrcMessageHandler/emotes3.json +++ b/tests/snapshots/IrcMessageHandler/emotes3.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726761013541;subscriber=1;id=aea562cc-1adf-47de-b656-0aaa245f1030;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=25:1-5/25:9-13 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :😂Kappa😂 &Kappa a b", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -205,6 +199,12 @@ "searchText": "nerixyz nerixyz: 😂Kappa😂 &Kappa a b ", "serverReceivedTime": "2024-09-19T15:50:13Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/emotes4.json b/tests/snapshots/IrcMessageHandler/emotes4.json index e6cd017a..81a7e2f6 100644 --- a/tests/snapshots/IrcMessageHandler/emotes4.json +++ b/tests/snapshots/IrcMessageHandler/emotes4.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1662201102276;emotes=84608:0-0 :test!test@test.tmi.twitch.tv PRIVMSG #pajlada :foo bar", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -135,6 +131,10 @@ "searchText": "test test: foo bar ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/emotes5.json b/tests/snapshots/IrcMessageHandler/emotes5.json index 3c3c9e0d..3bf09fc3 100644 --- a/tests/snapshots/IrcMessageHandler/emotes5.json +++ b/tests/snapshots/IrcMessageHandler/emotes5.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1662201102276;emotes=84609:0-1 :test!test@test.tmi.twitch.tv PRIVMSG #pajlada :foo bar", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -135,6 +131,10 @@ "searchText": "test test: foo bar ", "serverReceivedTime": "2022-09-03T10:31:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/first-msg.json b/tests/snapshots/IrcMessageHandler/first-msg.json index 2da63164..41e3cadd 100644 --- a/tests/snapshots/IrcMessageHandler/first-msg.json +++ b/tests/snapshots/IrcMessageHandler/first-msg.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/17;badges=subscriber/12,no_audio/1;color=#EBA2C0;display-name=jammehcow;emote-only=1;emotes=25:0-4;first-msg=1;flags=;id=9c2dd916-5a6d-4c1f-9fe7-a081b62a9c6b;mod=0;returning-chatter=0;room-id=11148817;subscriber=1;tmi-sent-ts=1662201093248;turbo=0;user-id=82674227;user-type= :jammehcow!jammehcow@jammehcow.tmi.twitch.tv PRIVMSG #pajlada :Kappa", "output": [ { - "badgeInfos": { - "subscriber": "17" - }, - "badges": [ - "subscriber", - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "jammehcow", @@ -141,6 +134,13 @@ "searchText": "jammehcow jammehcow: Kappa ", "serverReceivedTime": "2022-09-03T10:31:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "17" + }, + "twitchBadges": [ + "subscriber", + "no_audio" + ], "userID": "82674227", "usernameColor": "#ffeba2c0" } diff --git a/tests/snapshots/IrcMessageHandler/highlight1.json b/tests/snapshots/IrcMessageHandler/highlight1.json index 19ae924c..1184f2bc 100644 --- a/tests/snapshots/IrcMessageHandler/highlight1.json +++ b/tests/snapshots/IrcMessageHandler/highlight1.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1726865239492;subscriber=1;id=1bf2d49a-8b88-4116-81dd-5098f11726eb;room-id=11148817;user-id=129546453;badges=;color=#FF0000;flags=;user-type=;emotes= :ignoreduser!ignoreduser@ignoreduser.tmi.twitch.tv PRIVMSG #pajlada :my-highlight", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -115,6 +111,10 @@ "searchText": "ignoreduser ignoreduser: my-highlight ", "serverReceivedTime": "2024-09-20T20:47:19Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/highlight2.json b/tests/snapshots/IrcMessageHandler/highlight2.json index 7130b0c8..ee8a4791 100644 --- a/tests/snapshots/IrcMessageHandler/highlight2.json +++ b/tests/snapshots/IrcMessageHandler/highlight2.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726866916736;subscriber=1;id=7b5d2152-8eec-41ce-83eb-999ce5c21d28;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :something my-highlight *", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -120,6 +114,12 @@ "searchText": "nerixyz nerixyz: something my-highlight * ", "serverReceivedTime": "2024-09-20T21:15:16Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/highlight3.json b/tests/snapshots/IrcMessageHandler/highlight3.json index 3caa8e2d..5f5f0cec 100644 --- a/tests/snapshots/IrcMessageHandler/highlight3.json +++ b/tests/snapshots/IrcMessageHandler/highlight3.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726866927483;subscriber=1;id=f72f5a7a-522d-407c-ac16-a0b413632fa9;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :foo no-mention-highlight", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -119,6 +113,12 @@ "searchText": "nerixyz nerixyz: foo no-mention-highlight ", "serverReceivedTime": "2024-09-20T21:15:27Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json b/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json index abaeade3..66839c6d 100644 --- a/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json +++ b/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/3;badges=subscriber/0,bits-charity/1;color=#0000FF;display-name=SnoopyTheBot;emotes=;first-msg=0;flags=;id=8779a9e5-cf1b-47b3-b9fe-67a5b1b605f6;mod=0;pinned-chat-paid-amount=5-00;pinned-chat-paid-canonical-amount=5;pinned-chat-paid-currency=USD;pinned-chat-paid-exponent=2;returning-chatter=0;room-id=36340781;subscriber=1;tmi-sent-ts=1664505974154;turbo=0;user-id=136881249;user-type= :snoopythebot!snoopythebot@snoopythebot.tmi.twitch.tv PRIVMSG #pajlada :-$5", "output": [ { - "badgeInfos": { - "subscriber": "3" - }, - "badges": [ - "subscriber", - "bits-charity" - ], "channelName": "pajlada", "count": 1, "displayName": "SnoopyTheBot", @@ -157,6 +150,13 @@ "searchText": "snoopythebot snoopythebot: -$5 ", "serverReceivedTime": "2022-09-30T02:46:14Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "3" + }, + "twitchBadges": [ + "subscriber", + "bits-charity" + ], "userID": "136881249", "usernameColor": "#ff0000ff" } diff --git a/tests/snapshots/IrcMessageHandler/hype-chat0.json b/tests/snapshots/IrcMessageHandler/hype-chat0.json index 03f70aff..443213df 100644 --- a/tests/snapshots/IrcMessageHandler/hype-chat0.json +++ b/tests/snapshots/IrcMessageHandler/hype-chat0.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/3;badges=subscriber/0,bits-charity/1;color=#0000FF;display-name=SnoopyTheBot;emotes=;first-msg=0;flags=;id=8779a9e5-cf1b-47b3-b9fe-67a5b1b605f6;mod=0;pinned-chat-paid-amount=500;pinned-chat-paid-canonical-amount=5;pinned-chat-paid-currency=USD;pinned-chat-paid-exponent=2;returning-chatter=0;room-id=36340781;subscriber=1;tmi-sent-ts=1664505974154;turbo=0;user-id=136881249;user-type= :snoopythebot!snoopythebot@snoopythebot.tmi.twitch.tv PRIVMSG #pajlada :-$5", "output": [ { - "badgeInfos": { - "subscriber": "3" - }, - "badges": [ - "subscriber", - "bits-charity" - ], "channelName": "pajlada", "count": 1, "displayName": "SnoopyTheBot", @@ -157,14 +150,17 @@ "searchText": "snoopythebot snoopythebot: -$5 ", "serverReceivedTime": "2022-09-30T02:46:14Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "3" + }, + "twitchBadges": [ + "subscriber", + "bits-charity" + ], "userID": "136881249", "usernameColor": "#ff0000ff" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -223,6 +219,10 @@ "searchText": "Hype Chat USD5.00", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/hype-chat1.json b/tests/snapshots/IrcMessageHandler/hype-chat1.json index c68062fa..2e9c16d0 100644 --- a/tests/snapshots/IrcMessageHandler/hype-chat1.json +++ b/tests/snapshots/IrcMessageHandler/hype-chat1.json @@ -2,15 +2,6 @@ "input": "@pinned-chat-paid-level=ONE;mod=0;flags=;pinned-chat-paid-amount=1400;pinned-chat-paid-exponent=2;tmi-sent-ts=1687970631828;subscriber=1;user-type=;color=#9DA364;emotes=;badges=predictions/blue-1,subscriber/60,twitchconAmsterdam2020/1;pinned-chat-paid-canonical-amount=1400;turbo=0;user-id=26753388;id=e6681ba0-cdc6-4482-93a3-515b74361e8b;room-id=36340781;first-msg=0;returning-chatter=0;pinned-chat-paid-currency=NOK;pinned-chat-paid-is-system-message=0;badge-info=predictions/Day\\s53/53\\sforsenSmug,subscriber/67;display-name=matrHS :matrhs!matrhs@matrhs.tmi.twitch.tv PRIVMSG #pajlada :Title: Beating the record. but who is recordingLOL", "output": [ { - "badgeInfos": { - "predictions": "Day\\s53/53\\sforsenSmug", - "subscriber": "67" - }, - "badges": [ - "predictions", - "subscriber", - "twitchconAmsterdam2020" - ], "channelName": "pajlada", "count": 1, "displayName": "matrHS", @@ -166,14 +157,19 @@ "searchText": "matrhs matrhs: Title: Beating the record. but who is recordingLOL ", "serverReceivedTime": "2023-06-28T16:43:51Z", "timeoutUser": "", + "twitchBadgeInfos": { + "predictions": "Day\\s53/53\\sforsenSmug", + "subscriber": "67" + }, + "twitchBadges": [ + "predictions", + "subscriber", + "twitchconAmsterdam2020" + ], "userID": "26753388", "usernameColor": "#ff9da364" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -235,6 +231,10 @@ "searchText": "Level 1 Hype Chat (30s) NOK14.00", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/hype-chat2.json b/tests/snapshots/IrcMessageHandler/hype-chat2.json index cdeb3066..a548d7b0 100644 --- a/tests/snapshots/IrcMessageHandler/hype-chat2.json +++ b/tests/snapshots/IrcMessageHandler/hype-chat2.json @@ -2,13 +2,6 @@ "input": "@room-id=36340781;tmi-sent-ts=1687970634371;flags=;id=39a80a3d-c16e-420f-9bbb-faba4976a3bb;badges=subscriber/6,premium/1;emotes=;display-name=rickharrisoncoc;pinned-chat-paid-level=TWO;turbo=0;pinned-chat-paid-amount=500;pinned-chat-paid-is-system-message=0;color=#FF69B4;subscriber=1;user-type=;first-msg=0;pinned-chat-paid-currency=USD;pinned-chat-paid-canonical-amount=500;user-id=518404689;badge-info=subscriber/10;pinned-chat-paid-exponent=2;returning-chatter=0;mod=0 :rickharrisoncoc!rickharrisoncoc@rickharrisoncoc.tmi.twitch.tv PRIVMSG #pajlada :forsen please read my super chat. Please.", "output": [ { - "badgeInfos": { - "subscriber": "10" - }, - "badges": [ - "subscriber", - "premium" - ], "channelName": "pajlada", "count": 1, "displayName": "rickharrisoncoc", @@ -163,14 +156,17 @@ "searchText": "rickharrisoncoc rickharrisoncoc: forsen please read my super chat. Please. ", "serverReceivedTime": "2023-06-28T16:43:54Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "10" + }, + "twitchBadges": [ + "subscriber", + "premium" + ], "userID": "518404689", "usernameColor": "#ffff69b4" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -233,6 +229,10 @@ "searchText": "Level 2 Hype Chat (2m 30s) USD5.00", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/ignore-block1.json b/tests/snapshots/IrcMessageHandler/ignore-block1.json index 713d2686..a23c57ec 100644 --- a/tests/snapshots/IrcMessageHandler/ignore-block1.json +++ b/tests/snapshots/IrcMessageHandler/ignore-block1.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726692539140;subscriber=1;id=c34a372b-d59e-4a36-9ad8-d964098526e4;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :block!", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -117,6 +111,12 @@ "searchText": "nerixyz nerixyz: block! ", "serverReceivedTime": "2024-09-18T20:48:59Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/ignore-infinite.json b/tests/snapshots/IrcMessageHandler/ignore-infinite.json index 543809cd..bebb35c0 100644 --- a/tests/snapshots/IrcMessageHandler/ignore-infinite.json +++ b/tests/snapshots/IrcMessageHandler/ignore-infinite.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726865562691;subscriber=1;id=08e1573a-c09a-4052-8cf6-dd9fc5edf35b;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :this is an infinite-loop", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -123,6 +117,12 @@ "searchText": "nerixyz nerixyz: Too many replacements - check your ignores! ", "serverReceivedTime": "2024-09-20T20:52:42Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/ignore-replace.json b/tests/snapshots/IrcMessageHandler/ignore-replace.json index f8f969b3..88e97c43 100644 --- a/tests/snapshots/IrcMessageHandler/ignore-replace.json +++ b/tests/snapshots/IrcMessageHandler/ignore-replace.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726925714864;subscriber=1;id=2199102c-31ae-49b1-9d2c-a33bb3a02021;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=305954156:0-7/25:16-20,92-96/1902:31-35 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :PogChamp ignore Kappa &fooo123 Keepo &boo1 &baa1 &bi1 &biii1 &biiiiiiiiii420 &foo123&fo2 &[ Kappa ]& summon-emote", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -265,6 +259,12 @@ "searchText": "nerixyz nerixyz: PogChamp replace Kappa &baz1[ooo+123] Keepo &baz2[1+\\2] &baz3[1+\\42] &bi1 &biii1 &baz4[i+420+i] &baz1[oo+123]&baz1[o+2] { Kappa } woah-> MyCoolTwitchEmote ", "serverReceivedTime": "2024-09-21T13:35:14Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/justinfan.json b/tests/snapshots/IrcMessageHandler/justinfan.json index 2a34bfd1..89667c77 100644 --- a/tests/snapshots/IrcMessageHandler/justinfan.json +++ b/tests/snapshots/IrcMessageHandler/justinfan.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726918643421;subscriber=1;id=e5a690e7-74c8-41cb-977f-55b903f6be23;room-id=11148817;user-id=64537;display-name=justinfan64537;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :justinfan64537!justinfan64537@justinfan64537.tmi.twitch.tv PRIVMSG #pajlada :a", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "justinfan64537", @@ -117,6 +111,12 @@ "searchText": "justinfan64537 justinfan64537: a ", "serverReceivedTime": "2024-09-21T11:37:23Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "64537", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/links.json b/tests/snapshots/IrcMessageHandler/links.json index 892dee64..bf7364ac 100644 --- a/tests/snapshots/IrcMessageHandler/links.json +++ b/tests/snapshots/IrcMessageHandler/links.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726678491958;subscriber=1;id=84b6f44a-c8eb-4abe-8a78-cf736642f695;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :https://chatterino.com (chatterino.com chatterino.com) (chatterino.com)", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -234,6 +228,12 @@ "searchText": "nerixyz nerixyz: https://chatterino.com (chatterino.com chatterino.com) (chatterino.com) ", "serverReceivedTime": "2024-09-18T16:54:51Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/mentions.json b/tests/snapshots/IrcMessageHandler/mentions.json index 2035f668..0b400102 100644 --- a/tests/snapshots/IrcMessageHandler/mentions.json +++ b/tests/snapshots/IrcMessageHandler/mentions.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726678643417;subscriber=1;id=49f33e31-101f-4b03-bfc4-4b8252d0c09c;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@~ @TwitchDev @UserColor!", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -168,6 +162,12 @@ "searchText": "nerixyz nerixyz: @~ @TwitchDev @UserColor! ", "serverReceivedTime": "2024-09-18T16:57:23Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/mod.json b/tests/snapshots/IrcMessageHandler/mod.json index 318034fc..24ac1f41 100644 --- a/tests/snapshots/IrcMessageHandler/mod.json +++ b/tests/snapshots/IrcMessageHandler/mod.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/34;badges=moderator/1,subscriber/24;color=#FF0000;display-name=테스트계정420;emotes=41:6-13,16-23;flags=;id=97c28382-e8d2-45a0-bb5d-2305fc4ef139;mod=1;room-id=11148817;subscriber=1;tmi-sent-ts=1590922036771;turbo=0;user-id=117166826;user-type=mod :testaccount_420!testaccount_420@testaccount_420.tmi.twitch.tv PRIVMSG #pajlada :-tags Kreygasm, Kreygasm", "output": [ { - "badgeInfos": { - "subscriber": "34" - }, - "badges": [ - "moderator", - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "testaccount_420", @@ -180,6 +173,13 @@ "searchText": "testaccount_420(테스트계정420) 테스트계정420 testaccount_420: -tags Kreygasm, Kreygasm ", "serverReceivedTime": "2020-05-31T10:47:16Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "34" + }, + "twitchBadges": [ + "moderator", + "subscriber" + ], "userID": "117166826", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/nickname.json b/tests/snapshots/IrcMessageHandler/nickname.json index 7106cca4..b79b7689 100644 --- a/tests/snapshots/IrcMessageHandler/nickname.json +++ b/tests/snapshots/IrcMessageHandler/nickname.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726915984645;subscriber=1;id=a964d705-0b72-4867-aab7-bc9a14945742;room-id=11148817;user-id=12345678;display-name=NickName;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :nickname!nickname@nickname.tmi.twitch.tv PRIVMSG #pajlada :nickname", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "NickName", @@ -117,6 +111,12 @@ "searchText": "replacement nickname: nickname ", "serverReceivedTime": "2024-09-21T10:53:04Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "12345678", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/no-nick.json b/tests/snapshots/IrcMessageHandler/no-nick.json index b13f3dad..9de4d344 100644 --- a/tests/snapshots/IrcMessageHandler/no-nick.json +++ b/tests/snapshots/IrcMessageHandler/no-nick.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726865239492;subscriber=1;id=1bf2d49a-8b88-4116-81dd-5098f11726eb;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes= :!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :no", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -117,6 +111,12 @@ "searchText": "(nerixyz) nerixyz : no ", "serverReceivedTime": "2024-09-20T20:47:19Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/no-tags.json b/tests/snapshots/IrcMessageHandler/no-tags.json index ca998a4d..aeea1ba5 100644 --- a/tests/snapshots/IrcMessageHandler/no-tags.json +++ b/tests/snapshots/IrcMessageHandler/no-tags.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1726764056444 :jammehcow!jammehcow@jammehcow.tmi.twitch.tv PRIVMSG #pajlada :Kappa", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "", @@ -119,6 +115,10 @@ "searchText": "jammehcow jammehcow: Kappa ", "serverReceivedTime": "2024-09-19T16:40:56Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/raid.json b/tests/snapshots/IrcMessageHandler/raid.json index 678a5f35..9c9afb05 100644 --- a/tests/snapshots/IrcMessageHandler/raid.json +++ b/tests/snapshots/IrcMessageHandler/raid.json @@ -2,10 +2,6 @@ "input": "@badges=subscriber/24;login=nerixyz;msg-param-displayName=nerixyz;user-type=;tmi-sent-ts=1729626466361;system-msg=2\\sraiders\\sfrom\\snerixyz\\shave\\sjoined!;room-id=11148817;user-id=129546453;display-name=nerixyz;subscriber=1;historical=1;rm-received-ts=1729626466492;msg-id=raid;vip=0;id=7299b7bc-61ce-423c-85ce-8d651b56cce4;msg-param-login=nerixyz;color=#FF0000;mod=0;msg-param-viewerCount=2;flags=;msg-param-profileImageURL=https://static-cdn.jtvnw.net/jtv_user_pictures/e065218b-49df-459d-afd3-c6557870f551-profile_image-%s.png;emotes=;badge-info=subscriber/28 :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -98,6 +94,10 @@ "searchText": "2 raiders from nerixyz have joined!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/redeemed-highlight.json b/tests/snapshots/IrcMessageHandler/redeemed-highlight.json index 4b493da3..86de770c 100644 --- a/tests/snapshots/IrcMessageHandler/redeemed-highlight.json +++ b/tests/snapshots/IrcMessageHandler/redeemed-highlight.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726662616942;subscriber=1;id=c5a927a2-1f68-41f7-9137-809a37e58e61;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=1:21-22;msg-id=highlighted-message :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :BTTVGlobal highlight :)", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -155,6 +149,12 @@ "searchText": "nerixyz nerixyz: BTTVGlobal highlight :) ", "serverReceivedTime": "2024-09-18T12:30:16Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-action.json b/tests/snapshots/IrcMessageHandler/reply-action.json index 56bb89d2..b2e66be2 100644 --- a/tests/snapshots/IrcMessageHandler/reply-action.json +++ b/tests/snapshots/IrcMessageHandler/reply-action.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726691189926;subscriber=1;id=9d74021f-375a-44f1-80e4-0dd58e64396a;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-thread-parent-display-name=nerixyz;reply-parent-display-name=nerixyz;reply-thread-parent-msg-id=c6ff10fb-7eed-4326-b7ff-bf2b77b9b021;reply-thread-parent-user-login=nerixyz;reply-parent-user-login=nerixyz;reply-thread-parent-user-id=129546453;reply-parent-msg-body=a;reply-parent-msg-id=c6ff10fb-7eed-4326-b7ff-bf2b77b9b021;reply-parent-user-id=129546453 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz b", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -181,6 +175,12 @@ "searchText": "nerixyz nerixyz: b ", "serverReceivedTime": "2024-09-18T20:26:29Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-block.json b/tests/snapshots/IrcMessageHandler/reply-block.json index e4c44f9a..c19da6d3 100644 --- a/tests/snapshots/IrcMessageHandler/reply-block.json +++ b/tests/snapshots/IrcMessageHandler/reply-block.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726692474917;subscriber=1;id=289ffa22-d29a-4300-88be-1734b0a33b2a;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-msg-body=BLOCK;reply-thread-parent-user-login=nerixyz;reply-thread-parent-user-id=129546453;reply-parent-user-login=nerixyz;reply-thread-parent-display-name=nerixyz;reply-parent-msg-id=4d2af478-c471-4b3a-8c6f-568a54d2fe7a;reply-thread-parent-msg-id=4d2af478-c471-4b3a-8c6f-568a54d2fe7a;reply-parent-display-name=nerixyz;reply-parent-user-id=129546453 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz reply", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -173,6 +167,12 @@ "searchText": "nerixyz nerixyz: reply ", "serverReceivedTime": "2024-09-18T20:47:54Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-blocked-user.json b/tests/snapshots/IrcMessageHandler/reply-blocked-user.json index 3de64b52..e663406c 100644 --- a/tests/snapshots/IrcMessageHandler/reply-blocked-user.json +++ b/tests/snapshots/IrcMessageHandler/reply-blocked-user.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726694327762;subscriber=1;id=e5b84adf-b62d-47ff-8534-2cc57e24a5fb;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-msg-body=a;reply-thread-parent-user-login=blocked;reply-thread-parent-user-id=12345;reply-parent-user-login=blocked;reply-thread-parent-display-name=blocked;reply-parent-msg-id=ff82c584-5d20-459f-b2d5-dcacbb693559;reply-thread-parent-msg-id=ff82c584-5d20-459f-b2d5-dcacbb693559;reply-parent-display-name=blocked;reply-parent-user-id=12345 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz reply", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -177,6 +171,12 @@ "searchText": "nerixyz nerixyz: @nerixyz reply ", "serverReceivedTime": "2024-09-18T21:18:47Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-child.json b/tests/snapshots/IrcMessageHandler/reply-child.json index c7a00755..31d1c1de 100644 --- a/tests/snapshots/IrcMessageHandler/reply-child.json +++ b/tests/snapshots/IrcMessageHandler/reply-child.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726690731517;subscriber=1;id=997cb8fa-4d24-411b-a5cd-433e515a5b72;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-display-name=nerixyz;reply-parent-user-login=nerixyz;reply-thread-parent-user-id=129546453;reply-parent-msg-body=@nerixyz\\sb;reply-parent-user-id=129546453;reply-thread-parent-display-name=nerixyz;reply-thread-parent-msg-id=72d76cb2-f34d-4a93-8005-61bf244456ee;reply-thread-parent-user-login=nerixyz;reply-parent-msg-id=474f19ab-a1b0-410a-877a-5b0e2ae8be6d :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz c", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -182,6 +176,12 @@ "searchText": "nerixyz nerixyz: c ", "serverReceivedTime": "2024-09-18T20:18:51Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-ignore.json b/tests/snapshots/IrcMessageHandler/reply-ignore.json index dd74f87b..735205ee 100644 --- a/tests/snapshots/IrcMessageHandler/reply-ignore.json +++ b/tests/snapshots/IrcMessageHandler/reply-ignore.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726692492710;subscriber=1;id=89c8f200-ae37-4279-909d-5ff4f9ed10a0;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-user-id=129546453;reply-parent-msg-body=ignore;reply-parent-display-name=nerixyz;reply-thread-parent-user-login=nerixyz;reply-parent-user-login=nerixyz;reply-thread-parent-display-name=nerixyz;reply-thread-parent-msg-id=68a68ef7-0ee3-4584-8937-6d20ff0a7a8a;reply-thread-parent-user-id=129546453;reply-parent-msg-id=68a68ef7-0ee3-4584-8937-6d20ff0a7a8a :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz CaseSensitive", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -181,6 +175,12 @@ "searchText": "nerixyz nerixyz: casesensitivE ", "serverReceivedTime": "2024-09-18T20:48:12Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-no-prev.json b/tests/snapshots/IrcMessageHandler/reply-no-prev.json index 91847a63..dcdb40a3 100644 --- a/tests/snapshots/IrcMessageHandler/reply-no-prev.json +++ b/tests/snapshots/IrcMessageHandler/reply-no-prev.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726690691139;subscriber=1;id=474f19ab-a1b0-410a-877a-5b0e2ae8be6d;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-user-login=nerixyz;reply-thread-parent-user-login=nerixyz;reply-parent-msg-body=a;reply-parent-user-id=129546453;reply-thread-parent-user-id=129546453;reply-thread-parent-display-name=nerixyz;reply-thread-parent-msg-id=72d76cb2-f34d-4a93-8005-61bf244456ee;reply-parent-msg-id=72d76cb2-f34d-4a93-8005-61bf244456ee;reply-parent-display-name=nerixyz :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz b", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -173,6 +167,12 @@ "searchText": "nerixyz nerixyz: b ", "serverReceivedTime": "2024-09-18T20:18:11Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-root.json b/tests/snapshots/IrcMessageHandler/reply-root.json index 08464a08..e6250a26 100644 --- a/tests/snapshots/IrcMessageHandler/reply-root.json +++ b/tests/snapshots/IrcMessageHandler/reply-root.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726690741480;subscriber=1;id=f0b45994-3e92-4c37-a35f-062072163d9d;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;reply-parent-user-login=nerixyz;reply-thread-parent-display-name=nerixyz;reply-parent-display-name=nerixyz;reply-parent-msg-id=72d76cb2-f34d-4a93-8005-61bf244456ee;reply-thread-parent-msg-id=72d76cb2-f34d-4a93-8005-61bf244456ee;reply-thread-parent-user-id=129546453;reply-thread-parent-user-login=nerixyz;reply-parent-msg-body=a;reply-parent-user-id=129546453 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz d", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -183,6 +177,12 @@ "searchText": "nerixyz nerixyz: d ", "serverReceivedTime": "2024-09-18T20:19:01Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reply-single.json b/tests/snapshots/IrcMessageHandler/reply-single.json index 9d13f3bf..974094bd 100644 --- a/tests/snapshots/IrcMessageHandler/reply-single.json +++ b/tests/snapshots/IrcMessageHandler/reply-single.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726690593888;subscriber=1;id=5e5f526a-5d60-4d81-800b-3b81b8a34c2c;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=1902:11-15;reply-parent-display-name=nerixyz;reply-thread-parent-msg-id=d95d04a6-5c6a-476a-8dbd-7c6d3b3c277f;reply-thread-parent-user-login=nerixyz;reply-thread-parent-display-name=nerixyz;reply-parent-msg-body=a\\sKappa\\sBTTVEmote\\s😂\\sb;reply-parent-user-login=nerixyz;reply-parent-user-id=129546453;reply-thread-parent-user-id=129546453;reply-parent-msg-id=d95d04a6-5c6a-476a-8dbd-7c6d3b3c277f :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :@nerixyz c Keepo FFZEmote 😭 d", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -255,6 +249,12 @@ "searchText": "nerixyz nerixyz: c Keepo FFZEmote 😭 d ", "serverReceivedTime": "2024-09-18T20:16:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reward-bits.json b/tests/snapshots/IrcMessageHandler/reward-bits.json index cd201404..01bc7be5 100644 --- a/tests/snapshots/IrcMessageHandler/reward-bits.json +++ b/tests/snapshots/IrcMessageHandler/reward-bits.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726662938032;subscriber=1;id=87af876f-5591-4a63-924f-46f465ecd3c4;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;custom-reward-id=CELEBRATION :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :reward 1", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -271,6 +265,12 @@ "searchText": "nerixyz nerixyz: reward 1 redeemed On-Screen Celebration 1", "serverReceivedTime": "2024-09-18T12:35:38Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reward-empty.json b/tests/snapshots/IrcMessageHandler/reward-empty.json index 63c47108..20506a13 100644 --- a/tests/snapshots/IrcMessageHandler/reward-empty.json +++ b/tests/snapshots/IrcMessageHandler/reward-empty.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726677572248;subscriber=1;id=2932e250-1f49-4587-8783-7a13d9f99f6b;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;custom-reward-id=dc8d1dac-256e-42b9-b7ba-40b32e5294e2 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :empty", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -235,6 +229,12 @@ "searchText": "nerixyz nerixyz: empty redeemed test 1", "serverReceivedTime": "2024-09-18T16:39:32Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reward-known.json b/tests/snapshots/IrcMessageHandler/reward-known.json index d5fe747f..9902aa13 100644 --- a/tests/snapshots/IrcMessageHandler/reward-known.json +++ b/tests/snapshots/IrcMessageHandler/reward-known.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726662938032;subscriber=1;id=87af876f-5591-4a63-924f-46f465ecd3c4;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;custom-reward-id=31a2344e-0fce-4229-9453-fb2e8b6dd02c :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :reward 1", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -232,6 +226,12 @@ "searchText": "nerixyz nerixyz: reward 1 Redeemed my reward 1", "serverReceivedTime": "2024-09-18T12:35:38Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/reward-unknown.json b/tests/snapshots/IrcMessageHandler/reward-unknown.json index 2f419c67..93b66cb8 100644 --- a/tests/snapshots/IrcMessageHandler/reward-unknown.json +++ b/tests/snapshots/IrcMessageHandler/reward-unknown.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726662961590;subscriber=1;id=4d409401-f692-4dd1-9295-f21350f86860;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=;custom-reward-id=3a02deb3-626e-4d8e-adde-226c90bbbb84 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :reward 2", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -118,6 +112,12 @@ "searchText": "nerixyz nerixyz: reward 2 ", "serverReceivedTime": "2024-09-18T12:36:01Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/rm-deleted.json b/tests/snapshots/IrcMessageHandler/rm-deleted.json index 0928e7ff..481bf7d6 100644 --- a/tests/snapshots/IrcMessageHandler/rm-deleted.json +++ b/tests/snapshots/IrcMessageHandler/rm-deleted.json @@ -2,12 +2,6 @@ "input": "@id=3dc39240-0798-4103-8c3c-51e1a9a567a3;first-msg=0;historical=1;rm-received-ts=1726600627161;color=#FF0000;badges=subscriber/24;turbo=0;room-id=11148817;flags=;mod=0;returning-chatter=0;rm-deleted=1;emotes=25:9-13;tmi-sent-ts=1726600626982;subscriber=1;user-id=129546453;display-name=nerixyz;badge-info=subscriber/27;user-type= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :7TVEmote Kappa my7TVEmote hi 7TVEmote❤", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -194,6 +188,12 @@ "searchText": "nerixyz nerixyz: 7TVEmote Kappa my7TVEmote hi 7TVEmote❤ ", "serverReceivedTime": "2024-09-17T19:17:07Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json index 4033dddb..dc24cea3 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json @@ -2,12 +2,6 @@ "input": "@badge-info=;badges=staff/1,raging-wolf-helm/1;color=#DAA520;display-name=lahoooo;emotes=;flags=;id=01cd601f-bc3f-49d5-ab4b-136fa9d6ec22;login=lahoooo;mod=0;msg-id=sharedchatnotice;msg-param-color=PRIMARY;room-id=11148817;source-badge-info=;source-badges=staff/1,moderator/1,bits-leader/1;source-id=4083dadc-9f20-40f9-ba92-949ebf6bc294;source-msg-id=announcement;source-room-id=1025594235;subscriber=0;system-msg=;tmi-sent-ts=1726118378465;user-id=612865661;user-type=staff;vip=0 :tmi.twitch.tv USERNOTICE #pajlada :hi this is an announcement from 1", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "raging-wolf-helm" - ], "channelName": "pajlada", "count": 1, "displayName": "lahoooo", @@ -202,14 +196,16 @@ "searchText": "lahoooo lahoooo: hi this is an announcement from 1 ", "serverReceivedTime": "2024-09-12T05:19:38Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "raging-wolf-helm" + ], "userID": "612865661", "usernameColor": "#ffdaa520" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -266,6 +262,10 @@ "searchText": "Announcement", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json b/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json index 52b5fe16..d06d2f6f 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1728311235904;subscriber=1;id=5b6f9721-80fd-4036-951e-1ced9c591b32;room-id=11148817;user-id=129546453;display-name=nerixyz;source-badge-info=;source-room-id=141981764;source-id=d7be8e12-187c-4f96-9d96-d87a17aa9ce9;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=;emotes=25:0-4 :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :Kappa BTTVEmote BTTVGlobal 7TVEmote 7TVGlobal FFZEmote FFZGlobal BTTVTwitchDev 7TVTwitchDev FFZTwitchDev", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -302,6 +296,12 @@ "searchText": "nerixyz nerixyz: Kappa BTTVEmote BTTVGlobal 7TVEmote 7TVGlobal FFZEmote FFZGlobal BTTVTwitchDev 7TVTwitchDev FFZTwitchDev ", "serverReceivedTime": "2024-10-07T14:27:15Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-known.json b/tests/snapshots/IrcMessageHandler/shared-chat-known.json index b6b5ec6d..1e37b551 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-known.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-known.json @@ -2,12 +2,6 @@ "input": "@badge-info=;flags=;room-id=11148817;color=;client-nonce=0d1632f37b6baee51576859d5dbaf325;emotes=;subscriber=0;tmi-sent-ts=1727395701680;id=19ee1663-c14d-41cd-a4a2-30a4bb609c5a;turbo=1;badges=staff/1,turbo/1;source-badges=staff/1,moderator/1,bits-leader/1;source-badge-info=;display-name=creativewind;source-room-id=141981764;source-id=b97eea45-f9dc-4f0c-8744-f8256c3ed950;user-type=staff;user-id=106940612;mod=0 :creativewind!creativewind@creativewind.tmi.twitch.tv PRIVMSG #pajlada :Guy", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "turbo" - ], "channelName": "pajlada", "count": 1, "displayName": "creativewind", @@ -195,6 +189,12 @@ "searchText": "creativewind creativewind: Guy ", "serverReceivedTime": "2024-09-27T00:08:21Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "turbo" + ], "userID": "106940612", "usernameColor": "#ff00ff00" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-moderator-both-channels.json b/tests/snapshots/IrcMessageHandler/shared-chat-moderator-both-channels.json index a54c485e..0212d046 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-moderator-both-channels.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-moderator-both-channels.json @@ -2,11 +2,6 @@ "input": "@mod=1;badges=moderator/1;tmi-sent-ts=1729627237027;id=3e0750f7-541e-4f7c-8fec-4f943bfd84a3;room-id=11148817;user-id=100229878;display-name=nuuls;badges=bits/100;badge-info=;color=#00FF7F;flags=5-8:P.3;user-type=mod;emotes=;source-only=0;source-badge-info=subscriber/52;source-id=0dd9957e-6140-498f-a6e8-e62d1b43dfe7;source-room-id=22484632;source-badges=moderator/1,subscriber/48 :nuuls!nuuls@nuuls.tmi.twitch.tv PRIVMSG #pajlada :I'm a mod in the current & shared channel", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits" - ], "channelName": "pajlada", "count": 1, "displayName": "nuuls", @@ -173,6 +168,11 @@ "searchText": "nuuls nuuls: I'm a mod in the current & shared channel ", "serverReceivedTime": "2024-10-22T20:00:37Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits" + ], "userID": "100229878", "usernameColor": "#ff00ff7f" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-moderator-external-channel.json b/tests/snapshots/IrcMessageHandler/shared-chat-moderator-external-channel.json index b9d21dda..a1395e28 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-moderator-external-channel.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-moderator-external-channel.json @@ -2,11 +2,6 @@ "input": "@tmi-sent-ts=1729627237027;id=3e0750f7-541e-4f7c-8fec-4f943bfd84a3;room-id=11148817;user-id=100229878;display-name=nuuls;badges=bits/100;badge-info=;color=#00FF7F;flags=5-8:P.3;user-type=;emotes=;source-only=0;source-badge-info=subscriber/52;source-id=0dd9957e-6140-498f-a6e8-e62d1b43dfe7;source-room-id=22484632;source-badges=moderator/1,subscriber/48 :nuuls!nuuls@nuuls.tmi.twitch.tv PRIVMSG #pajlada :I'm a mod in a shared channel", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits" - ], "channelName": "pajlada", "count": 1, "displayName": "nuuls", @@ -181,6 +176,11 @@ "searchText": "nuuls nuuls: I'm a mod in a shared channel ", "serverReceivedTime": "2024-10-22T20:00:37Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits" + ], "userID": "100229878", "usernameColor": "#ff00ff7f" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json b/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json index b2b1bf81..d8febfa2 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json @@ -2,12 +2,6 @@ "input": "@badge-info=;flags=;room-id=11148817;color=;client-nonce=0d1632f37b6baee51576859d5dbaf325;emotes=;subscriber=0;tmi-sent-ts=1727395701680;id=19ee1663-c14d-41cd-a4a2-30a4bb609c5a;turbo=1;badges=staff/1,turbo/1;source-badges=staff/1,moderator/1,bits-leader/1;source-badge-info=;display-name=creativewind;source-room-id=11148817;source-id=19ee1663-c14d-41cd-a4a2-30a4bb609c5a;user-type=staff;user-id=106940612;mod=0 :creativewind!creativewind@creativewind.tmi.twitch.tv PRIVMSG #pajlada :Guys", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "turbo" - ], "channelName": "pajlada", "count": 1, "displayName": "creativewind", @@ -156,6 +150,12 @@ "searchText": "creativewind creativewind: Guys ", "serverReceivedTime": "2024-09-27T00:08:21Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "turbo" + ], "userID": "106940612", "usernameColor": "#ff00ff00" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json b/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json index 3fbe0698..0310ad8a 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json @@ -2,12 +2,6 @@ "input": "@badge-info=;flags=;room-id=11148817;color=;client-nonce=0d1632f37b6baee51576859d5dbaf325;emotes=;subscriber=0;tmi-sent-ts=1727395701680;id=19ee1663-c14d-41cd-a4a2-30a4bb609c5a;turbo=1;badges=staff/1,turbo/1;source-badges=staff/1,moderator/1,bits-leader/1;source-badge-info=;display-name=creativewind;source-room-id=1025594235;source-id=b97eea45-f9dc-4f0c-8744-f8256c3ed950;user-type=staff;user-id=106940612;mod=0 :creativewind!creativewind@creativewind.tmi.twitch.tv PRIVMSG #pajlada :Guys", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "turbo" - ], "channelName": "pajlada", "count": 1, "displayName": "creativewind", @@ -195,6 +189,12 @@ "searchText": "creativewind creativewind: Guys ", "serverReceivedTime": "2024-09-27T00:08:21Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "turbo" + ], "userID": "106940612", "usernameColor": "#ff00ff00" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-vip-both-channels.json b/tests/snapshots/IrcMessageHandler/shared-chat-vip-both-channels.json index bcd0569e..6ef0de53 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-vip-both-channels.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-vip-both-channels.json @@ -2,11 +2,6 @@ "input": "@vip=1;badges=vip/1;tmi-sent-ts=1729627237027;id=3e0750f7-541e-4f7c-8fec-4f943bfd84a3;room-id=11148817;user-id=100229878;display-name=nuuls;badges=bits/100;badge-info=;color=#00FF7F;flags=5-8:P.3;user-type=;emotes=;source-only=0;source-badge-info=subscriber/52;source-id=0dd9957e-6140-498f-a6e8-e62d1b43dfe7;source-room-id=22484632;source-badges=vip/1,subscriber/48 :nuuls!nuuls@nuuls.tmi.twitch.tv PRIVMSG #pajlada :I'm a vip in the current & shared channel", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits" - ], "channelName": "pajlada", "count": 1, "displayName": "nuuls", @@ -184,6 +179,11 @@ "searchText": "nuuls nuuls: I'm a vip in the current & shared channel ", "serverReceivedTime": "2024-10-22T20:00:37Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits" + ], "userID": "100229878", "usernameColor": "#ff00ff7f" } diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-vip-external-channel.json b/tests/snapshots/IrcMessageHandler/shared-chat-vip-external-channel.json index 752a29fa..95ab57ec 100644 --- a/tests/snapshots/IrcMessageHandler/shared-chat-vip-external-channel.json +++ b/tests/snapshots/IrcMessageHandler/shared-chat-vip-external-channel.json @@ -2,11 +2,6 @@ "input": "@tmi-sent-ts=1729627237027;id=3e0750f7-541e-4f7c-8fec-4f943bfd84a3;room-id=11148817;user-id=100229878;display-name=nuuls;badges=bits/100;badge-info=;color=#00FF7F;flags=5-8:P.3;user-type=;emotes=;source-only=0;source-badge-info=subscriber/52;source-id=0dd9957e-6140-498f-a6e8-e62d1b43dfe7;source-room-id=22484632;source-badges=vip/1,subscriber/48 :nuuls!nuuls@nuuls.tmi.twitch.tv PRIVMSG #pajlada :I'm a vip in a shared channel", "output": [ { - "badgeInfos": { - }, - "badges": [ - "bits" - ], "channelName": "pajlada", "count": 1, "displayName": "nuuls", @@ -182,6 +177,11 @@ "searchText": "nuuls nuuls: I'm a vip in a shared channel ", "serverReceivedTime": "2024-10-22T20:00:37Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "bits" + ], "userID": "100229878", "usernameColor": "#ff00ff7f" } diff --git a/tests/snapshots/IrcMessageHandler/simple.json b/tests/snapshots/IrcMessageHandler/simple.json index f00ef1e2..577f043b 100644 --- a/tests/snapshots/IrcMessageHandler/simple.json +++ b/tests/snapshots/IrcMessageHandler/simple.json @@ -2,13 +2,6 @@ "input": "@badge-info=subscriber/17;badges=subscriber/12,no_audio/1;color=#EBA2C0;display-name=jammehcow;emote-only=1;emotes=25:0-4;first-msg=0;flags=;id=9c2dd916-5a6d-4c1f-9fe7-a081b62a9c6b;mod=0;returning-chatter=0;room-id=11148817;subscriber=1;tmi-sent-ts=1662201093248;turbo=0;user-id=82674227;user-type= :jammehcow!jammehcow@jammehcow.tmi.twitch.tv PRIVMSG #pajlada :Kappa", "output": [ { - "badgeInfos": { - "subscriber": "17" - }, - "badges": [ - "subscriber", - "no_audio" - ], "channelName": "pajlada", "count": 1, "displayName": "jammehcow", @@ -141,6 +134,13 @@ "searchText": "jammehcow jammehcow: Kappa ", "serverReceivedTime": "2022-09-03T10:31:33Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "17" + }, + "twitchBadges": [ + "subscriber", + "no_audio" + ], "userID": "82674227", "usernameColor": "#ffeba2c0" } diff --git a/tests/snapshots/IrcMessageHandler/sub-first-gift.json b/tests/snapshots/IrcMessageHandler/sub-first-gift.json index 6691aab9..038f1481 100644 --- a/tests/snapshots/IrcMessageHandler/sub-first-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-first-gift.json @@ -2,10 +2,6 @@ "input": "@badges=subscriber/0,premium/1;color=#00FF7F;display-name=hyperbolicxd;emotes=;id=b20ef4fe-cba8-41d0-a371-6327651dc9cc;login=hyperbolicxd;mod=0;msg-id=subgift;msg-param-months=1;msg-param-recipient-display-name=quote_if_nam;msg-param-recipient-id=217259245;msg-param-recipient-user-name=quote_if_nam;msg-param-sender-count=1;msg-param-sub-plan-name=Channel\\sSubscription\\s(nymn_hs);msg-param-sub-plan=1000;room-id=62300805;subscriber=1;system-msg=hyperbolicxd\\sgifted\\sa\\sTier\\s1\\ssub\\sto\\squote_if_nam!\\sThis\\sis\\stheir\\sfirst\\sGift\\sSub\\sin\\sthe\\schannel!;tmi-sent-ts=1528190938558;turbo=0;user-id=111534250;user-type= :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -127,6 +123,10 @@ "searchText": "hyperbolicxd gifted a Tier 1 sub to quote_if_nam! This is their first Gift Sub in the channel!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-first-time.json b/tests/snapshots/IrcMessageHandler/sub-first-time.json index 7be9a3ad..582c8811 100644 --- a/tests/snapshots/IrcMessageHandler/sub-first-time.json +++ b/tests/snapshots/IrcMessageHandler/sub-first-time.json @@ -2,10 +2,6 @@ "input": "@badges=subscriber/0,premium/1;color=#0000FF;display-name=byebyeheart;emotes=;id=fe390424-ab89-4c33-bb5a-53c6e5214b9f;login=byebyeheart;mod=0;msg-id=sub;msg-param-months=0;msg-param-sub-plan-name=Dakotaz;msg-param-sub-plan=Prime;room-id=39298218;subscriber=0;system-msg=byebyeheart\\sjust\\ssubscribed\\swith\\sTwitch\\sPrime!;tmi-sent-ts=1528190963670;turbo=0;user-id=131956000;user-type= :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -84,6 +80,10 @@ "searchText": "byebyeheart just subscribed with Twitch Prime!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-gift-02.json b/tests/snapshots/IrcMessageHandler/sub-gift-02.json index c44ffe37..8e095f21 100644 --- a/tests/snapshots/IrcMessageHandler/sub-gift-02.json +++ b/tests/snapshots/IrcMessageHandler/sub-gift-02.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1751793597378;subscriber=1;id=ac51c358-0525-468f-9e0f-e9f2b7953c29;room-id=11148817;user-id=11148817;login=pajlada;display-name=pajlada;badges=broadcaster/1,subscriber/3072,partner/1;badge-info=subscriber/114;color=#CC44FF;flags=;user-type=;emotes=;msg-param-sub-plan-name=look\\sat\\sthose\\sshitty\\semotes,\\srip\\s$5\\sLUL;msg-param-gift-months=1;system-msg=pajlada\\sgifted\\sa\\sTier\\s1\\ssub\\sto\\srustafur!;msg-param-months=6;msg-param-origin-id=4645652708379472175;msg-param-recipient-id=27787997;msg-param-sub-plan=1000;msg-id=subgift;msg-param-recipient-display-name=rustafur;msg-param-recipient-user-name=rustafur;msg-param-community-gift-id=4645652708379472175;msg-param-sender-count=0 :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -118,6 +114,10 @@ "searchText": "pajlada gifted a Tier 1 sub to rustafur!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-gift.json b/tests/snapshots/IrcMessageHandler/sub-gift.json index 313830ae..ee60cc2d 100644 --- a/tests/snapshots/IrcMessageHandler/sub-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-gift.json @@ -2,10 +2,6 @@ "input": "@badges=staff/1,premium/1;color=#0000FF;display-name=TWW2;emotes=;id=e9176cd8-5e22-4684-ad40-ce53c2561c5e;login=tww2;mod=0;msg-id=subgift;msg-param-months=1;msg-param-recipient-display-name=Mr_Woodchuck;msg-param-recipient-id=89614178;msg-param-recipient-name=mr_woodchuck;msg-param-sub-plan-name=House\\sof\\sNyoro~n;msg-param-sub-plan=1000;room-id=19571752;subscriber=0;system-msg=TWW2\\sgifted\\sa\\sTier\\s1\\ssub\\sto\\sMr_Woodchuck!;tmi-sent-ts=1521159445153;turbo=0;user-id=13405587;user-type=staff :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -118,6 +114,10 @@ "searchText": "TWW2 gifted a Tier 1 sub to Mr_Woodchuck!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-message-user-color-override.json b/tests/snapshots/IrcMessageHandler/sub-message-user-color-override.json index e2632033..6676cdca 100644 --- a/tests/snapshots/IrcMessageHandler/sub-message-user-color-override.json +++ b/tests/snapshots/IrcMessageHandler/sub-message-user-color-override.json @@ -2,13 +2,6 @@ "input": "@badges=staff/1,broadcaster/1,turbo/1;color=#008000;display-name=ronni;emotes=;id=db25007f-7a18-43eb-9379-80131e44d633;login=ronni;mod=0;msg-id=resub;msg-param-months=6;msg-param-sub-plan=Prime;msg-param-sub-plan-name=Prime;room-id=11148817;subscriber=1;system-msg=ronni\\shas\\ssubscribed\\sfor\\s6\\smonths!;tmi-sent-ts=1507246572675;turbo=1;user-id=1337;user-type=staff :tmi.twitch.tv USERNOTICE #pajlada :Great stream -- keep it up!", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "broadcaster", - "turbo" - ], "channelName": "pajlada", "count": 1, "displayName": "ronni", @@ -182,14 +175,17 @@ "searchText": "ronni ronni: Great stream -- keep it up! ", "serverReceivedTime": "2017-10-05T23:36:12Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "broadcaster", + "turbo" + ], "userID": "1337", "usernameColor": "#ffff00ff" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -268,6 +264,10 @@ "searchText": "ronni has subscribed for 6 months!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-message.json b/tests/snapshots/IrcMessageHandler/sub-message.json index 10722a98..b2f765ed 100644 --- a/tests/snapshots/IrcMessageHandler/sub-message.json +++ b/tests/snapshots/IrcMessageHandler/sub-message.json @@ -2,13 +2,6 @@ "input": "@badges=staff/1,broadcaster/1,turbo/1;color=#008000;display-name=ronni;emotes=;id=db25007f-7a18-43eb-9379-80131e44d633;login=ronni;mod=0;msg-id=resub;msg-param-months=6;msg-param-sub-plan=Prime;msg-param-sub-plan-name=Prime;room-id=11148817;subscriber=1;system-msg=ronni\\shas\\ssubscribed\\sfor\\s6\\smonths!;tmi-sent-ts=1507246572675;turbo=1;user-id=1337;user-type=staff :tmi.twitch.tv USERNOTICE #pajlada :Great stream -- keep it up!", "output": [ { - "badgeInfos": { - }, - "badges": [ - "staff", - "broadcaster", - "turbo" - ], "channelName": "pajlada", "count": 1, "displayName": "ronni", @@ -182,14 +175,17 @@ "searchText": "ronni ronni: Great stream -- keep it up! ", "serverReceivedTime": "2017-10-05T23:36:12Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + "staff", + "broadcaster", + "turbo" + ], "userID": "1337", "usernameColor": "#ff008000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -268,6 +264,10 @@ "searchText": "ronni has subscribed for 6 months!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json index 051089c4..a0b98125 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json @@ -2,10 +2,6 @@ "input": "@msg-param-goal-user-contributions=1;system-msg=An\\sanonymous\\suser\\sgifted\\sa\\sTier\\s1\\ssub\\sto\\sMohammadrezaDH!\\s;msg-param-goal-current-contributions=2;vip=0;color=;user-id=274598607;mod=0;flags=;msg-param-months=2;historical=1;id=afa2155b-f563-4973-a5c2-e4075882bbfb;msg-param-gift-months=6;msg-id=subgift;badge-info=;msg-param-recipient-user-name=mohammadrezadh;login=ananonymousgifter;room-id=441388138;msg-param-goal-target-contributions=25;rm-received-ts=1712002037736;msg-param-recipient-id=204174899;emotes=;display-name=AnAnonymousGifter;badges=;msg-param-fun-string=FunStringFive;msg-param-goal-contribution-type=NEW_SUB_POINTS;msg-param-origin-id=8862142563198473546;msg-param-recipient-display-name=MohammadrezaDH;msg-param-sub-plan-name=jmarxists;user-type=;subscriber=0;tmi-sent-ts=1712002037615;msg-param-sub-plan=1000;msg-param-goal-description=day\\slee\\sgoal\\s:-) :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -106,6 +102,10 @@ "searchText": "An anonymous user gifted 6 months of a Tier 1 sub to MohammadrezaDH!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json index ef2ce1c1..728e918b 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json @@ -2,10 +2,6 @@ "input": "@badge-info=subscriber/32;badges=subscriber/3030,sub-gift-leader/2;color=#FF8EA3;display-name=iNatsuFN;emotes=;flags=;id=0d0decbd-b8f4-4e83-9e18-eca9cab69153;login=inatsufn;mod=0;msg-id=subgift;msg-param-gift-months=6;msg-param-goal-contribution-type=SUBS;msg-param-goal-current-contributions=881;msg-param-goal-target-contributions=900;msg-param-goal-user-contributions=1;msg-param-months=16;msg-param-origin-id=2524053421157386961;msg-param-recipient-display-name=kimmi_tm;msg-param-recipient-id=225806893;msg-param-recipient-user-name=kimmi_tm;msg-param-sender-count=334;msg-param-sub-plan-name=Channel\\sSubscription\\s(mxddy);msg-param-sub-plan=1000;room-id=210915729;subscriber=1;system-msg=iNatsuFN\\sgifted\\s6\\smonths\\sof\\sTier\\s1\\sto\\skimmi_tm.\\sThey've\\sgifted\\s334\\smonths\\sin\\sthe\\schannel!;tmi-sent-ts=1712034497332;user-id=218205938;user-type=;vip=0 :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -128,6 +124,10 @@ "searchText": "iNatsuFN gifted 6 months of a Tier 1 sub to kimmi_tm! They've gifted 334 months in the channel.", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json index fed9462d..38061803 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json @@ -2,10 +2,6 @@ "input": "@user-id=35759863;msg-param-origin-id=2862055070165643340;display-name=Lucidfoxx;id=eeb3cdb8-337c-413a-9521-3a884ff78754;msg-param-gift-months=12;msg-param-sub-plan=1000;vip=0;emotes=;badges=broadcaster/1,subscriber/3042,partner/1;msg-param-recipient-user-name=ogprodigy;msg-param-recipient-id=53888434;badge-info=subscriber/71;room-id=35759863;msg-param-recipient-display-name=OGprodigy;msg-param-sub-plan-name=Silver\\sPackage;subscriber=1;system-msg=Lucidfoxx\\sgifted\\sa\\sTier\\s1\\ssub\\sto\\sOGprodigy!;login=lucidfoxx;msg-param-sender-count=0;user-type=;mod=0;flags=;rm-received-ts=1712803947891;color=#EB078D;msg-param-months=15;tmi-sent-ts=1712803947773;msg-id=subgift :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -121,6 +117,10 @@ "searchText": "Lucidfoxx gifted 12 months of a Tier 1 sub to OGprodigy!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json index d1fe1fc9..ae6aea82 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json @@ -2,10 +2,6 @@ "input": "@system-msg=calm__like_a_tom\\ssubscribed\\sat\\sTier\\s3.\\sThey've\\ssubscribed\\sfor\\s9\\smonths!;msg-param-cumulative-months=9;mod=0;msg-param-should-share-streak=0;msg-param-sub-plan-name=Executive\\sProducer;color=#0000FF;msg-param-months=0;msg-param-multimonth-duration=6;user-type=;flags=;msg-id=resub;user-id=609242230;room-id=11148817;msg-param-multimonth-tenure=0;msg-param-sub-plan=3000;emotes=;badge-info=subscriber/9;msg-param-was-gifted=false;id=4a6e270c-8cdb-46e9-b602-f8177a79d472;badges=subscriber/3009;display-name=calm__like_a_tom;tmi-sent-ts=1725938011176;login=calm__like_a_tom;vip=0;subscriber=1 :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -94,6 +90,10 @@ "searchText": "calm__like_a_tom subscribed at Tier 3 for 6 months in advance, reaching 9 months cumulatively so far!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month.json b/tests/snapshots/IrcMessageHandler/sub-multi-month.json index 3bd53024..470e2244 100644 --- a/tests/snapshots/IrcMessageHandler/sub-multi-month.json +++ b/tests/snapshots/IrcMessageHandler/sub-multi-month.json @@ -2,10 +2,6 @@ "input": "@badge-info=subscriber/1;badges=subscriber/0;emotes=;msg-param-sub-plan=1000;msg-param-months=0;mod=0;login=foly__;room-id=11148817;flags=;user-id=441166175;msg-param-multimonth-tenure=0;msg-param-should-share-streak=0;system-msg=foly__\\ssubscribed\\sat\\sTier\\s1.;msg-id=sub;display-name=foly__;msg-param-sub-plan-name=Channel\\sSubscription\\s(k4sen);user-type=;id=327249bb-81bc-4f87-8b43-c05720a2dd64;msg-param-was-gifted=false;tmi-sent-ts=1728710962985;msg-param-cumulative-months=1;vip=0;color=;subscriber=1;msg-param-multimonth-duration=6 :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -88,6 +84,10 @@ "searchText": "foly__ subscribed at Tier 1 for 6 months in advance!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/sub-no-message.json b/tests/snapshots/IrcMessageHandler/sub-no-message.json index 48e48bf0..abdc978b 100644 --- a/tests/snapshots/IrcMessageHandler/sub-no-message.json +++ b/tests/snapshots/IrcMessageHandler/sub-no-message.json @@ -2,10 +2,6 @@ "input": "@badges=subscriber/12;color=#CC00C2;display-name=cspice;emotes=;id=6fc4c3e0-ca61-454a-84b8-5669dee69fc9;login=cspice;mod=0;msg-id=resub;msg-param-months=12;msg-param-sub-plan-name=Channel\\sSubscription\\s(forsenlol):\\s$9.99\\sSub;msg-param-sub-plan=2000;room-id=22484632;subscriber=1;system-msg=cspice\\sjust\\ssubscribed\\swith\\sa\\sTier\\s2\\ssub.\\scspice\\ssubscribed\\sfor\\s12\\smonths\\sin\\sa\\srow!;tmi-sent-ts=1528192510808;turbo=0;user-id=47894662;user-type= :tmi.twitch.tv USERNOTICE #pajlada", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -125,6 +121,10 @@ "searchText": "cspice just subscribed with a Tier 2 sub. cspice subscribed for 12 months in a row!", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json index c537de6a..d90505d8 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json @@ -2,10 +2,6 @@ "input": "@target-user-id=141981764;ban-duration=600;historical=1;room-id=111448817;rm-received-ts=1736968967915;tmi-sent-ts=1736968967813 :tmi.twitch.tv CLEARCHAT #pajlada twitchdev", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 3, "displayName": "", @@ -84,14 +80,14 @@ "searchText": "twitchdev has been timed out for 10m. (3 times) ", "serverReceivedTime": "2025-01-15T19:22:47Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "TwitchDev", @@ -201,6 +197,10 @@ "searchText": "twitchdev twitchdev: 1 ", "serverReceivedTime": "2025-01-15T19:22:45Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "141981764", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json index e2bdcdf1..3c9fa0e9 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json @@ -2,10 +2,6 @@ "input": "@target-user-id=141981764;ban-duration=600;historical=1;room-id=111448817;rm-received-ts=1736968967915;tmi-sent-ts=1736968967813 :tmi.twitch.tv CLEARCHAT #pajlada twitchdev", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 3, "displayName": "", @@ -84,14 +80,14 @@ "searchText": "twitchdev has been timed out for 10m. (3 times) ", "serverReceivedTime": "2025-01-15T19:22:47Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "TwitchDev", @@ -201,6 +197,10 @@ "searchText": "twitchdev twitchdev: 1 ", "serverReceivedTime": "2025-01-15T19:22:45Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "141981764", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json b/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json index a56d827c..cca90e73 100644 --- a/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json +++ b/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json @@ -2,10 +2,6 @@ "input": "@target-user-id=141981764;ban-duration=600;historical=1;room-id=111448817;rm-received-ts=1736968967915;tmi-sent-ts=1736968967813 :tmi.twitch.tv CLEARCHAT #pajlada twitchdev", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -82,14 +78,14 @@ "searchText": "twitchdev has been timed out for 10m. ", "serverReceivedTime": "2025-01-15T19:22:44Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "pajlada", "count": 1, "displayName": "TwitchDev", @@ -199,14 +195,14 @@ "searchText": "twitchdev twitchdev: 1 ", "serverReceivedTime": "2025-01-15T19:22:45Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "141981764", "usernameColor": "#ffff0000" }, { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 2, "displayName": "", @@ -285,6 +281,10 @@ "searchText": "twitchdev has been timed out for 10m. (2 times) ", "serverReceivedTime": "2025-01-15T19:22:47Z", "timeoutUser": "twitchdev", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/timeout.json b/tests/snapshots/IrcMessageHandler/timeout.json index 29968e27..9c6d12de 100644 --- a/tests/snapshots/IrcMessageHandler/timeout.json +++ b/tests/snapshots/IrcMessageHandler/timeout.json @@ -2,10 +2,6 @@ "input": "@tmi-sent-ts=1729628658012;rm-received-ts=1729628658106;historical=1;ban-duration=1;room-id=11148817;target-user-id=129546453 :tmi.twitch.tv CLEARCHAT #pajlada nerixyz", "output": [ { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -82,6 +78,10 @@ "searchText": "nerixyz has been timed out for 1s. ", "serverReceivedTime": "2024-10-22T20:24:18Z", "timeoutUser": "nerixyz", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/IrcMessageHandler/username-localized.json b/tests/snapshots/IrcMessageHandler/username-localized.json index 97e961d7..7adac0de 100644 --- a/tests/snapshots/IrcMessageHandler/username-localized.json +++ b/tests/snapshots/IrcMessageHandler/username-localized.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726916057144;subscriber=1;id=3ad26770-7299-4261-ab9b-24f410944517;room-id=11148817;user-id=117166826;display-name=display-name=테스트계정420;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=mod;emotes= :testaccount_420!testaccount_420@testaccount_420.tmi.twitch.tv PRIVMSG #pajlada :username", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "testaccount_420", @@ -107,6 +101,12 @@ "searchText": "display-name=테스트계정420 display-name=테스트계정420 testaccount_420: username ", "serverReceivedTime": "2024-09-21T10:54:17Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "117166826", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/username-localized2.json b/tests/snapshots/IrcMessageHandler/username-localized2.json index 27dbf015..7569b1dc 100644 --- a/tests/snapshots/IrcMessageHandler/username-localized2.json +++ b/tests/snapshots/IrcMessageHandler/username-localized2.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726916057144;subscriber=1;id=3ad26770-7299-4261-ab9b-24f410944517;room-id=11148817;user-id=117166826;display-name=testaccount_420;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=mod;emotes= :testaccount_420!testaccount_420@testaccount_420.tmi.twitch.tv PRIVMSG #pajlada :username", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "testaccount_420", @@ -107,6 +101,12 @@ "searchText": "testaccount_420 testaccount_420: username ", "serverReceivedTime": "2024-09-21T10:54:17Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "117166826", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/username.json b/tests/snapshots/IrcMessageHandler/username.json index 418b1475..ca1bdd5e 100644 --- a/tests/snapshots/IrcMessageHandler/username.json +++ b/tests/snapshots/IrcMessageHandler/username.json @@ -2,12 +2,6 @@ "input": "@tmi-sent-ts=1726916057144;subscriber=1;id=3ad26770-7299-4261-ab9b-24f410944517;room-id=11148817;user-id=117166826;display-name=display-name=테스트계정420;badges=subscriber/24;badge-info=subscriber/27;color=#FF0000;flags=;user-type=mod;emotes= :testaccount_420!testaccount_420@testaccount_420.tmi.twitch.tv PRIVMSG #pajlada :username", "output": [ { - "badgeInfos": { - "subscriber": "27" - }, - "badges": [ - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "testaccount_420", @@ -107,6 +101,12 @@ "searchText": "testaccount_420 display-name=테스트계정420 testaccount_420: username ", "serverReceivedTime": "2024-09-21T10:54:17Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "27" + }, + "twitchBadges": [ + "subscriber" + ], "userID": "117166826", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/IrcMessageHandler/vip.json b/tests/snapshots/IrcMessageHandler/vip.json index 120a53ad..b89bd1d6 100644 --- a/tests/snapshots/IrcMessageHandler/vip.json +++ b/tests/snapshots/IrcMessageHandler/vip.json @@ -2,13 +2,6 @@ "input": "@tmi-sent-ts=1726920321214;subscriber=1;vip=1;id=97bb0dfb-a35f-446d-8634-7522d8ef73ed;room-id=11148817;user-id=129546453;display-name=nerixyz;badges=vip/1,subscriber/48;badge-info=subscriber/64;color=#FF0000;flags=;user-type=;emotes= :nerixyz!nerixyz@nerixyz.tmi.twitch.tv PRIVMSG #pajlada :a", "output": [ { - "badgeInfos": { - "subscriber": "64" - }, - "badges": [ - "vip", - "subscriber" - ], "channelName": "pajlada", "count": 1, "displayName": "nerixyz", @@ -138,6 +131,13 @@ "searchText": "nerixyz nerixyz: a ", "serverReceivedTime": "2024-09-21T12:05:21Z", "timeoutUser": "", + "twitchBadgeInfos": { + "subscriber": "64" + }, + "twitchBadges": [ + "vip", + "subscriber" + ], "userID": "129546453", "usernameColor": "#ffff0000" } diff --git a/tests/snapshots/PluginMessageCtor/empty.json b/tests/snapshots/PluginMessageCtor/empty.json index 15cdc4de..a4f3a051 100644 --- a/tests/snapshots/PluginMessageCtor/empty.json +++ b/tests/snapshots/PluginMessageCtor/empty.json @@ -1,10 +1,6 @@ { "input": "msg = {}", "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -19,6 +15,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/linebreak-element.json b/tests/snapshots/PluginMessageCtor/linebreak-element.json index 323b16f2..8ee99b4a 100644 --- a/tests/snapshots/PluginMessageCtor/linebreak-element.json +++ b/tests/snapshots/PluginMessageCtor/linebreak-element.json @@ -8,10 +8,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -66,6 +62,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/mention-element.json b/tests/snapshots/PluginMessageCtor/mention-element.json index 0065d15c..1aa3477e 100644 --- a/tests/snapshots/PluginMessageCtor/mention-element.json +++ b/tests/snapshots/PluginMessageCtor/mention-element.json @@ -8,10 +8,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -98,6 +94,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/properties.json b/tests/snapshots/PluginMessageCtor/properties.json index ee74346e..98a57b2b 100644 --- a/tests/snapshots/PluginMessageCtor/properties.json +++ b/tests/snapshots/PluginMessageCtor/properties.json @@ -24,10 +24,6 @@ "}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "channel", "count": 1, "displayName": "display", @@ -59,6 +55,10 @@ "searchText": "search", "serverReceivedTime": "1970-01-01T00:20:30Z", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "user-id", "usernameColor": "#ff0000ff" } diff --git a/tests/snapshots/PluginMessageCtor/reply-curve-element.json b/tests/snapshots/PluginMessageCtor/reply-curve-element.json index e5fbe549..2935035e 100644 --- a/tests/snapshots/PluginMessageCtor/reply-curve-element.json +++ b/tests/snapshots/PluginMessageCtor/reply-curve-element.json @@ -8,10 +8,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -66,6 +62,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/single-line-text-element.json b/tests/snapshots/PluginMessageCtor/single-line-text-element.json index d9e088e5..505ffef2 100644 --- a/tests/snapshots/PluginMessageCtor/single-line-text-element.json +++ b/tests/snapshots/PluginMessageCtor/single-line-text-element.json @@ -14,10 +14,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -183,6 +179,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/text-element.json b/tests/snapshots/PluginMessageCtor/text-element.json index 8cb8157d..6d629117 100644 --- a/tests/snapshots/PluginMessageCtor/text-element.json +++ b/tests/snapshots/PluginMessageCtor/text-element.json @@ -14,10 +14,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -183,6 +179,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/timestamp-element.json b/tests/snapshots/PluginMessageCtor/timestamp-element.json index 198ca278..34595fc9 100644 --- a/tests/snapshots/PluginMessageCtor/timestamp-element.json +++ b/tests/snapshots/PluginMessageCtor/timestamp-element.json @@ -8,10 +8,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -134,6 +130,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/snapshots/PluginMessageCtor/twitch-moderation.json b/tests/snapshots/PluginMessageCtor/twitch-moderation.json index 7f583343..24ed89f8 100644 --- a/tests/snapshots/PluginMessageCtor/twitch-moderation.json +++ b/tests/snapshots/PluginMessageCtor/twitch-moderation.json @@ -8,10 +8,6 @@ "}}" ], "output": { - "badgeInfos": { - }, - "badges": [ - ], "channelName": "", "count": 1, "displayName": "", @@ -66,6 +62,10 @@ "searchText": "", "serverReceivedTime": "", "timeoutUser": "", + "twitchBadgeInfos": { + }, + "twitchBadges": [ + ], "userID": "", "usernameColor": "#ff000000" } diff --git a/tests/src/HighlightController.cpp b/tests/src/HighlightController.cpp index 4f9aee45..165f9b8d 100644 --- a/tests/src/HighlightController.cpp +++ b/tests/src/HighlightController.cpp @@ -166,7 +166,7 @@ struct TestCase { // TODO: create one of these from a raw irc message? hmm xD struct { MessageParseArgs args; - std::vector badges; + std::vector badges; QString senderName; QString originalMessage; MessageFlags flags; diff --git a/tests/src/TwitchIrc.cpp b/tests/src/TwitchIrc.cpp index 8cdfdd50..e5989502 100644 --- a/tests/src/TwitchIrc.cpp +++ b/tests/src/TwitchIrc.cpp @@ -90,7 +90,7 @@ TEST(TwitchIrc, BadgeInfoParsing) struct TestCase { QByteArray input; std::unordered_map expectedBadgeInfo; - std::vector expectedBadges; + std::vector expectedBadges; }; std::vector testCases{ @@ -100,7 +100,7 @@ TEST(TwitchIrc, BadgeInfoParsing) {"predictions", R"(<<<<<<\sHEAD[15A⸝asdf/test)"}, }, { - Badge{"predictions", "pink-2"}, + TwitchBadge{"predictions", "pink-2"}, }, }, { @@ -110,10 +110,10 @@ TEST(TwitchIrc, BadgeInfoParsing) {"founder", "17"}, }, { - Badge{"predictions", "pink-2"}, - Badge{"vip", "1"}, - Badge{"founder", "0"}, - Badge{"bits", "1"}, + TwitchBadge{"predictions", "pink-2"}, + TwitchBadge{"vip", "1"}, + TwitchBadge{"founder", "0"}, + TwitchBadge{"bits", "1"}, }, }, { @@ -122,9 +122,9 @@ TEST(TwitchIrc, BadgeInfoParsing) {"predictions", "foo/bar/baz"}, }, { - Badge{"predictions", "blue-1"}, - Badge{"moderator", "1"}, - Badge{"glhf-pledge", "1"}, + TwitchBadge{"predictions", "blue-1"}, + TwitchBadge{"moderator", "1"}, + TwitchBadge{"glhf-pledge", "1"}, }, }, { @@ -133,9 +133,9 @@ TEST(TwitchIrc, BadgeInfoParsing) {"subscriber", "22"}, }, { - Badge{"broadcaster", "1"}, - Badge{"subscriber", "18"}, - Badge{"glhf-pledge", "1"}, + TwitchBadge{"broadcaster", "1"}, + TwitchBadge{"subscriber", "18"}, + TwitchBadge{"glhf-pledge", "1"}, }, }, };