nodebb-plugin-ezoic-infinite 1.5.70 → 1.5.71

package/package.json

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

package/public/client.js

@@ -391,43 +391,53 @@
     const wraps = document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`);
     let removed = 0;
 
-    wraps.forEach((wrap) => {
-      let ok = false;
-      // NodeBB/skins can insert helper nodes between posts (clearfix, separators, etc.).
-      // Be tolerant so we don't remove a valid ad too early ("disappears too fast").
+    const isFilled = (wrap) => {
+      return !!(wrap.querySelector('iframe, ins, img, video, [data-google-container-id]'));
+    };
+
+    const hasNearbyItem = (wrap) => {
+      // NodeBB/skins can inject separators/spacers; be tolerant.
       let prev = wrap.previousElementSibling;
       for (let i = 0; i < 8 && prev; i++) {
-        if (itemSet.has(prev)) { ok = true; break; }
+        if (itemSet.has(prev)) return true;
         prev = prev.previousElementSibling;
       }
-
-      if (!ok) {
-        let next = wrap.nextElementSibling;
-        for (let i = 0; i < 3 && next; i++) {
-          if (itemSet.has(next)) { ok = true; break; }
-          next = next.nextElementSibling;
-        }
+      let next = wrap.nextElementSibling;
+      for (let i = 0; i < 8 && next; i++) {
+        if (itemSet.has(next)) return true;
+        next = next.nextElementSibling;
       }
+      return false;
+    };
 
-      if (!ok) {
-        withInternalDomChange(() => releaseWrapNode(wrap));
-        removed++;
-      }
+    wraps.forEach((wrap) => {
+      if (isFilled(wrap)) return; // never prune filled ads
+      if (hasNearbyItem(wrap)) return;
+
+      withInternalDomChange(() => releaseWrapNode(wrap));
+      removed++;
     });
 
     return removed;
   }
 
   function decluster(kindClass) {
-    // Remove consecutive wraps (keep the first)
+    // Remove "near-consecutive" wraps (keep the first). Be tolerant of spacer nodes.
     const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
     if (wraps.length < 2) return 0;
+
+    const isWrap = (el) => !!(el && el.classList && el.classList.contains(WRAP_CLASS));
+
     let removed = 0;
     for (const w of wraps) {
-      const prev = w.previousElementSibling;
-      if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) {
-        withInternalDomChange(() => releaseWrapNode(w));
-        removed++;
+      let prev = w.previousElementSibling;
+      for (let i = 0; i < 3 && prev; i++) {
+        if (isWrap(prev)) {
+          withInternalDomChange(() => releaseWrapNode(w));
+          removed++;
+          break;
+        }
+        prev = prev.previousElementSibling;
       }
     }
     return removed;
@@ -479,9 +489,6 @@
     if (!ph || !ph.isConnected) return;
     ph.setAttribute('data-ezoic-id', String(id));
 
-    // When the ad actually fills, tighten height to the real iframe height and remove empty-collapsing.
-    armFillObserver(ph);
-
     const io = ensurePreloadObserver();
     try { io && io.observe(ph); } catch (e) {}
 
@@ -494,56 +501,6 @@
     } catch (e) {}
   }
 
-  // ---------------- fill tightening ----------------
-
-  const _fillObserved = new WeakSet();
-  function tightenFilled(ph) {
-    if (!ph || !ph.isConnected) return;
-    const wrap = ph.closest ? ph.closest(`.${WRAP_CLASS}`) : null;
-    if (!wrap) return;
-
-    // If we have any real ad content, we should not be in "empty" mode.
-    const frame = ph.querySelector ? ph.querySelector('iframe') : null;
-    const hasAd = !!(frame || (ph.querySelector && ph.querySelector('ins, img, .ez-ad, .ezoic-ad')));
-    if (!hasAd) return;
-
-    try { wrap.classList.remove('is-empty'); } catch (e) {}
-
-    // Remove the common "extra reserved space" created by Ezoic's min-height styles.
-    // Set minHeight to the actual iframe height when available.
-    try {
-      if (frame && frame.offsetHeight) {
-        const h = frame.offsetHeight;
-        const ezoicSpan = ph.closest ? ph.closest('span.ezoic-ad, .ezoic-ad') : null;
-        if (ezoicSpan && ezoicSpan.style) {
-          ezoicSpan.style.minHeight = `${h}px`;
-        }
-        // Also tighten the wrapper itself to avoid "space under" when the parent is taller.
-        wrap.style.minHeight = `${h}px`;
-      }
-    } catch (e) {}
-  }
-
-  function armFillObserver(ph) {
-    if (!ph || _fillObserved.has(ph)) return;
-    _fillObserved.add(ph);
-
-    // Fast path: already filled
-    try { tightenFilled(ph); } catch (e) {}
-
-    // Observe until it fills, then disconnect.
-    try {
-      const mo = new MutationObserver(() => {
-        try {
-          tightenFilled(ph);
-          const hasFrame = !!(ph.querySelector && ph.querySelector('iframe'));
-          if (hasFrame) mo.disconnect();
-        } catch (e) {}
-      });
-      mo.observe(ph, { childList: true, subtree: true });
-    } catch (e) {}
-  }
-
   function enqueueShow(id) {
     if (!id || isBlocked()) return;
 

package/public/style.css

@@ -22,10 +22,6 @@
 .nodebb-ezoic-wrap .ezoic-ad {
   margin: 0 !important;
   padding: 0 !important;
-  /* Ezoic sometimes reserves extra height (e.g. min-height: 400px) even when the filled iframe is smaller.
-     We prefer zero unused space; JS will also tighten after fill to the real iframe height. */
-  min-height: 0 !important;
-  height: auto !important;
 }
 
 /* Remove the classic "gap under iframe" (baseline/inline-block) */
@@ -66,3 +62,9 @@
   margin: 0 !important;
   padding: 0 !important;
 }
+/* Remove Ezoic's large reserved min-height inside our wrappers (topics/messages) */
+.nodebb-ezoic-wrap .ezoic-ad,
+.nodebb-ezoic-wrap span.ezoic-ad {
+  min-height: 1px !important; /* kill 400px gaps */
+  height: auto !important;
+}