From e2471bc9e438a7cbdb4056c913a6d51b4ee62834 Mon Sep 17 00:00:00 2001
From: nuttylmao <nuttylmao@gmail.com>
Date: Thu, 3 Jul 2025 03:30:53 +1000
Subject: [PATCH] Removed the need for SB import code

---
 multichat-overlay/script.js | 76 +++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/multichat-overlay/script.js b/multichat-overlay/script.js
index 814a91f..c449a3f 100644
--- a/multichat-overlay/script.js
+++ b/multichat-overlay/script.js
@@ -272,9 +272,14 @@ client.on('Fourthwall.GiftDrawEnded', (response) => {
 	FourthwallGiftDrawEnded(response.data);
 })
 
-client.on('General.Custom', (response) => {
+// client.on('General.Custom', (response) => {
+// 	console.debug(response.data);
+// 	GeneralCustom(response.data);
+// })
+
+client.on('Custom.CodeEvent', (response) => {
 	console.debug(response.data);
-	GeneralCustom(response.data);
+	CustomCodeEvent(response.data);
 })
 
 
@@ -1784,31 +1789,54 @@ function FourthwallGiftDrawEnded(data) {
 	AddMessageItem(instance, data.id);
 }
 
-function GeneralCustom(data) {
-	const eventSource = data.eventSource;
+// function GeneralCustom(data) {
+// 	const eventSource = data.eventSource;
 
-	switch (eventSource) {
-		case "kick":
-			const triggerCustomCodeEventName = data.triggerCustomCodeEventName;
+// 	switch (eventSource) {
+// 		case "kick":
+// 			const triggerCustomCodeEventName = data.triggerCustomCodeEventName;
 
-			switch (triggerCustomCodeEventName) {
-				case "kickChatMessage":
-					KickChatMessage(data);
-					break;
-				case "kickSub":
-					KickSub(data);
-					break;
-				case "kickGift":
-					KickGift(data);
-					break;
-				case "kickGifts":
-					KickGifts(data);
-					break;
-				case "kickRewardRedeemed":
-					KickRewardRedeemed(data);
-					break;
-			}
+// 			switch (triggerCustomCodeEventName) {
+// 				case "kickChatMessage":
+// 					KickChatMessage(data);
+// 					break;
+// 				case "kickSub":
+// 					KickSub(data);
+// 					break;
+// 				case "kickGift":
+// 					KickGift(data);
+// 					break;
+// 				case "kickGifts":
+// 					KickGifts(data);
+// 					break;
+// 				case "kickRewardRedeemed":
+// 					KickRewardRedeemed(data);
+// 					break;
+// 			}
 
+// 			break;
+// 	}
+// }
+
+function CustomCodeEvent(data) {
+	const eventName = data.eventName;
+	const eventArgs = data.args;
+
+	switch (eventName) {
+		case "kickChatMessage":
+			KickChatMessage(eventArgs);
+			break;
+		case "kickSub":
+			KickSub(eventArgs);
+			break;
+		case "kickGift":
+			KickGift(eventArgs);
+			break;
+		case "kickGifts":
+			KickGifts(eventArgs);
+			break;
+		case "kickRewardRedeemed":
+			KickRewardRedeemed(eventArgs);
 			break;
 	}
 }