nodebb-plugin-ezoic-infinite 1.6.29 → 1.6.30

package/package.json

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

package/public/client.js

@@ -1511,17 +1511,19 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.1 upscroll-only top pile-up fixer (keeps injection intact) =====
+
+
+
+// ===== V17.2: Up-scroll "rehome" by data-ezoic-after (keeps injection intact) =====
 (function () {
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
   var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
 
+  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
   var scheduled = false;
   var lastRun = 0;
-  var COOLDOWN = 140;
-
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
+  var COOLDOWN = 160;
 
   function getY() {
     return window.pageYOffset || document.documentElement.scrollTop || 0;
@@ -1535,12 +1537,7 @@ function buildOrdinalMap(items) {
     } catch (e) { return null; }
   }
 
-  function isHost(node) {
-    return !!(node && node.nodeType === 1 && node.tagName === 'LI' && node.classList && node.classList.contains(HOST_CLASS));
-  }
-
   function ensureHostForWrap(wrap, ul) {
-    // only wrap invalid ul>div cases; do not interfere with normal injection
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
       if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return null;
@@ -1557,6 +1554,10 @@ function buildOrdinalMap(items) {
         host.setAttribute('role', 'listitem');
         host.style.listStyle = 'none';
         host.style.width = '100%';
+        try {
+          var after = wrap.getAttribute('data-ezoic-after');
+          if (after) host.setAttribute('data-ezoic-after', after);
+        } catch (e) {}
         ul.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1566,68 +1567,108 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function previousTopicLi(node) {
+  function nthTopic(ul, n) {
     try {
-      var prev = node.previousElementSibling;
-      while (prev) {
-        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        prev = prev.previousElementSibling;
+      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
+      if (!topics || !topics.length) return null;
+      if (n < 1) n = 1;
+      if (n > topics.length) n = topics.length;
+      return topics[n-1] || null;
+    } catch (e) {}
+    return null;
+  }
+
+  function getAfterValue(host) {
+    try {
+      var v = host.getAttribute('data-ezoic-after');
+      if (!v) {
+        var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
+        if (wrap) v = wrap.getAttribute('data-ezoic-after');
       }
+      var n = parseInt(v, 10);
+      return isNaN(n) ? null : n;
     } catch (e) {}
     return null;
   }
 
-  function detectTopPileUp(ul) {
-    // Detect a pile-up near the top: within first ~40 children, find 2+ between ads without topics between.
+  function isTopPiled(ul) {
     try {
       var kids = ul.children;
-      var limit = Math.min(kids.length, 40);
-      var run = 0;
-      var maxRun = 0;
+      var limit = Math.min(kids.length, 50);
+      var run = 0, maxRun = 0;
       for (var i=0;i<limit;i++){
         var el = kids[i];
-        var isBetween = false;
-        if (isHost(el)) isBetween = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
-        else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) isBetween = true;
+        var isAd = false;
+        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
+          isAd = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
+        } else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
+          isAd = true;
+        }
 
-        if (isBetween) { run++; if (run>maxRun) maxRun=run; }
-        else if (el.matches && el.matches(TOPIC_LI_SEL)) { run=0; }
-        else { run=0; }
+        if (isAd) { run++; if (run>maxRun) maxRun=run; }
+        else if (el.matches && el.matches(TOPIC_LI_SEL)) { run = 0; }
+        else { run = 0; }
       }
       return maxRun >= 2;
     } catch (e) {}
     return false;
   }
 
-  function redistributeTopPile(ul) {
+  function rehomeByAfter(ul) {
     try {
       if (!ul) return;
 
-      // Step 0: wrap invalid top-level between divs
-      try { ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); }); } catch(e){}
+      try {
+        ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+      } catch (e) {}
 
-      if (!detectTopPileUp(ul)) return;
+      if (!isTopPiled(ul)) return;
 
-      // Only move hosts that are currently in the top region (first 60 list children).
       var kids = ul.children;
-      var limit = Math.min(kids.length, 60);
+      var limit = Math.min(kids.length, 80);
+      var topHosts = [];
       for (var i=0;i<limit;i++){
         var el = kids[i];
-        if (!isHost(el)) continue;
-        var host = el;
-        var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
-        if (!wrap) continue;
-
-        var anchor = previousTopicLi(host);
-        if (!anchor) continue;
-        if (host.previousElementSibling !== anchor) {
-          anchor.insertAdjacentElement('afterend', host);
+        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
+          var wrap = el.querySelector && el.querySelector(BETWEEN_WRAP_SEL);
+          if (wrap) topHosts.push(el);
         }
       }
+      if (!topHosts.length) return;
+
+      topHosts.sort(function(a,b){
+        var aa = getAfterValue(a);
+        var bb = getAfterValue(b);
+        if (aa == null && bb == null) return 0;
+        if (aa == null) return 1;
+        if (bb == null) return -1;
+        return aa - bb;
+      });
+
+      topHosts.forEach(function(host){
+        try {
+          var after = getAfterValue(host);
+          var anchor = null;
+          if (after != null) anchor = nthTopic(ul, after);
+
+          if (!anchor) {
+            var prev = host.previousElementSibling;
+            while (prev) {
+              if (prev.matches && prev.matches(TOPIC_LI_SEL)) { anchor = prev; break; }
+              prev = prev.previousElementSibling;
+            }
+          }
+          if (!anchor) return;
+
+          if (host.previousElementSibling !== anchor) {
+            anchor.insertAdjacentElement('afterend', host);
+          }
+        } catch (e) {}
+      });
     } catch (e) {}
   }
 
-  function schedule(reason) {
+  function schedule() {
     var now = Date.now();
     if (now - lastRun < COOLDOWN) return;
     if (scheduled) return;
@@ -1635,11 +1676,9 @@ function buildOrdinalMap(items) {
     requestAnimationFrame(function(){
       scheduled = false;
       lastRun = Date.now();
-      try {
-        var ul = getTopicList();
-        if (!ul) return;
-        redistributeTopPile(ul);
-      } catch (e) {}
+      var ul = getTopicList();
+      if (!ul) return;
+      rehomeByAfter(ul);
     });
   }
 
@@ -1647,40 +1686,33 @@ function buildOrdinalMap(items) {
     var y = getY();
     var dy = y - lastY;
     lastY = y;
-
-    // Only act on upscroll (when the pile-up manifests)
-    if (dy < -6) schedule('upscroll');
+    if (dy < -8 && y < 900) schedule();
   }
 
   function init() {
-    // Initial repair does nothing unless pile-up already present.
-    schedule('init');
-
-    window.addEventListener('scroll', onScroll, { passive: true });
-
-    // MutationObserver on list (guarded; redistribution only runs on upscroll)
     try {
-      if (typeof MutationObserver !== 'undefined') {
-        var ul = getTopicList();
-        if (ul) {
-          var mo = new MutationObserver(function(){ /* no immediate redistribution */ });
-          mo.observe(ul, { childList:true, subtree:true });
-        }
-      }
+      var ul = getTopicList();
+      if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
     } catch (e) {}
 
+    window.addEventListener('scroll', onScroll, { passive:true });
+
     if (window.jQuery) {
       try {
         window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          // don't touch during downscroll load; just re-evaluate when user scrolls up
-          setTimeout(function(){ schedule('event'); }, 0);
+          setTimeout(function(){
+            try {
+              var ul = getTopicList();
+              if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+            } catch(e){}
+          }, 50);
         });
-      } catch(e){}
+      } catch (e) {}
     }
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.1 =====
+// ===== /V17.2 =====
 

package/public/style.css

@@ -81,8 +81,15 @@
 }
 
 
-/* ===== V17.1 host styling ===== */
+/* ===== V17 host styling ===== */
+li.nodebb-ezoic-host { list-style: none; width: 100%; display: block; }
+li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; display: block; }
+/* ===== /V17 ===== */
+
+
+
+/* ===== V17.2 host styling ===== */
 li.nodebb-ezoic-host { list-style:none; width:100%; display:block; }
 li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width:100%; display:block; }
-/* ===== /V17.1 ===== */
+/* ===== /V17.2 ===== */