Merge branch 'main' into Not_Stable

Author: adhamhaithameid

extension/entrypoints/background.ts

@@ -601,4 +601,4 @@ function sendStatusToTab(pending: PendingDownload, status: DownloadStatus, userM
   try {
     chrome.tabs.sendMessage(pending.tabId, { type: 'CQD_DOWNLOAD_STATUS', requestId: pending.requestId, status, errorCode, userMessage });
   } catch {}
-}
+}

extension/entrypoints/comment_frame.content.ts

@@ -139,8 +139,9 @@ function stopCommentsFeature(): void {
  * ---------------------------------------------------*/
 if (typeof chrome !== 'undefined' && chrome.runtime?.onMessage) {
   chrome.runtime.onMessage.addListener((message) => {
-    if (!message) return;
-    if (message.type !== 'CQD_POPUP_SET_DESIRED_STATE') return;
+    // Firefox fix: return false for messages we don't handle
+    if (!message) return false;
+    if (message.type !== 'CQD_POPUP_SET_DESIRED_STATE') return false;
     tabEnabled = !!message.enabled;
     if (tabEnabled) {
       whenExtensionEnabled(() => {
@@ -149,6 +150,7 @@ if (typeof chrome !== 'undefined' && chrome.runtime?.onMessage) {
     } else {
       stopCommentsFeature();
     }
+    return false; // No async response needed
   });
 }
 

extension/entrypoints/content/both-badge.ts

@@ -1,5 +1,5 @@
 // filepath: entrypoints/content/both-badge.ts
-import { COMMENT_ICON_URL, EDIT_ICON_SVG_RAW } from './icons';
+import { COMMENT_ICON_URL, EDIT_ICON_SVG_RAW, appendSvgFromString } from './icons';
 
 const INJECTED_ATTR = 'data-cqd-injected';
 
@@ -128,7 +128,7 @@ export function upgradeCombinedBadge(post: HTMLElement): void {
 
     const editedIcon = document.createElement('div');
     editedIcon.className = 'cqd-both-icon cqd-both-icon-edited';
-    editedIcon.innerHTML = EDIT_ICON_SVG_RAW;
+    appendSvgFromString(editedIcon, EDIT_ICON_SVG_RAW);
 
     const diffValue = document.createElement('span');
     diffValue.className = 'cqd-both-value cqd-both-value-edited';

extension/entrypoints/content/icons.ts

@@ -50,4 +50,29 @@ export const EDIT_ICON_URL = `data:image/svg+xml;utf8,${encodeURIComponent(
 )}`;
 export const COMMENT_ICON_URL = `data:image/svg+xml;utf8,${encodeURIComponent(
   COMMENT_ICON_SVG_RAW
-)}`;
+)}`;
+
+/**
+ * CSP-safe: Parse SVG string and append to container using DOMParser.
+ * Avoids innerHTML which can be blocked by strict CSP in Firefox.
+ */
+export function appendSvgFromString(container: HTMLElement, svgString: string): void {
+  try {
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(svgString, 'image/svg+xml');
+    const svg = doc.documentElement;
+    
+    // Check for parse errors
+    const parseError = doc.querySelector('parsererror');
+    if (parseError) {
+      console.warn('[CQD] SVG parse error:', parseError.textContent);
+      return;
+    }
+    
+    // Import the node into the current document and append
+    const importedSvg = document.importNode(svg, true);
+    container.appendChild(importedSvg);
+  } catch (err) {
+    console.warn('[CQD] Failed to append SVG:', err);
+  }
+}

extension/entrypoints/edited_frame.content.ts

@@ -1,5 +1,5 @@
 // filepath: entrypoints/edited_frame.content.ts
-import { EDIT_ICON_SVG_RAW } from './content/icons';
+import { EDIT_ICON_SVG_RAW, appendSvgFromString } from './content/icons';
 import { injectStyles } from './content/styles';
 import { isPageDark } from './content/theme';
 import { t } from './content/i18n';
@@ -132,8 +132,9 @@ function stopEditedFeature(): void {
  * ---------------------------------------------------*/
 if (typeof chrome !== 'undefined' && chrome.runtime?.onMessage) {
   chrome.runtime.onMessage.addListener((message) => {
-    if (!message) return;
-    if (message.type !== 'CQD_POPUP_SET_DESIRED_STATE') return;
+    // Firefox fix: return false for messages we don't handle
+    if (!message) return false;
+    if (message.type !== 'CQD_POPUP_SET_DESIRED_STATE') return false;
     tabEnabled = !!message.enabled;
     if (tabEnabled) {
       whenExtensionEnabled(() => {
@@ -142,6 +143,7 @@ if (typeof chrome !== 'undefined' && chrome.runtime?.onMessage) {
     } else {
       stopEditedFeature();
     }
+    return false; // No async response needed
   });
 }
 
@@ -360,7 +362,7 @@ function createEditedOverlay(post: HTMLElement, diffText: string) {
 
     const iconWrapper = document.createElement('div');
     iconWrapper.className = 'cqd-edited-icon';
-    iconWrapper.innerHTML = EDIT_ICON_SVG_RAW;
+    appendSvgFromString(iconWrapper, EDIT_ICON_SVG_RAW);
     pill.appendChild(iconWrapper);
 
     const content = document.createElement('div');

extension/entrypoints/utils/firefox-debug.ts

@@ -0,0 +1,56 @@
+// filepath: extension/entrypoints/utils/firefox-debug.ts
+
+/**
+ * Firefox-specific debugging utilities.
+ * Helps diagnose Firefox-only issues in the extension.
+ */
+
+/**
+ * Detect if the current browser is Firefox.
+ */
+export function isFirefox(): boolean {
+  return typeof navigator !== 'undefined' && 
+         /Firefox/i.test(navigator.userAgent);
+}
+
+/**
+ * Log a debug message only when running in Firefox.
+ */
+export function logFirefox(category: string, message: string, data?: unknown): void {
+  if (!isFirefox()) return;
+  
+  const prefix = `[CQD:Firefox:${category}]`;
+  if (data !== undefined) {
+    console.log(prefix, message, data);
+  } else {
+    console.log(prefix, message);
+  }
+}
+
+/**
+ * Log a warning message only when running in Firefox.
+ */
+export function warnFirefox(category: string, message: string, data?: unknown): void {
+  if (!isFirefox()) return;
+  
+  const prefix = `[CQD:Firefox:${category}]`;
+  if (data !== undefined) {
+    console.warn(prefix, message, data);
+  } else {
+    console.warn(prefix, message);
+  }
+}
+
+/**
+ * Check if Firefox's Promise-based messaging API is available.
+ * Returns true if sendMessage returns a Promise (Firefox behavior).
+ */
+export function hasPromiseBasedMessaging(): boolean {
+  if (typeof chrome === 'undefined' || !chrome.runtime?.sendMessage) {
+    return false;
+  }
+  
+  // In Firefox, sendMessage can return a Promise even in MV2
+  // We detect this by checking the browser's user agent
+  return isFirefox();
+}