Fix Velora history and targeted pinned dock actions

Author: steveseguin

dock.html

@@ -7151,6 +7151,9 @@ <h3>Status</h3>
 				if (data.chatbotChunk || data.chatbotResponse) {
 					return true;
 				}
+				if (data.action && data.target && data.target !== "null" && data.target !== thisLabel) {
+					return; // does not match, so we assume this isn't for us.
+				}
 				if ("mid" in data) {
 					if (data.mid && (syncDocks || force)) {
 						if (autoTimeoutEnabled) {

sources/velora.js

@@ -86,6 +86,7 @@
 	var currentHistoryChannel = "";
 	var historyFallbackMisses = 0;
 	var historyPublishedMessages = false;
+	var historyPollStartedAt = 0;
 	var recentMessageContent = {};
 	var historyChannelCache = {};
 	var historyChannelPending = {};
@@ -132,6 +133,12 @@
 		return "content|\u00b6|" + channel + "|\u00b6|" + name + "|\u00b6|" + text;
 	}
 
+	function getApiMessageKey(msg, channel){
+		return msg.id
+			? "api-id|\u00b6|" + channel + "|\u00b6|" + msg.id
+			: "api-chat|\u00b6|" + channel + "|\u00b6|" + msg.timestamp + "|\u00b6|" + msg.name + "|\u00b6|" + msg.text;
+	}
+
 	function rememberRecentMessageContent(key){
 		var now = Date.now();
 		var keys;
@@ -361,9 +368,7 @@
 		if (!msg || !msg.name || !msg.text){
 			return;
 		}
-		msgKey = msg.id
-			? "api-id|\u00b6|" + channel + "|\u00b6|" + msg.id
-			: "api-chat|\u00b6|" + channel + "|\u00b6|" + msg.timestamp + "|\u00b6|" + msg.name + "|\u00b6|" + msg.text;
+		msgKey = getApiMessageKey(msg, channel);
 		if (!rememberMessageKey(msgKey)){
 			return;
 		}
@@ -386,6 +391,19 @@
 		historyPublishedMessages = true;
 	}
 
+	function seedApiMessage(raw, channel){
+		var msg = normalizeVeloraApiMessage(raw, channel);
+		var contentKey;
+		if (!msg || !msg.name || !msg.text){
+			return;
+		}
+		rememberMessageKey(getApiMessageKey(msg, channel));
+		contentKey = getMessageContentKey(channel, msg.name, msg.text);
+		if (contentKey){
+			rememberRecentMessageContent(contentKey);
+		}
+	}
+
 	function pollVeloraChatHistory(){
 		var channel;
 		if (!isExtensionOn){
@@ -397,17 +415,28 @@
 		}
 		if (channel !== currentHistoryChannel){
 			currentHistoryChannel = channel;
+			historyPublishedMessages = false;
+			historyPollStartedAt = Date.now();
 		}
 		resolveVeloraHistoryChannel(channel).then(function(resolvedChannel){
 			var pollChannel = resolvedChannel || channel;
 			return fetchVeloraJson("https://api.velora.tv/api/chat/channels/" + encodeURIComponent(pollChannel) + "/history?limit=50").then(function(data){
 				var messages = getHistoryMessagesFromResponse(data).slice();
+				var initialBatch = !historyPublishedMessages;
 				if (messages.length > 1 && getVeloraTimestampValue(messages[0]) > getVeloraTimestampValue(messages[messages.length - 1])){
 					messages.reverse();
 				}
 				messages.forEach(function(message){
+					var timestampValue = getVeloraTimestampValue(message);
+					if ((timestampValue && timestampValue < historyPollStartedAt) || (initialBatch && !timestampValue)){
+						seedApiMessage(message, channel);
+						return;
+					}
 					processApiMessage(message, channel);
 				});
+				if (initialBatch){
+					historyPublishedMessages = true;
+				}
 			});
 		}).catch(function(){
 		});
@@ -418,6 +447,7 @@
 			return;
 		}
 		historyPublishedMessages = false;
+		historyPollStartedAt = Date.now();
 		pollVeloraChatHistory();
 		historyPollTimer = setInterval(pollVeloraChatHistory, 3000);
 	}
@@ -427,6 +457,7 @@
 			clearInterval(historyPollTimer);
 			historyPollTimer = null;
 		}
+		historyPollStartedAt = 0;
 	}
 
 	function getChatInput(){

tests/eventflow-pin-message.test.js

@@ -169,6 +169,28 @@ async function runTests() {
         assert(JSON.stringify(targeted[0].payload) === JSON.stringify({ action: 'nextPinned' }), 'nextPinned command matches dock API');
     }
 
+    console.log('\n[6] targeted nextPinned keeps the dock label target in the payload');
+    {
+        const targeted = [];
+        const EFS = loadEventFlowSystem({
+            sendTargetP2P: (payload, target) => {
+                targeted.push({ payload, target });
+            },
+            sendToDestinations: async () => {
+                throw new Error('targeted nextPinned should not use chat fan-out');
+            }
+        });
+        const sys = new EFS();
+        const result = await sys.executeAction(
+            { id: 'pin4', actionType: 'pinMessage', config: { mode: 'nextPinned', target: 'moderator-dock' } },
+            { id: 1, chatmessage: 'ignored' }
+        );
+
+        assert(result.modified === false, 'targeted nextPinned does not modify the message');
+        assert(targeted[0].target === 'dock', 'targeted nextPinned still uses the dock P2P label');
+        assert(JSON.stringify(targeted[0].payload) === JSON.stringify({ action: 'nextPinned', target: 'moderator-dock' }), 'targeted nextPinned command carries the dock label');
+    }
+
     console.log(`\n${'-'.repeat(50)}`);
     console.log(`Results: ${passed} passed, ${failed} failed`);
     if (failed > 0) {