Merge pull request #784 from steveseguin/beta

Beta

Author: steveseguin

background.js

@@ -7061,11 +7061,14 @@ function sendToStreamerBot(data, fakechat = false, relayed = false) {
     const payloadData = {
         ...data, // Copy original data
         chatname: username || data.chatname || data.userid || "Host⚡",
-        isBot: isBot,
+        bot: isBot || !!data.bot,  // local isBot = Ollama prefix detection; data.bot = platform/list bot flag
+        mod: !!data.mod,
+        host: !!data.host,
+        admin: !!data.admin,
+        vip: !!data.vip,
         chatmessage: cleaned,
-        // Add any other relevant info Streamer.bot action might need
-        source: "SocialStream.Ninja", // Explicitly add source
-        originalPlatform: data.type || "unknown" // Preserve original platform info
+        source: "SocialStream.Ninja",
+        originalPlatform: data.type || "unknown"
     };
 
     if (videoId) {
@@ -7080,9 +7083,30 @@ function sendToStreamerBot(data, fakechat = false, relayed = false) {
       const actionId = settings.streamerbotactionid.textsetting;
       console.log(`Triggering Streamer.bot Action ID: ${actionId}`);
 
-      // Pass the prepared chat data as an argument named 'chatData' to the action
+      // Pass chat data fields as flat args so CPH.TryGetArg<T>() works directly in C#
+      // e.g. CPH.TryGetArg<string>("chatmessage", out string msg) — do NOT wrap in a nested object
       const args = {
-          chatData: payloadData
+          chatmessage: payloadData.chatmessage || '',
+          chatname: payloadData.chatname || '',
+          userid: String(payloadData.userid || ''),
+          chatimg: payloadData.chatimg || '',
+          bot: payloadData.bot,
+          mod: payloadData.mod,
+          host: payloadData.host,
+          admin: payloadData.admin,
+          vip: payloadData.vip,
+          originalPlatform: payloadData.originalPlatform || 'unknown',
+          source: payloadData.source || 'SocialStream.Ninja',
+          type: payloadData.type || '',
+          nameColor: payloadData.nameColor || '#FFFFFF',
+          chatbadges: String(payloadData.chatbadges || ''),
+          membership: String(payloadData.membership || ''),
+          hasDonation: String(payloadData.hasDonation || ''),
+          contentimg: payloadData.contentimg || '',
+          subtitle: payloadData.subtitle || '',
+          textonly: !!payloadData.textonly,
+          tid: payloadData.tid || '',
+          id: payloadData.id || ''
       };
 
       if (payloadData.videoId) {

img/sb_actions.png

@@ -2,7 +2,7 @@
   "name": "Social Stream Ninja",
   "description": "Powerful tooling to engage live chat on Youtube, Twitch, Zoom, and more.",
   "manifest_version": 3,
-  "version": "3.47.3",
+  "version": "3.47.4",
   "homepage_url": "http://socialstream.ninja/",
   "browser_specific_settings": {
     "gecko": {
@@ -74,6 +74,7 @@
     "https://patreon.com/*",
     "https://simps.com/app/*",
     "https://velora.tv/*",
+    "https://api.velora.tv/*",
     "https://studio.kwai.com/*",
     "https://studio.favorited.com/popout/chat",
     "https://*/*autoreloadwithsocialstream",
@@ -1191,6 +1192,20 @@
         "http://localhost:8181/*/kick.html*"
       ]
     },
+    {
+      "js": [
+        "./lite/vendor/socket.io.min.js",
+        "./sources/websocket/velora.js"
+      ],
+      "matches": [
+        "https://socialstream.ninja/sources/websocket/velora*",
+        "https://beta.socialstream.ninja/sources/websocket/velora*",
+        "https://socialstream.ninja/beta/sources/websocket/velora*",
+        "file:///C:/Users/steve/Code/social_stream/sources/websocket/velora.html*",
+        "http://localhost:8080/*/velora.html*",
+        "http://localhost:8181/*/velora.html*"
+      ]
+    },
     {
       "js": [
         "./sources/websocket/rumble.js"

img/sb_history.png

@@ -6269,13 +6269,13 @@ <h3>Printer Control</h3>
 								</div>
 								<div>
 									<div class="textInputContainer" style="display: inline-block; width: 250px;">
-										<input type="text" id="streamerbotactionid" class="textInput" autocomplete="off" placeholder="Enter Streamer.bot Action GUID" data-textsetting="streamerbotactionid" />
+										<input type="text" id="streamerbotactionid" class="textInput" autocomplete="off" placeholder="Enter Streamer.bot Action ID" data-textsetting="streamerbotactionid" />
 										<label for="streamerbotactionid"><span data-translate="streamerbot-action-id">&gt; Streamer.bot Action ID</span></label>
 									</div>
 								</div>
 								<p>
 									<span>
-										The Streamer.bot support is experimental and challenging to setup. I have a <a href="https://socialstream.ninja/streamerbot.html" class="lightblue" target="_blank">GUIDE HERE</a>, but I'd welcome support from Streamer.bot devs to improve it all further.
+										See the <a href="https://socialstream.ninja/streamerbot.html" class="lightblue" target="_blank">setup guide</a> for step-by-step instructions on creating the required Action in Streamer.bot and finding its Action ID. Leave the password blank if you have not set one in Streamer.bot's WebSocket Server settings.
 										<br />
 									</span>
 								</p>

manifest.json

@@ -75,6 +75,8 @@
 
 	var channelName = "";
 
+	var processedMessages = new Set();
+	
 	function processMessage(ele){
 		console.log(ele);
 		if (!ele || !ele.isConnected){
@@ -98,7 +100,8 @@
 
 		var name="";
 		try {
-			name = escapeHtml(ele.querySelector("[title^='View profile for'], [class*='border-amber'] .text-sm.font-semibold.leading-tight.text-white").textContent);
+			var nameEl = ele.querySelector("[title^='View profile for']");
+		if (nameEl) { name = escapeHtml(nameEl.textContent.trim()); }
 		} catch(e){
 		}
 
@@ -117,7 +120,8 @@
 
 		var msg="";
 		try {
-			msg = getAllContentNodes(ele.querySelector("div > div > div.text-sm.break-words.text-white, [class*='border-amber'] > div > div > p")).trim();
+			var msgEl = ele.querySelector(".chat-message-content > div:last-child");
+		if (msgEl) { msg = getAllContentNodes(msgEl).trim(); }
 		} catch(e){
 		}
 
@@ -136,6 +140,15 @@
 			return;
 		}
 
+		var msgKey = name + "|\u00b6|" + msg;
+		if (processedMessages.has(msgKey)){
+			ele.skip = true;
+			return;
+		}
+		processedMessages.add(msgKey);
+		if (processedMessages.size > 200){
+			processedMessages.delete(processedMessages.values().next().value);
+		}
 
 		ele.skip = true;
 
@@ -165,20 +178,27 @@
 		}
 	}
 	var isExtensionOn = true;
+	var cachedViewerEl = null;
 
 	function checkViewers(){
 		if (isExtensionOn && (settings.showviewercount || settings.hypemode)){
 			try {
 
 
-				if (window.location.href === "https://velora.tv/dashboard/stream/popout?panels=chat"){
-					var viewerSpan = document.querySelector(".min-w-0 > .mt-1").childNodes[0];
-				} else {
-					var viewerSpan = document.querySelector(".inline-flex.items-center.gap-2.rounded-full > .tracking-normal.text-white.font-semibold").parentNode.nextElementSibling.childNodes[1];
+				if (!cachedViewerEl || !cachedViewerEl.isConnected){
+					cachedViewerEl = null;
+					var els = document.querySelectorAll("div, span");
+					for (var i = 0; i < els.length; i++){
+						var el = els[i];
+						if (!el.childElementCount && /^[\d,.]+[km]?\s+viewers?$/i.test(el.textContent.trim())){
+							cachedViewerEl = el;
+							break;
+						}
+					}
 				}
 
-				if (viewerSpan && viewerSpan.textContent){
-					let views = viewerSpan.textContent.toUpperCase();
+				if (cachedViewerEl && cachedViewerEl.textContent){
+					let views = cachedViewerEl.textContent.toUpperCase();
 					let multiplier = 1;
 					if (views.includes("K")){
 						multiplier = 1000;
@@ -312,10 +332,9 @@
 		}
 		checking = setInterval(function(){
 			try {
-				var container = document.querySelector(".duration-300.rounded-none > .flex-1.overflow-y-auto.p-4.space-y-3.min-h-0");
-				if (!container && window.location.href.startsWith("https://velora.tv/dashboard/stream/popout?")){
-					container = document.querySelector("body");
-				} 
+				var container = document.querySelector(".chat-scroll-hidden");
+				
+				if (!container){ return; }
 
 				if (!container.marked){
 					container.marked=true;
@@ -324,11 +343,7 @@
 
 					setTimeout(function(){
 						dataIndex = 0;
-						if (window.location.href.startsWith("https://velora.tv/dashboard/stream/popout?")){
-							onElementInserted(container, true);
-						} else {
-							onElementInserted(container);
-						}
+						onElementInserted(container);
 					},2000);
 				}
 				checkViewers();

popup.html

@@ -3845,18 +3845,18 @@ function updateKickStreamEditorFields(channel) {
 }
 
 async function fetchCurrentKickChannelInfo() {
-    let path = '/public/v1/channels';
     if (state.channelId != null) {
-        path += `?broadcaster_user_id=${encodeURIComponent(String(state.channelId))}`;
-    } else if (state.channelSlug) {
-        path += `?slug=${encodeURIComponent(normalizeChannel(state.channelSlug))}`;
-    }
-    const data = await apiFetch(path);
-    return pickKickChannelBySlug(
-        unwrapKickChannelPayload(data),
-        normalizeChannel(state.channelSlug),
-        { allowSingletonWithoutSlug: true }
-    );
+        const path = `/public/v1/channels?broadcaster_user_id=${encodeURIComponent(String(state.channelId))}`;
+        const data = await apiFetch(path);
+        const channels = unwrapKickChannelPayload(data);
+        return channels[0] || null;
+    }
+    if (state.channelSlug) {
+        return fetchKickChannelBySlug(normalizeChannel(state.channelSlug));
+    }
+    const data = await apiFetch('/public/v1/channels');
+    const channels = unwrapKickChannelPayload(data);
+    return channels[0] || null;
 }
 
 async function refreshKickStreamInfo() {