From 6d572fa03dcc0d9e7761c1b6397338ca8ffcb462 Mon Sep 17 00:00:00 2001
From: Andy Dixon <andy@andydixon.com>
Date: Mon, 21 Sep 2026 17:06:42 +0100
Subject: [PATCH] Add every-page rules and trigger logging

---
 chrome/content.js  | 36 ++++++++++++++++++++++++------------
 chrome/popup.html  |  1 +
 chrome/popup.js    |  7 ++++++-
 firefox/content.js | 36 ++++++++++++++++++++++++------------
 firefox/popup.html |  1 +
 firefox/popup.js   |  7 ++++++-
 6 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/chrome/content.js b/chrome/content.js
index 3517ab1..e8e1a0a 100644
--- a/chrome/content.js
+++ b/chrome/content.js
@@ -8,10 +8,10 @@
   const autoClickTimers = new Map(); // rule name -> setInterval id
   const injectedStyles = new Map(); // rule name -> <style> element currently on the page
 
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', boot);
-  } else {
+  if (document.readyState === 'complete') {
     boot();
+  } else {
+    window.addEventListener('load', boot, { once: true });
   }
 
   function boot() {
@@ -41,25 +41,37 @@
 
   function ruleMatches(rule) {
     const currentUrl = window.location.href;
-    if (rule.matchType === 'url') {
-      return currentUrl.includes(rule.urlPattern);
-    } else if (rule.matchType === 'element') {
-      return !!document.querySelector(rule.elementSelector);
-    } else if (rule.matchType === 'both') {
-      return currentUrl.includes(rule.urlPattern) && !!document.querySelector(rule.elementSelector);
+    if (rule.matchType === 'all') {
+      return { matched: true, elementCount: null };
     }
-    return false;
+
+    if (rule.matchType === 'url') {
+      return { matched: currentUrl.includes(rule.urlPattern), elementCount: null };
+    }
+
+    if (rule.matchType !== 'element' && rule.matchType !== 'both') {
+      return { matched: false, elementCount: null };
+    }
+    if (rule.matchType === 'both' && !currentUrl.includes(rule.urlPattern)) {
+      return { matched: false, elementCount: null };
+    }
+
+    const elementCount = document.querySelectorAll(rule.elementSelector).length;
+    return { matched: elementCount > 0, elementCount };
   }
 
   function evaluateRule(rule) {
     if (!rule.enabled) return;
 
-    const matched = ruleMatches(rule);
+    const { matched, elementCount } = ruleMatches(rule);
     const wasMatched = ruleMatchState.get(rule.name) === true;
     ruleMatchState.set(rule.name, matched);
 
     if (matched && !wasMatched) {
-      console.log(`[GreasyBoii] ✓ Executing rule: ${rule.name}`);
+      const elementLog = elementCount === null
+        ? ''
+        : ` (${elementCount} element${elementCount === 1 ? '' : 's'} found for "${rule.elementSelector}")`;
+      console.log(`[GreasyBoii] Rule triggered: ${rule.name}${elementLog}`);
       executeRule(rule);
     }
   }
diff --git a/chrome/popup.html b/chrome/popup.html
index afe8e5b..23fadad 100644
--- a/chrome/popup.html
+++ b/chrome/popup.html
@@ -134,6 +134,7 @@
                 <option value="url">URL contains string</option>
                 <option value="element">Page contains element</option>
                 <option value="both">Both URL and element</option>
+                <option value="all">Run on every page</option>
               </select>
             </div>
 
diff --git a/chrome/popup.js b/chrome/popup.js
index ce1d450..4d68bd3 100644
--- a/chrome/popup.js
+++ b/chrome/popup.js
@@ -77,6 +77,11 @@ function updateFieldVisibility(matchType) {
     elementGroup.style.display = 'block';
     urlInput.required = true;
     elementInput.required = true;
+  } else if (matchType === 'all') {
+    urlGroup.style.display = 'none';
+    elementGroup.style.display = 'none';
+    urlInput.required = false;
+    elementInput.required = false;
   }
 }
 
@@ -178,7 +183,7 @@ function buildRuleCard(rule, index) {
   nameSpan.textContent = rule.name;
   badgeGroup.appendChild(nameSpan);
 
-  const matchTypeLabels = { url: 'URL', element: 'Element', both: 'URL + Element' };
+  const matchTypeLabels = { url: 'URL', element: 'Element', both: 'URL + Element', all: 'Every page' };
   badgeGroup.appendChild(makeBadge(matchTypeLabels[rule.matchType] || rule.matchType, 'bg-secondary'));
 
   if (rule.javascript && rule.javascript.trim()) badgeGroup.appendChild(makeBadge('JS', 'bg-warning'));
diff --git a/firefox/content.js b/firefox/content.js
index c546ec2..2917a29 100644
--- a/firefox/content.js
+++ b/firefox/content.js
@@ -8,10 +8,10 @@
   const autoClickTimers = new Map(); // rule name -> setInterval id
   const injectedStyles = new Map(); // rule name -> <style> element currently on the page
 
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', boot);
-  } else {
+  if (document.readyState === 'complete') {
     boot();
+  } else {
+    window.addEventListener('load', boot, { once: true });
   }
 
   function boot() {
@@ -41,25 +41,37 @@
 
   function ruleMatches(rule) {
     const currentUrl = window.location.href;
-    if (rule.matchType === 'url') {
-      return currentUrl.includes(rule.urlPattern);
-    } else if (rule.matchType === 'element') {
-      return !!document.querySelector(rule.elementSelector);
-    } else if (rule.matchType === 'both') {
-      return currentUrl.includes(rule.urlPattern) && !!document.querySelector(rule.elementSelector);
+    if (rule.matchType === 'all') {
+      return { matched: true, elementCount: null };
     }
-    return false;
+
+    if (rule.matchType === 'url') {
+      return { matched: currentUrl.includes(rule.urlPattern), elementCount: null };
+    }
+
+    if (rule.matchType !== 'element' && rule.matchType !== 'both') {
+      return { matched: false, elementCount: null };
+    }
+    if (rule.matchType === 'both' && !currentUrl.includes(rule.urlPattern)) {
+      return { matched: false, elementCount: null };
+    }
+
+    const elementCount = document.querySelectorAll(rule.elementSelector).length;
+    return { matched: elementCount > 0, elementCount };
   }
 
   function evaluateRule(rule) {
     if (!rule.enabled) return;
 
-    const matched = ruleMatches(rule);
+    const { matched, elementCount } = ruleMatches(rule);
     const wasMatched = ruleMatchState.get(rule.name) === true;
     ruleMatchState.set(rule.name, matched);
 
     if (matched && !wasMatched) {
-      console.log(`[GreasyBoii] ✓ Executing rule: ${rule.name}`);
+      const elementLog = elementCount === null
+        ? ''
+        : ` (${elementCount} element${elementCount === 1 ? '' : 's'} found for "${rule.elementSelector}")`;
+      console.log(`[GreasyBoii] Rule triggered: ${rule.name}${elementLog}`);
       executeRule(rule);
     }
   }
diff --git a/firefox/popup.html b/firefox/popup.html
index afe8e5b..23fadad 100644
--- a/firefox/popup.html
+++ b/firefox/popup.html
@@ -134,6 +134,7 @@
                 <option value="url">URL contains string</option>
                 <option value="element">Page contains element</option>
                 <option value="both">Both URL and element</option>
+                <option value="all">Run on every page</option>
               </select>
             </div>
 
diff --git a/firefox/popup.js b/firefox/popup.js
index be63ed0..ea5c24f 100644
--- a/firefox/popup.js
+++ b/firefox/popup.js
@@ -77,6 +77,11 @@ function updateFieldVisibility(matchType) {
     elementGroup.style.display = 'block';
     urlInput.required = true;
     elementInput.required = true;
+  } else if (matchType === 'all') {
+    urlGroup.style.display = 'none';
+    elementGroup.style.display = 'none';
+    urlInput.required = false;
+    elementInput.required = false;
   }
 }
 
@@ -178,7 +183,7 @@ function buildRuleCard(rule, index) {
   nameSpan.textContent = rule.name;
   badgeGroup.appendChild(nameSpan);
 
-  const matchTypeLabels = { url: 'URL', element: 'Element', both: 'URL + Element' };
+  const matchTypeLabels = { url: 'URL', element: 'Element', both: 'URL + Element', all: 'Every page' };
   badgeGroup.appendChild(makeBadge(matchTypeLabels[rule.matchType] || rule.matchType, 'bg-secondary'));
 
   if (rule.javascript && rule.javascript.trim()) badgeGroup.appendChild(makeBadge('JS', 'bg-warning'));