nodebb-plugin-ezoic-infinite 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -40,7 +40,27 @@
     return document.querySelectorAll('li[component="category/topic"]').length > 0 && !isTopicPage();
   }
 
+
+  function normalizeBool(v) {
+    return v === true || v === 1 || v === '1' || v === 'on' || v === 'true' || v === 'yes';
+  }
+
+  function normalizeInterval(v, fallback) {
+    const n = parseInt(v, 10);
+    return Number.isFinite(n) && n > 0 ? n : fallback;
+  }
+
+  function getPoolValue(v) {
+    // Accept string, array of numbers/strings
+    if (Array.isArray(v)) return v.join('\n');
+    return v;
+  }
+
   function parsePool(raw) {
+    raw = getPoolValue(raw);
+
+    raw = getPoolValue(raw);
+
     if (!raw) return [];
     // accept newline, comma, space, semicolon
     const arr = String(raw).split(/[\n,;\s]+/)
@@ -153,8 +173,8 @@
   }
 
   function injectBetweenTopics(cfg) {
-    if (!cfg.enableBetweenAds) return;
-    const interval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
+    if (!normalizeBool(cfg.enableBetweenAds)) return;
+    const interval = normalizeInterval(cfg.intervalPosts ?? cfg.intervalTopics, 6);
     const pool = parsePool(cfg.placeholderIds);
     if (!pool.length) return;
 
@@ -184,8 +204,8 @@
   }
 
   function injectBetweenMessages(cfg) {
-    if (!cfg.enableMessageAds) return;
-    const interval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
+    if (!normalizeBool(cfg.enableMessageAds)) return;
+    const interval = normalizeInterval(cfg.messageIntervalPosts, 3);
     const pool = parsePool(cfg.messagePlaceholderIds);
     if (!pool.length) return;
 
@@ -246,14 +266,35 @@
     debounceTimer = setTimeout(run, 150);
   }
 
-  document.addEventListener('DOMContentLoaded', function () {
-    run();
-    setTimeout(run, 1200);
-  });
+function bindNodeBBEvents() {
+    // NodeBB triggers these events through jQuery on window
+    if (window.jQuery) {
+      const $w = window.jQuery(window);
+      $w.off('.ezoicInfinite');
+      $w.on('action:ajaxify.end.ezoicInfinite', scheduleRun);
+      $w.on('action:posts.loaded.ezoicInfinite', scheduleRun);
+      $w.on('action:topic.loaded.ezoicInfinite', scheduleRun);
+      $w.on('action:topics.loaded.ezoicInfinite', scheduleRun);
+      $w.on('action:category.loaded.ezoicInfinite', scheduleRun);
+      $w.on('action:ajaxify.start.ezoicInfinite', function () {
+        pageKey = null;
+        cleanupForNewPage();
+      });
+    }
+  }
 
-  window.addEventListener('action:ajaxify.end', scheduleRun);
-  window.addEventListener('action:posts.loaded', scheduleRun);
-  window.addEventListener('action:topic.loaded', scheduleRun);
-  window.addEventListener('action:topics.loaded', scheduleRun);
-  window.addEventListener('action:category.loaded', scheduleRun);
+  bindNodeBBEvents();
+
+  // Run immediately, so it works on first ajaxify navigation too
+  run();
+  setTimeout(run, 1200);
+
+  // Also run on hard-refresh initial load
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', function () {
+      bindNodeBBEvents();
+      run();
+      setTimeout(run, 1200);
+    });
+  }
 })();