nodebb-plugin-ezoic-infinite 1.2.3 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -93,11 +93,57 @@
     return 'category';
   }
 
+
+  function getTopicItems() {
+    return Array.from(document.querySelectorAll(SELECTORS.topicItem));
+  }
+
+  function getPostContainers() {
+    // Harmony can include multiple [component="post"] blocks (e.g. parent previews, nested structures).
+    // We only want top-level post containers that actually contain post content.
+    const nodes = Array.from(document.querySelectorAll(SELECTORS.postItem));
+    return nodes.filter((el) => {
+      if (!el || !el.isConnected) return false;
+
+      // Must contain post content
+      if (!el.querySelector('[component="post/content"]')) return false;
+
+      // Must not be nested within another post container
+      const parentPost = el.parentElement && el.parentElement.closest('[component="post"][data-pid]');
+      if (parentPost && parentPost !== el) return false;
+
+      // Avoid "parent/quote" blocks that use component="post/parent"
+      if (el.getAttribute('component') === 'post/parent') return false;
+
+      return true;
+    });
+  }
+
   function hasAdImmediatelyAfter(el) {
     const n = el && el.nextElementSibling;
     return !!(n && n.classList && n.classList.contains(WRAP_CLASS));
   }
 
+  function enforceNoAdjacentAds() {
+    // NodeBB can virtualize (remove) topics/posts from the DOM while keeping our ad wrappers,
+    // which can temporarily make two ad wrappers adjacent. Hide the later one to avoid back-to-back ads.
+    const ads = Array.from(document.querySelectorAll(`.${WRAP_CLASS}`));
+    for (let i = 0; i < ads.length; i++) {
+      const ad = ads[i];
+      const prev = ad.previousElementSibling;
+      if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) {
+        ad.style.display = 'none';
+      } else {
+        ad.style.display = '';
+      }
+    }
+  }
+
+
+    const n = el && el.nextElementSibling;
+    return !!(n && n.classList && n.classList.contains(WRAP_CLASS));
+  }
+
   function buildWrap(id, kind, afterPos) {
     const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ${kind}`;
@@ -248,7 +294,7 @@
     const interval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
     const first = normalizeBool(cfg.showFirstTopicAd);
 
-    const items = Array.from(document.querySelectorAll(SELECTORS.topicItem));
+    const items = getTopicItems();
     if (!items.length) return 0;
 
     let inserted = 0;
@@ -288,7 +334,7 @@
     const interval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
     const first = normalizeBool(cfg.showFirstMessageAd);
 
-    const posts = Array.from(document.querySelectorAll(SELECTORS.postItem));
+    const posts = getPostContainers();
     if (!posts.length) return 0;
 
     let inserted = 0;
@@ -321,7 +367,40 @@
     return inserted;
   }
 
+
+  function destroyUsedPlaceholders() {
+    const ids = [];
+    try {
+      state.usedTopics.forEach((id) => ids.push(id));
+      state.usedPosts.forEach((id) => ids.push(id));
+    } catch (e) {}
+
+    if (!ids.length) return;
+
+    const call = () => {
+      try {
+        if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
+          window.ezstandalone.destroyPlaceholders(ids);
+        }
+      } catch (e) {}
+    };
+
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+
+      if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
+        call();
+      } else {
+        // queue for when ezstandalone becomes ready
+        window.ezstandalone.cmd.push(call);
+      }
+    } catch (e) {}
+  }
+
   function cleanup() {
+    // Destroy slots for IDs we used on the previous view before we reuse the same IDs on the next page
+    destroyUsedPlaceholders();
     state.pageKey = getPageKey();
     state.cfg = null;
     state.cfgPromise = null;
@@ -354,6 +433,7 @@
 
   async function runCore() {
     patchShowAds();
+    patchShowAds();
 
     const cfg = await fetchConfig();
     if (!cfg || cfg.excluded) return;
@@ -366,6 +446,8 @@
     if (kind === 'topic') inserted = injectPosts(cfg);
     else inserted = injectTopics(cfg);
 
+    enforceNoAdjacentAds();
+
     // If we inserted max per run, schedule another pass to gradually fill (avoids “burst”)
     if (inserted >= MAX_INSERTS_PER_RUN) {
       setTimeout(() => scheduleRun('continue-fill'), 120);