diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2211d09..c5c6921d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Minor: Remove incognito browser support for `opera/launcher` (this should no longer be a thing). (#5805)
 - Minor: Remove incognito browser support for `iexplore`, because internet explorer is EOL. (#5810)
 - Minor: When (re-)connecting, visible channels are now joined first. (#5850)
+- Minor: Added the ability to filter on messages by the author's user ID (example: `author.user_id == "22484632"`). (#5862)
 - Bugfix: Fixed a potential way to escape the Lua Plugin sandbox. (#5846)
 - Bugfix: Fixed a crash relating to Lua HTTP. (#5800)
 - Bugfix: Fixed a crash that could occur on Linux and macOS when clicking "Install" from the update prompt. (#5818)
diff --git a/src/controllers/filters/lang/Filter.cpp b/src/controllers/filters/lang/Filter.cpp
index 57e45539..24704031 100644
--- a/src/controllers/filters/lang/Filter.cpp
+++ b/src/controllers/filters/lang/Filter.cpp
@@ -14,6 +14,7 @@ const QMap<QString, Type> MESSAGE_TYPING_CONTEXT{
     {"author.badges", Type::StringList},
     {"author.color", Type::Color},
     {"author.name", Type::String},
+    {"author.user_id", Type::String},
     {"author.no_color", Type::Bool},
     {"author.subbed", Type::Bool},
     {"author.sub_length", Type::Int},
@@ -60,6 +61,7 @@ ContextMap buildContextMap(const MessagePtr &m, chatterino::Channel *channel)
      * author.badges
      * author.color
      * author.name
+     * author.user_id
      * author.no_color
      * author.subbed
      * author.sub_length
@@ -121,6 +123,7 @@ ContextMap buildContextMap(const MessagePtr &m, chatterino::Channel *channel)
         {"author.badges", std::move(badges)},
         {"author.color", m->usernameColor},
         {"author.name", m->displayName},
+        {"author.user_id", m->userID},
         {"author.no_color", !m->usernameColor.isValid()},
         {"author.subbed", subscribed},
         {"author.sub_length", subLength},
diff --git a/src/controllers/filters/lang/Tokenizer.cpp b/src/controllers/filters/lang/Tokenizer.cpp
index 4b8890fe..fa39cf22 100644
--- a/src/controllers/filters/lang/Tokenizer.cpp
+++ b/src/controllers/filters/lang/Tokenizer.cpp
@@ -20,6 +20,7 @@ const QMap<QString, QString> VALID_IDENTIFIERS_MAP{
     {"author.badges", "author badges"},
     {"author.color", "author color"},
     {"author.name", "author name"},
+    {"author.user_id", "author user id"},
     {"author.no_color", "author has no color?"},
     {"author.subbed", "author subscribed?"},
     {"author.sub_length", "author sub length"},
diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp
index 8d3d201b..7990500c 100644
--- a/src/messages/Message.cpp
+++ b/src/messages/Message.cpp
@@ -100,6 +100,7 @@ QJsonObject Message::toJson() const
         {"loginName"_L1, this->loginName},
         {"displayName"_L1, this->displayName},
         {"localizedName"_L1, this->localizedName},
+        {"userID"_L1, this->userID},
         {"timeoutUser"_L1, this->timeoutUser},
         {"channelName"_L1, this->channelName},
         {"usernameColor"_L1, this->usernameColor.name(QColor::HexArgb)},
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index 19ccd60f..afc1b528 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -47,6 +47,7 @@ struct Message {
     QString loginName;
     QString displayName;
     QString localizedName;
+    QString userID;
     QString timeoutUser;
     QString channelName;
     QColor usernameColor;
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
index 6508dd19..e471102e 100644
--- a/src/messages/MessageBuilder.cpp
+++ b/src/messages/MessageBuilder.cpp
@@ -2102,6 +2102,7 @@ std::pair<MessagePtrMut, HighlightAlert> MessageBuilder::makeIrcMessage(
 
     MessageBuilder builder;
     builder.parseUsernameColor(tags, userID);
+    builder->userID = userID;
 
     if (args.isAction)
     {
diff --git a/tests/snapshots/IrcMessageHandler/action.json b/tests/snapshots/IrcMessageHandler/action.json
index f70f3ed4..f130c2b6 100644
--- a/tests/snapshots/IrcMessageHandler/action.json
+++ b/tests/snapshots/IrcMessageHandler/action.json
@@ -185,6 +185,7 @@
             "searchText": "pajlada  pajlada: Kappa ",
             "serverReceivedTime": "2022-09-03T11:57:15Z",
             "timeoutUser": "",
+            "userID": "11148817",
             "usernameColor": "#ffcc44ff"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/all-usernames.json b/tests/snapshots/IrcMessageHandler/all-usernames.json
index 69111a17..1b88636c 100644
--- a/tests/snapshots/IrcMessageHandler/all-usernames.json
+++ b/tests/snapshots/IrcMessageHandler/all-usernames.json
@@ -288,6 +288,7 @@
             "searchText": "nerixyz  nerixyz: @TwitchDev TwitchDev UserColor @UserColor UserColor! UserColorKappa UserChatter usercolor UserColor2 @UserColor2 ?! ",
             "serverReceivedTime": "2024-09-18T19:58:38Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/announcement.json b/tests/snapshots/IrcMessageHandler/announcement.json
index 25591253..aa77214f 100644
--- a/tests/snapshots/IrcMessageHandler/announcement.json
+++ b/tests/snapshots/IrcMessageHandler/announcement.json
@@ -160,6 +160,7 @@
             "searchText": "supinic  supinic: mm test lol ",
             "serverReceivedTime": "2022-03-31T21:30:19Z",
             "timeoutUser": "",
+            "userID": "31400525",
             "usernameColor": "#ffff0000"
         },
         {
@@ -222,6 +223,7 @@
             "searchText": "Announcement",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes.json b/tests/snapshots/IrcMessageHandler/bad-emotes.json
index 86714b02..aed8056c 100644
--- a/tests/snapshots/IrcMessageHandler/bad-emotes.json
+++ b/tests/snapshots/IrcMessageHandler/bad-emotes.json
@@ -153,6 +153,7 @@
             "searchText": "mm2pl  mm2pl: Kappa ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "117691339",
             "usernameColor": "#ffdaa521"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes2.json b/tests/snapshots/IrcMessageHandler/bad-emotes2.json
index fa8cb19e..6b1ddf86 100644
--- a/tests/snapshots/IrcMessageHandler/bad-emotes2.json
+++ b/tests/snapshots/IrcMessageHandler/bad-emotes2.json
@@ -153,6 +153,7 @@
             "searchText": "mm2pl  mm2pl: Kappa ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "117691339",
             "usernameColor": "#ffdaa521"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes3.json b/tests/snapshots/IrcMessageHandler/bad-emotes3.json
index e0fa33d6..8a00f703 100644
--- a/tests/snapshots/IrcMessageHandler/bad-emotes3.json
+++ b/tests/snapshots/IrcMessageHandler/bad-emotes3.json
@@ -115,6 +115,7 @@
             "searchText": "test  test: foo bar ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/bad-emotes4.json b/tests/snapshots/IrcMessageHandler/bad-emotes4.json
index 34d7c7b8..977a835f 100644
--- a/tests/snapshots/IrcMessageHandler/bad-emotes4.json
+++ b/tests/snapshots/IrcMessageHandler/bad-emotes4.json
@@ -115,6 +115,7 @@
             "searchText": "test  test: foo bar ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/badges-invalid.json b/tests/snapshots/IrcMessageHandler/badges-invalid.json
index 3680b198..1a225968 100644
--- a/tests/snapshots/IrcMessageHandler/badges-invalid.json
+++ b/tests/snapshots/IrcMessageHandler/badges-invalid.json
@@ -222,6 +222,7 @@
             "searchText": "badgy  badgy: badge ",
             "serverReceivedTime": "2024-09-19T16:40:56Z",
             "timeoutUser": "",
+            "userID": "123456",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/badges.json b/tests/snapshots/IrcMessageHandler/badges.json
index 313cf600..fdbfbe02 100644
--- a/tests/snapshots/IrcMessageHandler/badges.json
+++ b/tests/snapshots/IrcMessageHandler/badges.json
@@ -223,6 +223,7 @@
             "searchText": "badgy  badgy: badge ",
             "serverReceivedTime": "2024-09-19T16:40:56Z",
             "timeoutUser": "",
+            "userID": "123456",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/bitsbadge.json b/tests/snapshots/IrcMessageHandler/bitsbadge.json
index 07029349..c7603f4d 100644
--- a/tests/snapshots/IrcMessageHandler/bitsbadge.json
+++ b/tests/snapshots/IrcMessageHandler/bitsbadge.json
@@ -85,6 +85,7 @@
             "searchText": "whoopiix just earned a new 1K Bits badge!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/cheer1.json b/tests/snapshots/IrcMessageHandler/cheer1.json
index 2b013c0a..a74ae46c 100644
--- a/tests/snapshots/IrcMessageHandler/cheer1.json
+++ b/tests/snapshots/IrcMessageHandler/cheer1.json
@@ -576,6 +576,7 @@
             "searchText": "slyckity  slyckity: Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c ",
             "serverReceivedTime": "2019-09-07T02:44:33Z",
             "timeoutUser": "",
+            "userID": "143114011",
             "usernameColor": "#ff0000ff"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/cheer2.json b/tests/snapshots/IrcMessageHandler/cheer2.json
index b8ffa059..ee853d97 100644
--- a/tests/snapshots/IrcMessageHandler/cheer2.json
+++ b/tests/snapshots/IrcMessageHandler/cheer2.json
@@ -222,6 +222,7 @@
             "searchText": "slyckity  slyckity: Cheer1 a Cheer1 Cheer1 Cheer1 Cheer1 b c ",
             "serverReceivedTime": "2019-09-07T02:44:33Z",
             "timeoutUser": "",
+            "userID": "143114011",
             "usernameColor": "#ff0000ff"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/cheer3.json b/tests/snapshots/IrcMessageHandler/cheer3.json
index 33b474a4..f248ace5 100644
--- a/tests/snapshots/IrcMessageHandler/cheer3.json
+++ b/tests/snapshots/IrcMessageHandler/cheer3.json
@@ -205,6 +205,7 @@
             "searchText": "slyckity  slyckity: Cheer100 ",
             "serverReceivedTime": "2019-09-07T02:44:33Z",
             "timeoutUser": "",
+            "userID": "143114011",
             "usernameColor": "#ff0000ff"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/cheer4.json b/tests/snapshots/IrcMessageHandler/cheer4.json
index 24d5b9ba..d2fc326e 100644
--- a/tests/snapshots/IrcMessageHandler/cheer4.json
+++ b/tests/snapshots/IrcMessageHandler/cheer4.json
@@ -135,6 +135,7 @@
             "searchText": "exde_hun  exde_hun: PogChamp10 ",
             "serverReceivedTime": "2019-08-24T13:51:04Z",
             "timeoutUser": "",
+            "userID": "129793695",
             "usernameColor": "#ff00ff7f"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json
index 5ce16787..dbb0fab0 100644
--- a/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json
+++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-always.json
@@ -69,6 +69,7 @@
             "searchText": "Chat has been cleared by a moderator. (4 times) ",
             "serverReceivedTime": "2025-01-12T10:41:54Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         },
         {
@@ -236,6 +237,7 @@
             "searchText": "pajlada  pajlada: asd ",
             "serverReceivedTime": "2025-01-12T10:41:52Z",
             "timeoutUser": "",
+            "userID": "11148817",
             "usernameColor": "#ffcc44ff"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json
index 76786c2f..9c3b194a 100644
--- a/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json
+++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-never.json
@@ -67,6 +67,7 @@
             "searchText": "Chat has been cleared by a moderator. ",
             "serverReceivedTime": "2025-01-08T20:44:28Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json
index 5030714d..85521959 100644
--- a/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json
+++ b/tests/snapshots/IrcMessageHandler/clearchat-stack-no-user.json
@@ -69,6 +69,7 @@
             "searchText": "Chat has been cleared by a moderator. (2 times) ",
             "serverReceivedTime": "2025-01-08T20:44:28Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/clearchat.json b/tests/snapshots/IrcMessageHandler/clearchat.json
index ee019c12..45a24923 100644
--- a/tests/snapshots/IrcMessageHandler/clearchat.json
+++ b/tests/snapshots/IrcMessageHandler/clearchat.json
@@ -67,6 +67,7 @@
             "searchText": "Chat has been cleared by a moderator. ",
             "serverReceivedTime": "2024-10-22T20:06:47Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/custom-mod.json b/tests/snapshots/IrcMessageHandler/custom-mod.json
index 825b0918..cbd0ed24 100644
--- a/tests/snapshots/IrcMessageHandler/custom-mod.json
+++ b/tests/snapshots/IrcMessageHandler/custom-mod.json
@@ -124,6 +124,7 @@
             "searchText": "testaccount_420(테스트계정420) 테스트계정420 testaccount_420: foo ",
             "serverReceivedTime": "2020-05-31T10:47:16Z",
             "timeoutUser": "",
+            "userID": "117166826",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/custom-vip.json b/tests/snapshots/IrcMessageHandler/custom-vip.json
index d66cd81b..a9683fa5 100644
--- a/tests/snapshots/IrcMessageHandler/custom-vip.json
+++ b/tests/snapshots/IrcMessageHandler/custom-vip.json
@@ -134,6 +134,7 @@
             "searchText": "nerixyz  nerixyz: a ",
             "serverReceivedTime": "2024-09-21T12:05:21Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/emote-emoji.json b/tests/snapshots/IrcMessageHandler/emote-emoji.json
index 70700cc3..011ca439 100644
--- a/tests/snapshots/IrcMessageHandler/emote-emoji.json
+++ b/tests/snapshots/IrcMessageHandler/emote-emoji.json
@@ -251,6 +251,7 @@
             "searchText": "pajlada  pajlada: Kappa 😂 Kappa ",
             "serverReceivedTime": "2022-09-03T11:27:03Z",
             "timeoutUser": "",
+            "userID": "11148817",
             "usernameColor": "#ffcc44ff"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emote.json b/tests/snapshots/IrcMessageHandler/emote.json
index cb896538..ceff1863 100644
--- a/tests/snapshots/IrcMessageHandler/emote.json
+++ b/tests/snapshots/IrcMessageHandler/emote.json
@@ -153,6 +153,7 @@
             "searchText": "mm2pl  mm2pl: Keepo ",
             "serverReceivedTime": "2022-09-03T10:31:35Z",
             "timeoutUser": "",
+            "userID": "117691339",
             "usernameColor": "#ffdaa521"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emoteonly-on.json b/tests/snapshots/IrcMessageHandler/emoteonly-on.json
index ef971b5f..64bcbf71 100644
--- a/tests/snapshots/IrcMessageHandler/emoteonly-on.json
+++ b/tests/snapshots/IrcMessageHandler/emoteonly-on.json
@@ -67,6 +67,7 @@
             "searchText": "This room is now in emote-only mode.",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emotes.json b/tests/snapshots/IrcMessageHandler/emotes.json
index e7e6d4a0..48124fdb 100644
--- a/tests/snapshots/IrcMessageHandler/emotes.json
+++ b/tests/snapshots/IrcMessageHandler/emotes.json
@@ -221,6 +221,7 @@
             "searchText": "mm2pl  mm2pl: Kappa Keepo PogChamp ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "117691339",
             "usernameColor": "#ffdaa521"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emotes2.json b/tests/snapshots/IrcMessageHandler/emotes2.json
index 1fc89dbb..82b6b5b6 100644
--- a/tests/snapshots/IrcMessageHandler/emotes2.json
+++ b/tests/snapshots/IrcMessageHandler/emotes2.json
@@ -479,6 +479,7 @@
             "searchText": "nerixyz  nerixyz: BTTVEmote Kappa 7TVEmote 7TVEmote0w 7TVEmote0w 😂😂 PogChamp 7TVGlobal Keepo FFZEmote FFZGlobal ",
             "serverReceivedTime": "2024-09-20T21:42:53Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emotes3.json b/tests/snapshots/IrcMessageHandler/emotes3.json
index 8a4fcb42..dab2c3b8 100644
--- a/tests/snapshots/IrcMessageHandler/emotes3.json
+++ b/tests/snapshots/IrcMessageHandler/emotes3.json
@@ -264,6 +264,7 @@
             "searchText": "nerixyz  nerixyz: 😂Kappa😂 &Kappa a  b ",
             "serverReceivedTime": "2024-09-19T15:50:13Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emotes4.json b/tests/snapshots/IrcMessageHandler/emotes4.json
index 1bc17a22..7cce268d 100644
--- a/tests/snapshots/IrcMessageHandler/emotes4.json
+++ b/tests/snapshots/IrcMessageHandler/emotes4.json
@@ -149,6 +149,7 @@
             "searchText": "test  test: foo bar ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/emotes5.json b/tests/snapshots/IrcMessageHandler/emotes5.json
index 9f4dd123..e8cf3939 100644
--- a/tests/snapshots/IrcMessageHandler/emotes5.json
+++ b/tests/snapshots/IrcMessageHandler/emotes5.json
@@ -149,6 +149,7 @@
             "searchText": "test  test: foo bar ",
             "serverReceivedTime": "2022-09-03T10:31:42Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/first-msg.json b/tests/snapshots/IrcMessageHandler/first-msg.json
index ada382d1..1311151e 100644
--- a/tests/snapshots/IrcMessageHandler/first-msg.json
+++ b/tests/snapshots/IrcMessageHandler/first-msg.json
@@ -155,6 +155,7 @@
             "searchText": "jammehcow  jammehcow: Kappa ",
             "serverReceivedTime": "2022-09-03T10:31:33Z",
             "timeoutUser": "",
+            "userID": "82674227",
             "usernameColor": "#ffeba2c0"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/highlight1.json b/tests/snapshots/IrcMessageHandler/highlight1.json
index 870c15a0..56dfc135 100644
--- a/tests/snapshots/IrcMessageHandler/highlight1.json
+++ b/tests/snapshots/IrcMessageHandler/highlight1.json
@@ -114,6 +114,7 @@
             "searchText": "ignoreduser  ignoreduser: my-highlight ",
             "serverReceivedTime": "2024-09-20T20:47:19Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/highlight2.json b/tests/snapshots/IrcMessageHandler/highlight2.json
index 85129798..97f1607c 100644
--- a/tests/snapshots/IrcMessageHandler/highlight2.json
+++ b/tests/snapshots/IrcMessageHandler/highlight2.json
@@ -119,6 +119,7 @@
             "searchText": "nerixyz  nerixyz: something my-highlight * ",
             "serverReceivedTime": "2024-09-20T21:15:16Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/highlight3.json b/tests/snapshots/IrcMessageHandler/highlight3.json
index d3d54c83..1b4a3cec 100644
--- a/tests/snapshots/IrcMessageHandler/highlight3.json
+++ b/tests/snapshots/IrcMessageHandler/highlight3.json
@@ -118,6 +118,7 @@
             "searchText": "nerixyz  nerixyz: foo no-mention-highlight ",
             "serverReceivedTime": "2024-09-20T21:15:27Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json b/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json
index 41407779..85a23091 100644
--- a/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json
+++ b/tests/snapshots/IrcMessageHandler/hype-chat-invalid.json
@@ -156,6 +156,7 @@
             "searchText": "snoopythebot  snoopythebot: -$5 ",
             "serverReceivedTime": "2022-09-30T02:46:14Z",
             "timeoutUser": "",
+            "userID": "136881249",
             "usernameColor": "#ff0000ff"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/hype-chat0.json b/tests/snapshots/IrcMessageHandler/hype-chat0.json
index 54826a55..b6696d45 100644
--- a/tests/snapshots/IrcMessageHandler/hype-chat0.json
+++ b/tests/snapshots/IrcMessageHandler/hype-chat0.json
@@ -156,6 +156,7 @@
             "searchText": "snoopythebot  snoopythebot: -$5 ",
             "serverReceivedTime": "2022-09-30T02:46:14Z",
             "timeoutUser": "",
+            "userID": "136881249",
             "usernameColor": "#ff0000ff"
         },
         {
@@ -220,6 +221,7 @@
             "searchText": "Hype Chat USD5.00",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/hype-chat1.json b/tests/snapshots/IrcMessageHandler/hype-chat1.json
index fc6ed379..a0bcffc9 100644
--- a/tests/snapshots/IrcMessageHandler/hype-chat1.json
+++ b/tests/snapshots/IrcMessageHandler/hype-chat1.json
@@ -165,6 +165,7 @@
             "searchText": "matrhs  matrhs: Title: Beating the record. but who is recordingLOL ",
             "serverReceivedTime": "2023-06-28T16:43:51Z",
             "timeoutUser": "",
+            "userID": "26753388",
             "usernameColor": "#ff9da364"
         },
         {
@@ -232,6 +233,7 @@
             "searchText": "Level 1 Hype Chat (30s) NOK14.00",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/hype-chat2.json b/tests/snapshots/IrcMessageHandler/hype-chat2.json
index 56451b30..2ca8fc01 100644
--- a/tests/snapshots/IrcMessageHandler/hype-chat2.json
+++ b/tests/snapshots/IrcMessageHandler/hype-chat2.json
@@ -162,6 +162,7 @@
             "searchText": "rickharrisoncoc  rickharrisoncoc: forsen please read my super chat. Please. ",
             "serverReceivedTime": "2023-06-28T16:43:54Z",
             "timeoutUser": "",
+            "userID": "518404689",
             "usernameColor": "#ffff69b4"
         },
         {
@@ -230,6 +231,7 @@
             "searchText": "Level 2 Hype Chat (2m 30s) USD5.00",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/ignore-block1.json b/tests/snapshots/IrcMessageHandler/ignore-block1.json
index 94467cb0..23040c0f 100644
--- a/tests/snapshots/IrcMessageHandler/ignore-block1.json
+++ b/tests/snapshots/IrcMessageHandler/ignore-block1.json
@@ -116,6 +116,7 @@
             "searchText": "nerixyz  nerixyz: block! ",
             "serverReceivedTime": "2024-09-18T20:48:59Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/ignore-infinite.json b/tests/snapshots/IrcMessageHandler/ignore-infinite.json
index a86b7a70..edc428af 100644
--- a/tests/snapshots/IrcMessageHandler/ignore-infinite.json
+++ b/tests/snapshots/IrcMessageHandler/ignore-infinite.json
@@ -122,6 +122,7 @@
             "searchText": "nerixyz  nerixyz: Too many replacements - check your ignores! ",
             "serverReceivedTime": "2024-09-20T20:52:42Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/ignore-replace.json b/tests/snapshots/IrcMessageHandler/ignore-replace.json
index 8035984d..1d195952 100644
--- a/tests/snapshots/IrcMessageHandler/ignore-replace.json
+++ b/tests/snapshots/IrcMessageHandler/ignore-replace.json
@@ -339,6 +339,7 @@
             "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": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/justinfan.json b/tests/snapshots/IrcMessageHandler/justinfan.json
index 0ed4190a..e189d67a 100644
--- a/tests/snapshots/IrcMessageHandler/justinfan.json
+++ b/tests/snapshots/IrcMessageHandler/justinfan.json
@@ -116,6 +116,7 @@
             "searchText": "justinfan64537  justinfan64537: a ",
             "serverReceivedTime": "2024-09-21T11:37:23Z",
             "timeoutUser": "",
+            "userID": "64537",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/links.json b/tests/snapshots/IrcMessageHandler/links.json
index 7a3325d2..abd6b4dd 100644
--- a/tests/snapshots/IrcMessageHandler/links.json
+++ b/tests/snapshots/IrcMessageHandler/links.json
@@ -233,6 +233,7 @@
             "searchText": "nerixyz  nerixyz: https://chatterino.com (chatterino.com chatterino.com) (chatterino.com) ",
             "serverReceivedTime": "2024-09-18T16:54:51Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/mentions.json b/tests/snapshots/IrcMessageHandler/mentions.json
index 4c52bc38..3be523cd 100644
--- a/tests/snapshots/IrcMessageHandler/mentions.json
+++ b/tests/snapshots/IrcMessageHandler/mentions.json
@@ -167,6 +167,7 @@
             "searchText": "nerixyz  nerixyz: @~ @TwitchDev @UserColor! ",
             "serverReceivedTime": "2024-09-18T16:57:23Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/mod.json b/tests/snapshots/IrcMessageHandler/mod.json
index f0c632c6..97effa63 100644
--- a/tests/snapshots/IrcMessageHandler/mod.json
+++ b/tests/snapshots/IrcMessageHandler/mod.json
@@ -209,6 +209,7 @@
             "searchText": "testaccount_420(테스트계정420) 테스트계정420 testaccount_420: -tags Kreygasm, Kreygasm ",
             "serverReceivedTime": "2020-05-31T10:47:16Z",
             "timeoutUser": "",
+            "userID": "117166826",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/nickname.json b/tests/snapshots/IrcMessageHandler/nickname.json
index 8535e03d..60f70368 100644
--- a/tests/snapshots/IrcMessageHandler/nickname.json
+++ b/tests/snapshots/IrcMessageHandler/nickname.json
@@ -116,6 +116,7 @@
             "searchText": "replacement  nickname: nickname ",
             "serverReceivedTime": "2024-09-21T10:53:04Z",
             "timeoutUser": "",
+            "userID": "12345678",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/no-nick.json b/tests/snapshots/IrcMessageHandler/no-nick.json
index db59fbd2..49dea1a5 100644
--- a/tests/snapshots/IrcMessageHandler/no-nick.json
+++ b/tests/snapshots/IrcMessageHandler/no-nick.json
@@ -116,6 +116,7 @@
             "searchText": "(nerixyz) nerixyz : no ",
             "serverReceivedTime": "2024-09-20T20:47:19Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/no-tags.json b/tests/snapshots/IrcMessageHandler/no-tags.json
index 103148bc..663528f4 100644
--- a/tests/snapshots/IrcMessageHandler/no-tags.json
+++ b/tests/snapshots/IrcMessageHandler/no-tags.json
@@ -133,6 +133,7 @@
             "searchText": "jammehcow  jammehcow: Kappa ",
             "serverReceivedTime": "2024-09-19T16:40:56Z",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/raid.json b/tests/snapshots/IrcMessageHandler/raid.json
index 06bffb90..9a643b38 100644
--- a/tests/snapshots/IrcMessageHandler/raid.json
+++ b/tests/snapshots/IrcMessageHandler/raid.json
@@ -97,6 +97,7 @@
             "searchText": "2 raiders from nerixyz have joined!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/redeemed-highlight.json b/tests/snapshots/IrcMessageHandler/redeemed-highlight.json
index e81342e9..013f454e 100644
--- a/tests/snapshots/IrcMessageHandler/redeemed-highlight.json
+++ b/tests/snapshots/IrcMessageHandler/redeemed-highlight.json
@@ -184,6 +184,7 @@
             "searchText": "nerixyz  nerixyz: BTTVGlobal highlight :) ",
             "serverReceivedTime": "2024-09-18T12:30:16Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/reply-action.json b/tests/snapshots/IrcMessageHandler/reply-action.json
index 6f75671c..cb425163 100644
--- a/tests/snapshots/IrcMessageHandler/reply-action.json
+++ b/tests/snapshots/IrcMessageHandler/reply-action.json
@@ -180,6 +180,7 @@
             "searchText": "nerixyz  nerixyz: b ",
             "serverReceivedTime": "2024-09-18T20:26:29Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-block.json b/tests/snapshots/IrcMessageHandler/reply-block.json
index 600828ae..3ee94491 100644
--- a/tests/snapshots/IrcMessageHandler/reply-block.json
+++ b/tests/snapshots/IrcMessageHandler/reply-block.json
@@ -172,6 +172,7 @@
             "searchText": "nerixyz  nerixyz: reply ",
             "serverReceivedTime": "2024-09-18T20:47:54Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-blocked-user.json b/tests/snapshots/IrcMessageHandler/reply-blocked-user.json
index acd29936..4fe8b75d 100644
--- a/tests/snapshots/IrcMessageHandler/reply-blocked-user.json
+++ b/tests/snapshots/IrcMessageHandler/reply-blocked-user.json
@@ -176,6 +176,7 @@
             "searchText": "nerixyz  nerixyz: @nerixyz reply ",
             "serverReceivedTime": "2024-09-18T21:18:47Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-child.json b/tests/snapshots/IrcMessageHandler/reply-child.json
index be8a1731..61aaff99 100644
--- a/tests/snapshots/IrcMessageHandler/reply-child.json
+++ b/tests/snapshots/IrcMessageHandler/reply-child.json
@@ -181,6 +181,7 @@
             "searchText": "nerixyz  nerixyz: c ",
             "serverReceivedTime": "2024-09-18T20:18:51Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-ignore.json b/tests/snapshots/IrcMessageHandler/reply-ignore.json
index f3d28087..0d15f8dd 100644
--- a/tests/snapshots/IrcMessageHandler/reply-ignore.json
+++ b/tests/snapshots/IrcMessageHandler/reply-ignore.json
@@ -180,6 +180,7 @@
             "searchText": "nerixyz  nerixyz: casesensitivE ",
             "serverReceivedTime": "2024-09-18T20:48:12Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-no-prev.json b/tests/snapshots/IrcMessageHandler/reply-no-prev.json
index ca767517..f85d7780 100644
--- a/tests/snapshots/IrcMessageHandler/reply-no-prev.json
+++ b/tests/snapshots/IrcMessageHandler/reply-no-prev.json
@@ -172,6 +172,7 @@
             "searchText": "nerixyz  nerixyz: b ",
             "serverReceivedTime": "2024-09-18T20:18:11Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/reply-root.json b/tests/snapshots/IrcMessageHandler/reply-root.json
index 2e138c3d..6f32d4c3 100644
--- a/tests/snapshots/IrcMessageHandler/reply-root.json
+++ b/tests/snapshots/IrcMessageHandler/reply-root.json
@@ -182,6 +182,7 @@
             "searchText": "nerixyz  nerixyz: d ",
             "serverReceivedTime": "2024-09-18T20:19:01Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reply-single.json b/tests/snapshots/IrcMessageHandler/reply-single.json
index 2fbcf096..907e759c 100644
--- a/tests/snapshots/IrcMessageHandler/reply-single.json
+++ b/tests/snapshots/IrcMessageHandler/reply-single.json
@@ -299,6 +299,7 @@
             "searchText": "nerixyz  nerixyz: c Keepo FFZEmote 😭 d ",
             "serverReceivedTime": "2024-09-18T20:16:33Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/reward-bits.json b/tests/snapshots/IrcMessageHandler/reward-bits.json
index 44255bbd..ede29497 100644
--- a/tests/snapshots/IrcMessageHandler/reward-bits.json
+++ b/tests/snapshots/IrcMessageHandler/reward-bits.json
@@ -285,6 +285,7 @@
             "searchText": "nerixyz  nerixyz: reward 1  redeemed On-Screen Celebration 1",
             "serverReceivedTime": "2024-09-18T12:35:38Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/reward-empty.json b/tests/snapshots/IrcMessageHandler/reward-empty.json
index b9a9f92b..6088f4d0 100644
--- a/tests/snapshots/IrcMessageHandler/reward-empty.json
+++ b/tests/snapshots/IrcMessageHandler/reward-empty.json
@@ -234,6 +234,7 @@
             "searchText": "nerixyz  nerixyz: empty  redeemed test 1",
             "serverReceivedTime": "2024-09-18T16:39:32Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/reward-known.json b/tests/snapshots/IrcMessageHandler/reward-known.json
index d33493b7..f2f81949 100644
--- a/tests/snapshots/IrcMessageHandler/reward-known.json
+++ b/tests/snapshots/IrcMessageHandler/reward-known.json
@@ -231,6 +231,7 @@
             "searchText": "nerixyz  nerixyz: reward 1 Redeemed my reward 1",
             "serverReceivedTime": "2024-09-18T12:35:38Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/reward-unknown.json b/tests/snapshots/IrcMessageHandler/reward-unknown.json
index 4b939592..7c1d95fd 100644
--- a/tests/snapshots/IrcMessageHandler/reward-unknown.json
+++ b/tests/snapshots/IrcMessageHandler/reward-unknown.json
@@ -117,6 +117,7 @@
             "searchText": "nerixyz  nerixyz: reward 2 ",
             "serverReceivedTime": "2024-09-18T12:36:01Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/rm-deleted.json b/tests/snapshots/IrcMessageHandler/rm-deleted.json
index 709df7d5..efad8c4a 100644
--- a/tests/snapshots/IrcMessageHandler/rm-deleted.json
+++ b/tests/snapshots/IrcMessageHandler/rm-deleted.json
@@ -253,6 +253,7 @@
             "searchText": "nerixyz  nerixyz: 7TVEmote Kappa my7TVEmote hi 7TVEmote❤ ",
             "serverReceivedTime": "2024-09-17T19:17:07Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json
index ac87a64d..09ae4769 100644
--- a/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json
+++ b/tests/snapshots/IrcMessageHandler/shared-chat-announcement.json
@@ -180,6 +180,7 @@
             "searchText": "lahoooo  lahoooo: hi this is an announcement from 1 ",
             "serverReceivedTime": "2024-09-12T05:19:38Z",
             "timeoutUser": "",
+            "userID": "612865661",
             "usernameColor": "#ffdaa520"
         },
         {
@@ -242,6 +243,7 @@
             "searchText": "Announcement",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json b/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json
index ba6485c2..f25d8331 100644
--- a/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json
+++ b/tests/snapshots/IrcMessageHandler/shared-chat-emotes.json
@@ -404,6 +404,7 @@
             "searchText": "nerixyz  nerixyz: Kappa BTTVEmote BTTVGlobal 7TVEmote 7TVGlobal FFZEmote FFZGlobal BTTVTwitchDev 7TVTwitchDev FFZTwitchDev ",
             "serverReceivedTime": "2024-10-07T14:27:15Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-known.json b/tests/snapshots/IrcMessageHandler/shared-chat-known.json
index c4a3f3e2..f4759a9d 100644
--- a/tests/snapshots/IrcMessageHandler/shared-chat-known.json
+++ b/tests/snapshots/IrcMessageHandler/shared-chat-known.json
@@ -173,6 +173,7 @@
             "searchText": "creativewind  creativewind: Guy ",
             "serverReceivedTime": "2024-09-27T00:08:21Z",
             "timeoutUser": "",
+            "userID": "106940612",
             "usernameColor": "#ff00ff00"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json b/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json
index 5ab3daad..060c5ae2 100644
--- a/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json
+++ b/tests/snapshots/IrcMessageHandler/shared-chat-same-channel.json
@@ -155,6 +155,7 @@
             "searchText": "creativewind  creativewind: Guys ",
             "serverReceivedTime": "2024-09-27T00:08:21Z",
             "timeoutUser": "",
+            "userID": "106940612",
             "usernameColor": "#ff00ff00"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json b/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json
index 6ea80b2c..f809ce27 100644
--- a/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json
+++ b/tests/snapshots/IrcMessageHandler/shared-chat-unknown.json
@@ -173,6 +173,7 @@
             "searchText": "creativewind  creativewind: Guys ",
             "serverReceivedTime": "2024-09-27T00:08:21Z",
             "timeoutUser": "",
+            "userID": "106940612",
             "usernameColor": "#ff00ff00"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/simple.json b/tests/snapshots/IrcMessageHandler/simple.json
index 1ce363b9..9e3fe384 100644
--- a/tests/snapshots/IrcMessageHandler/simple.json
+++ b/tests/snapshots/IrcMessageHandler/simple.json
@@ -155,6 +155,7 @@
             "searchText": "jammehcow  jammehcow: Kappa ",
             "serverReceivedTime": "2022-09-03T10:31:33Z",
             "timeoutUser": "",
+            "userID": "82674227",
             "usernameColor": "#ffeba2c0"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-first-gift.json b/tests/snapshots/IrcMessageHandler/sub-first-gift.json
index c710f97c..289f81fd 100644
--- a/tests/snapshots/IrcMessageHandler/sub-first-gift.json
+++ b/tests/snapshots/IrcMessageHandler/sub-first-gift.json
@@ -126,6 +126,7 @@
             "searchText": "hyperbolicxd gifted a Tier 1 sub to quote_if_nam! This is their first Gift Sub in the channel!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-first-time.json b/tests/snapshots/IrcMessageHandler/sub-first-time.json
index 0963358c..fdc4dd86 100644
--- a/tests/snapshots/IrcMessageHandler/sub-first-time.json
+++ b/tests/snapshots/IrcMessageHandler/sub-first-time.json
@@ -83,6 +83,7 @@
             "searchText": "byebyeheart just subscribed with Twitch Prime!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-gift.json b/tests/snapshots/IrcMessageHandler/sub-gift.json
index 5da4a4c3..2718de4d 100644
--- a/tests/snapshots/IrcMessageHandler/sub-gift.json
+++ b/tests/snapshots/IrcMessageHandler/sub-gift.json
@@ -117,6 +117,7 @@
             "searchText": "TWW2 gifted a Tier 1 sub to Mr_Woodchuck!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-message.json b/tests/snapshots/IrcMessageHandler/sub-message.json
index f50de6e0..c08801fb 100644
--- a/tests/snapshots/IrcMessageHandler/sub-message.json
+++ b/tests/snapshots/IrcMessageHandler/sub-message.json
@@ -181,6 +181,7 @@
             "searchText": "ronni  ronni: Great stream -- keep it up! ",
             "serverReceivedTime": "2017-10-05T23:36:12Z",
             "timeoutUser": "",
+            "userID": "1337",
             "usernameColor": "#ff008000"
         },
         {
@@ -265,6 +266,7 @@
             "searchText": "ronni has subscribed for 6 months!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "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 46cd54ba..674c3a05 100644
--- a/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json
+++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json
@@ -105,6 +105,7 @@
             "searchText": "An anonymous user gifted 6 months of a Tier 1 sub to MohammadrezaDH!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "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 694f1c56..8367116e 100644
--- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json
+++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json
@@ -127,6 +127,7 @@
             "searchText": "iNatsuFN gifted 6 months of a Tier 1 sub to kimmi_tm! They've gifted 334 months in the channel.",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json
index 928dcdde..0a820829 100644
--- a/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json
+++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json
@@ -120,6 +120,7 @@
             "searchText": "Lucidfoxx gifted 12 months of a Tier 1 sub to OGprodigy!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json
index d1ac38e2..89d2a662 100644
--- a/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json
+++ b/tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json
@@ -93,6 +93,7 @@
             "searchText": "calm__like_a_tom subscribed at Tier 3 for 6 months in advance, reaching 9 months cumulatively so far!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-multi-month.json b/tests/snapshots/IrcMessageHandler/sub-multi-month.json
index 08384852..e28156c8 100644
--- a/tests/snapshots/IrcMessageHandler/sub-multi-month.json
+++ b/tests/snapshots/IrcMessageHandler/sub-multi-month.json
@@ -87,6 +87,7 @@
             "searchText": "foly__ subscribed at Tier 1 for 6 months in advance!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/sub-no-message.json b/tests/snapshots/IrcMessageHandler/sub-no-message.json
index 26596e8d..27e124e3 100644
--- a/tests/snapshots/IrcMessageHandler/sub-no-message.json
+++ b/tests/snapshots/IrcMessageHandler/sub-no-message.json
@@ -124,6 +124,7 @@
             "searchText": "cspice just subscribed with a Tier 2 sub. cspice subscribed for 12 months in a row!",
             "serverReceivedTime": "",
             "timeoutUser": "",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json
index 6381146f..99431aa7 100644
--- a/tests/snapshots/IrcMessageHandler/timeout-stack-always.json
+++ b/tests/snapshots/IrcMessageHandler/timeout-stack-always.json
@@ -83,6 +83,7 @@
             "searchText": "twitchdev has been timed out for 10m. (3 times) ",
             "serverReceivedTime": "2025-01-15T19:22:47Z",
             "timeoutUser": "twitchdev",
+            "userID": "",
             "usernameColor": "#ff000000"
         },
         {
@@ -198,6 +199,7 @@
             "searchText": "twitchdev  twitchdev: 1 ",
             "serverReceivedTime": "2025-01-15T19:22:45Z",
             "timeoutUser": "",
+            "userID": "141981764",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json
index 60c9c013..f83d8545 100644
--- a/tests/snapshots/IrcMessageHandler/timeout-stack-never.json
+++ b/tests/snapshots/IrcMessageHandler/timeout-stack-never.json
@@ -83,6 +83,7 @@
             "searchText": "twitchdev has been timed out for 10m. (3 times) ",
             "serverReceivedTime": "2025-01-15T19:22:47Z",
             "timeoutUser": "twitchdev",
+            "userID": "",
             "usernameColor": "#ff000000"
         },
         {
@@ -198,6 +199,7 @@
             "searchText": "twitchdev  twitchdev: 1 ",
             "serverReceivedTime": "2025-01-15T19:22:45Z",
             "timeoutUser": "",
+            "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 b13b6f02..d4e49b57 100644
--- a/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json
+++ b/tests/snapshots/IrcMessageHandler/timeout-stack-no-user.json
@@ -81,6 +81,7 @@
             "searchText": "twitchdev has been timed out for 10m. ",
             "serverReceivedTime": "2025-01-15T19:22:44Z",
             "timeoutUser": "twitchdev",
+            "userID": "",
             "usernameColor": "#ff000000"
         },
         {
@@ -196,6 +197,7 @@
             "searchText": "twitchdev  twitchdev: 1 ",
             "serverReceivedTime": "2025-01-15T19:22:45Z",
             "timeoutUser": "",
+            "userID": "141981764",
             "usernameColor": "#ffff0000"
         },
         {
@@ -280,6 +282,7 @@
             "searchText": "twitchdev has been timed out for 10m. (2 times) ",
             "serverReceivedTime": "2025-01-15T19:22:47Z",
             "timeoutUser": "twitchdev",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/timeout.json b/tests/snapshots/IrcMessageHandler/timeout.json
index d6456d31..70612a79 100644
--- a/tests/snapshots/IrcMessageHandler/timeout.json
+++ b/tests/snapshots/IrcMessageHandler/timeout.json
@@ -81,6 +81,7 @@
             "searchText": "nerixyz has been timed out for 1s. ",
             "serverReceivedTime": "2024-10-22T20:24:18Z",
             "timeoutUser": "nerixyz",
+            "userID": "",
             "usernameColor": "#ff000000"
         }
     ]
diff --git a/tests/snapshots/IrcMessageHandler/username-localized.json b/tests/snapshots/IrcMessageHandler/username-localized.json
index 8c78475d..0f59bddc 100644
--- a/tests/snapshots/IrcMessageHandler/username-localized.json
+++ b/tests/snapshots/IrcMessageHandler/username-localized.json
@@ -106,6 +106,7 @@
             "searchText": "display-name=테스트계정420 display-name=테스트계정420 testaccount_420: username ",
             "serverReceivedTime": "2024-09-21T10:54:17Z",
             "timeoutUser": "",
+            "userID": "117166826",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/username-localized2.json b/tests/snapshots/IrcMessageHandler/username-localized2.json
index 66cbe408..4f104225 100644
--- a/tests/snapshots/IrcMessageHandler/username-localized2.json
+++ b/tests/snapshots/IrcMessageHandler/username-localized2.json
@@ -106,6 +106,7 @@
             "searchText": "testaccount_420  testaccount_420: username ",
             "serverReceivedTime": "2024-09-21T10:54:17Z",
             "timeoutUser": "",
+            "userID": "117166826",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/username.json b/tests/snapshots/IrcMessageHandler/username.json
index 9076136a..6053bec0 100644
--- a/tests/snapshots/IrcMessageHandler/username.json
+++ b/tests/snapshots/IrcMessageHandler/username.json
@@ -106,6 +106,7 @@
             "searchText": "testaccount_420 display-name=테스트계정420 testaccount_420: username ",
             "serverReceivedTime": "2024-09-21T10:54:17Z",
             "timeoutUser": "",
+            "userID": "117166826",
             "usernameColor": "#ffff0000"
         }
     ],
diff --git a/tests/snapshots/IrcMessageHandler/vip.json b/tests/snapshots/IrcMessageHandler/vip.json
index e7cac568..27a28148 100644
--- a/tests/snapshots/IrcMessageHandler/vip.json
+++ b/tests/snapshots/IrcMessageHandler/vip.json
@@ -137,6 +137,7 @@
             "searchText": "nerixyz  nerixyz: a ",
             "serverReceivedTime": "2024-09-21T12:05:21Z",
             "timeoutUser": "",
+            "userID": "129546453",
             "usernameColor": "#ffff0000"
         }
     ]