nodebb-plugin-ezoic-infinite 1.6.45 → 1.6.46

package/package.json

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

package/public/client.js

@@ -1515,11 +1515,7 @@ function buildOrdinalMap(items) {
 (function () {
   // Goal: keep ad injection intact. Only repair when we detect "pile-up" of between wraps.
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
-  // Between-ad wrapper selector.
-  // Note: Ezoic can inject <span class="ezoic-ad ...">; we normalize those into our wraps.
-  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between, span.nodebb-ezoic-wrap.ezoic-ad-between, div.ezoic-ad-between, span.ezoic-ad-between';
-  var BETWEEN_WRAP_CHILD_SEL = ':scope > div.nodebb-ezoic-wrap.ezoic-ad-between, :scope > span.nodebb-ezoic-wrap.ezoic-ad-between, :scope > div.ezoic-ad-between, :scope > span.ezoic-ad-between';
-  var ORPHAN_EZOIC_CHILD_SEL = ':scope > span.ezoic-ad:not(.nodebb-ezoic-wrap), :scope > div.ezoic-ad:not(.nodebb-ezoic-wrap)';
+  var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
 
   var scheduled = false;
@@ -1611,19 +1607,7 @@ function buildOrdinalMap(items) {
       if (!ul) return;
 
       // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
-      // First: any explicit between wrappers
-      ul.querySelectorAll(BETWEEN_WRAP_CHILD_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-
-      // Second: native injected Ezoic containers directly under the list.
-      // They don't have our marker classes, so we convert them.
-      ul.querySelectorAll(ORPHAN_EZOIC_CHILD_SEL).forEach(function(w){
-        try { w.classList.add('nodebb-ezoic-wrap'); } catch(e) {}
-        try { w.classList.add('ezoic-ad-between'); } catch(e) {}
-        if (!w.getAttribute('data-ezoic-after')) {
-          w.setAttribute('data-ezoic-after', '1');
-        }
-        ensureHostForWrap(w, ul);
-      });
+      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
 
       // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
       if (!detectPileUp(ul)) return;
@@ -1708,3 +1692,106 @@ function buildOrdinalMap(items) {
 })();
 // ===== /V17 =====
 
+
+// ===== V17.17 TOPFIX (minimal, non-invasive) =====
+// Goal: prevent "between" ad wrappers from being inserted at the very top of the topic list
+// (before any real topic LI), without moving or re-wrapping existing GPT containers.
+// We only:
+//  1) If a between wrapper is inserted as the first child and a topic LI exists, move its host
+//     to after the first topic LI (one-time).
+//  2) If no topic LI exists yet, mark it with data-ezoic-after="1" and leave it in place.
+// This avoids the heavier "pending pool" logic that can reduce fill.
+(function(){
+  'use strict';
+
+  var UL_SEL = 'ul.topics, ul.topic-list, ul.category-list';
+  var BETWEEN_WRAP_SEL = '.nodebb-ezoic-wrap.ezoic-ad-between';
+  var HOST_CLASS = 'ezoic-ad-host';
+
+  function getUl(){
+    return document.querySelector(UL_SEL);
+  }
+
+  function firstTopicLi(ul){
+    if (!ul) return null;
+    // Consider any LI that is not our ad host as a topic LI
+    var lis = ul.querySelectorAll(':scope > li');
+    for (var i=0;i<lis.length;i++){
+      if (!lis[i].classList.contains(HOST_CLASS)) return lis[i];
+    }
+    return null;
+  }
+
+  function hostFromWrap(wrap){
+    if (!wrap) return null;
+    // expected structure: li.ezoic-ad-host > (something) > span.nodebb-ezoic-wrap
+    var host = wrap.closest('li');
+    if (host && host.classList && host.classList.contains(HOST_CLASS)) return host;
+    return null;
+  }
+
+  function handleWrapInserted(ul, wrap){
+    try {
+      if (!ul || !wrap) return;
+      var host = hostFromWrap(wrap);
+      if (!host) return;
+
+      // Only act when the host is at the very top (before any topic LI)
+      if (host.parentElement !== ul) return;
+      if (ul.firstElementChild !== host) return;
+
+      var anchor = firstTopicLi(ul);
+      if (anchor) {
+        // One-time move to just after first topic LI
+        anchor.insertAdjacentElement('afterend', host);
+      } else {
+        // No anchor yet: mark to discourage top placement; do not move later
+        try { wrap.setAttribute('data-ezoic-after', '1'); } catch(e) {}
+      }
+    } catch (e) {}
+  }
+
+  function scanExisting(ul){
+    try {
+      var wraps = ul ? ul.querySelectorAll(BETWEEN_WRAP_SEL) : [];
+      wraps.forEach(function(w){ handleWrapInserted(ul, w); });
+    } catch(e) {}
+  }
+
+  function init(){
+    var ul = getUl();
+    if (!ul) return;
+
+    scanExisting(ul);
+
+    if (typeof MutationObserver === 'undefined') return;
+    var mo = new MutationObserver(function(muts){
+      for (var i=0;i<muts.length;i++){
+        var m = muts[i];
+        if (!m.addedNodes) continue;
+        for (var j=0;j<m.addedNodes.length;j++){
+          var n = m.addedNodes[j];
+          if (!n || n.nodeType !== 1) continue;
+
+          // direct wrap
+          if (n.matches && n.matches(BETWEEN_WRAP_SEL)) {
+            handleWrapInserted(ul, n);
+            continue;
+          }
+          // wrap somewhere inside
+          var inner = n.querySelector ? n.querySelector(BETWEEN_WRAP_SEL) : null;
+          if (inner) handleWrapInserted(ul, inner);
+        }
+      }
+    });
+
+    mo.observe(ul, { childList: true, subtree: true });
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', init);
+  } else {
+    init();
+  }
+})();
+// ===== /V17.17 TOPFIX =====