fix(gif): restore copied source filtering

Author: steveseguin

gif.html

@@ -65,6 +65,9 @@
         const mediaContent = document.getElementById('mediaContent');
         const customGifFilterId = (urlParams.get('gifid') || '').trim();
         const customGifFilterCommand = (urlParams.get('gifcommand') || '').trim().toLowerCase();
+        const customGifFilterCommands = customGifFilterCommand.split(',').map(function(command) {
+            return command.trim();
+        }).filter(Boolean);
         if (urlParams.has('stretch')) document.body.classList.add('stretch');
         let mediaQueue = [];
         let isPlaying = false;
@@ -104,23 +107,29 @@
 		const mediaProbeTimeout = 4000;
 
         function shouldShowCustomGifData(data) {
-            if (!customGifFilterId && !customGifFilterCommand) return true;
+            if (!customGifFilterId && !customGifFilterCommands.length) return true;
 
             const meta = data && data.meta ? data.meta : {};
             if (customGifFilterId && String(meta.customGifCommandId || '') === customGifFilterId) {
                 return true;
             }
 
-            if (customGifFilterCommand) {
+            if (customGifFilterCommands.length) {
                 const command = String(meta.customGifCommand || '').toLowerCase();
-                if (command === customGifFilterCommand) return true;
+                if (customGifFilterCommands.indexOf(command) !== -1) return true;
 
                 const commands = Array.isArray(meta.customGifCommands) ? meta.customGifCommands : [];
                 for (let i = 0; i < commands.length; i++) {
-                    if (String(commands[i] || '').toLowerCase() === customGifFilterCommand) {
+                    if (customGifFilterCommands.indexOf(String(commands[i] || '').toLowerCase()) !== -1) {
                         return true;
                     }
                 }
+
+                const chatMessage = String(data && data.chatmessage ? data.chatmessage : '').trim().toLowerCase();
+                const firstWord = chatMessage.split(/\s+/)[0] || '';
+                if (customGifFilterCommands.indexOf(firstWord) !== -1 || customGifFilterCommands.indexOf(chatMessage) !== -1) {
+                    return true;
+                }
             }
 
             return false;
@@ -536,7 +545,7 @@
 
         const iframe = document.createElement("iframe");
         const filename = new URL(window.location.href).pathname.split('/').pop().split('.')[0] || "dock";
-        const bridgeLabel = (customGifFilterId || urlParams.get('label') || filename).trim() || filename;
+        const bridgeLabel = ((customGifFilterId || customGifFilterCommand) ? filename : (urlParams.get('label') || filename)).trim() || filename;
         const password = urlParams.get('password') || 'false';
         const lanonly = urlParams.has('lanonly') ? '&lanonly' : '';
         iframe.src = "https://vdo.socialstream.ninja/?ln&salt=vdo.ninja&notmobile&notmobile&password=" + encodeURIComponent(password) + lanonly + "&solo&view=" + urlParams.get('session') + "&novideo&noaudio&label=" + encodeURIComponent(bridgeLabel) + "&cleanoutput&room=" + urlParams.get('session');

popup.js

@@ -6066,12 +6066,18 @@ function getCustomGifCommandSourceUrl(entry) {
 
     const commandInput = entry?.querySelector('.custom-command');
     const mediaUrlInput = entry?.querySelector('.custom-media-url');
-    const id = getCustomGifCommandEntryId(commandInput?.value?.trim() || '', mediaUrlInput?.value?.trim() || '', entry?.dataset.commandId);
+    const command = commandInput?.value?.trim() || '';
+    const id = getCustomGifCommandEntryId(command, mediaUrlInput?.value?.trim() || '', entry?.dataset.commandId);
     if (entry) entry.dataset.commandId = id;
 
     url = removeQueryParamWithValue(url, 'gifid');
     url = removeQueryParamWithValue(url, 'gifcommand');
-    return cleanURL(updateURL('gifid=' + encodeURIComponent(id), url));
+    url = updateURL('gifid=' + encodeURIComponent(id), url);
+    const aliases = getCustomGifCommandAliases(command);
+    if (aliases.length) {
+        url = updateURL('gifcommand=' + encodeURIComponent(aliases.join(',')), url);
+    }
+    return cleanURL(url);
 }
 
 function copyCustomGifCommandSource(entry, button) {
@@ -7117,7 +7123,7 @@ function triggerCustomGifPreview(entry) {
         return;
     }
 
-    chrome.runtime.sendMessage({
+    const payload = {
         cmd: 'previewCustomGif',
         target: 'gif',
         type: 'popup',
@@ -7129,7 +7135,9 @@ function triggerCustomGifPreview(entry) {
             customGifCommand: getCustomGifCommandAliases(command)[0] || command,
             customGifCommands: getCustomGifCommandAliases(command)
         }
-    }, function () {});
+    };
+    chrome.runtime.sendMessage(payload, function () {});
+    chrome.runtime.sendMessage(Object.assign({}, payload, { target: id }), function () {});
 }
 
 function createCommandEntry(command = '', url = '', id = '') {