nodebb-plugin-ezoic-infinite 0.7.6 → 0.7.7

package/package.json

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

package/public/client.js

@@ -58,10 +58,7 @@ async function fetchConfig() {
 }
 
 function isTopicPage() {
-  try {
-    if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
-  } catch (e) {}
-  return /^\/topic\//.test(window.location.pathname);
+  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
 }
 
 function isCategoryTopicListPage() {
@@ -142,59 +139,18 @@ function removeOldestCategoryAd() {
   return true;
 }
 
-
-function setupAdAutoHeight() {
-  if (window.__ezoicAutoHeightAttached) return;
-  window.__ezoicAutoHeightAttached = true;
-
-  try {
-    const ro = new ResizeObserver(function (entries) {
-      for (const entry of entries) {
-        const el = entry.target;
-        el.style.minHeight = '0px';
-        el.style.height = 'auto';
-      }
-    });
-
-    function attach() {
-      document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
-        if (wrap.__ezoicRO) return;
-        wrap.__ezoicRO = true;
-        ro.observe(wrap);
-
-        const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
-        if (ph && ph.firstElementChild && !ph.firstElementChild.__ezoicRO) {
-          ph.firstElementChild.__ezoicRO = true;
-          ro.observe(ph.firstElementChild);
-        }
-      });
-    }
-
-    attach();
-    setTimeout(attach, 500);
-    setTimeout(attach, 1500);
-    setTimeout(attach, 3000);
-
-    const mo = new MutationObserver(function () { attach(); });
-    mo.observe(document.body, { childList: true, subtree: true });
-  } catch (e) {}
-}
-
 function callEzoic(ids) {
-  const key = Array.isArray(ids) ? ids.join(',') : String(ids);
-  if (window.__ezoicLastShowKey === key && Date.now() - (window.__ezoicLastShowAt || 0) < 2000) {
-    return;
-  }
-  window.__ezoicLastShowKey = key;
-  window.__ezoicLastShowAt = Date.now();
   if (!ids || !ids.length) return;
 
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
   const run = function () {
-    // destroyPlaceholders is only needed when placeholder IDs are reused.
-    // This plugin avoids reusing IDs on the same page, so we skip it to prevent Ezoic from removing valid placeholders.
+    try {
+      if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
+        window.ezstandalone.destroyPlaceholders.apply(window.ezstandalone, ids);
+      }
+    } catch (e) {}
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
         window.ezstandalone.showAds.apply(window.ezstandalone, ids);
@@ -204,28 +160,14 @@ function callEzoic(ids) {
     return false;
   };
 
-  setupAdAutoHeight();
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // Retry only if showAds isn't available yet (avoid duplicate calls)
   let tries = 0;
   const maxTries = 6;
-  const retry = function () {
+  const timer = setInterval(function () {
     tries++;
-    const ok = run();
-    if (ok) return;
-    try {
-      if (typeof window.ezstandalone.showAds === 'function') return;
-    } catch (e) {}
-    if (tries < maxTries) setTimeout(retry, 800);
-  };
-  try {
-    if (typeof window.ezstandalone.showAds !== 'function') {
-      setTimeout(retry, 800);
-    }
-  } catch (e) {
-    setTimeout(retry, 800);
-  }
+    if (run() || tries >= maxTries) clearInterval(timer);
+  }, 800);
 }
 
 function getPostNumber($post) {
@@ -338,10 +280,8 @@ async function refreshAds() {
     const messagePool = parsePool(cfg.messagePlaceholderIds);
     const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-    const hasTopicList = isCategoryTopicListPage();
     const onTopic = isTopicPage();
-    // If a topic-list is present, we are on a category-like page even if other post-like widgets exist.
-    const onCategory = hasTopicList && !onTopic;
+    const onCategory = !onTopic && isCategoryTopicListPage();
 
     const newIds = [];
 
@@ -375,32 +315,29 @@ function debounceRefresh() {
   debounceTimer = setTimeout(refreshAds, 220);
 }
 
-$(document).ready(function(){ setupAdAutoHeight(); debounceRefresh(); });
+$(document).ready(debounceRefresh);
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', debounceRefresh);
-setTimeout(function(){ setupAdAutoHeight(); debounceRefresh(); }, 2200);
+setTimeout(debounceRefresh, 2200);
 
 // Fallback: some themes/devices don't emit the expected events for infinite scroll.
 // Observe DOM additions and trigger a refresh when new posts/topics are appended/prepended.
 (function setupEzoicObserver() {
   if (window.__ezoicInfiniteObserver) return;
   try {
+    const trigger = function () { debounceRefresh(); };
+
+    // MutationObserver: trigger when new posts/topics are added anywhere in the page
     const obs = new MutationObserver(function (mutations) {
       for (const m of mutations) {
         if (!m.addedNodes || !m.addedNodes.length) continue;
         for (const n of m.addedNodes) {
           if (!n || n.nodeType !== 1) continue;
-          // direct match
-          const inContent = (n.closest && n.closest('#content')) || (n.querySelector && n.querySelector('#content'));
-          if (!inContent && !document.querySelector('#content')) { /* if #content missing, proceed */ }
-          if (document.querySelector('#content') && !(n.closest && n.closest('#content'))) { continue; }
           if (n.matches && (n.matches('[component="post"][data-pid]') || n.matches('li[component="category/topic"]'))) {
-            debounceRefresh();
+            trigger();
             return;
           }
-          // descendant match
-          if (document.querySelector('#content') && !(n.closest && n.closest('#content'))) { continue; }
           if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            debounceRefresh();
+            trigger();
             return;
           }
         }
@@ -408,5 +345,20 @@ setTimeout(function(){ setupAdAutoHeight(); debounceRefresh(); }, 2200);
     });
     obs.observe(document.body, { childList: true, subtree: true });
     window.__ezoicInfiniteObserver = obs;
+
+    // Poller fallback: if some renders bypass observers/events, detect count changes
+    let lastPostCount = 0;
+    let lastTopicCount = 0;
+    setInterval(function () {
+      try {
+        const posts = document.querySelectorAll('[component="post"][data-pid]').length;
+        const topics = document.querySelectorAll('li[component="category/topic"]').length;
+        if (posts !== lastPostCount || topics !== lastTopicCount) {
+          lastPostCount = posts;
+          lastTopicCount = topics;
+          trigger();
+        }
+      } catch (e) {}
+    }, 1500);
   } catch (e) {}
 })();

package/public/style.css

@@ -1,5 +1,2 @@
-.ezoic-ad{min-height:0 !important;height:auto !important;padding:0 !important;}
-.ezoic-ad-post{margin:0.5rem 0;}
-.ezoic-ad-topic{margin:0.5rem 0;}
-.ezoic-ad-message-inner{padding:0;margin:0;}
-.ezoic-ad-message-inner > div{margin:0;padding:0;}
+.ezoic-ad-post{margin:0.75rem 0;}
+.ezoic-ad-message-inner{padding:0.75rem 0;}