nodebb-plugin-ezoic-infinite 0.7.3 → 0.7.5

package/package.json

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

package/public/client.js

@@ -58,7 +58,10 @@ async function fetchConfig() {
 }
 
 function isTopicPage() {
-  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
+  try {
+    if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
+  } catch (e) {}
+  return /^\/topic\//.test(window.location.pathname);
 }
 
 function isCategoryTopicListPage() {
@@ -178,6 +181,12 @@ function setupAdAutoHeight() {
 }
 
 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 || {};
@@ -201,12 +210,25 @@ function callEzoic(ids) {
   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 timer = setInterval(function () {
+  const retry = function () {
     tries++;
-    if (run() || tries >= maxTries) clearInterval(timer);
-  }, 800);
+    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);
+  }
 }
 
 function getPostNumber($post) {
@@ -319,8 +341,10 @@ async function refreshAds() {
     const messagePool = parsePool(cfg.messagePlaceholderIds);
     const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
+    const hasTopicList = isCategoryTopicListPage();
     const onTopic = isTopicPage();
-    const onCategory = !onTopic && isCategoryTopicListPage();
+    // 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 newIds = [];
 
@@ -369,11 +393,15 @@ setTimeout(function(){ setupAdAutoHeight(); debounceRefresh(); }, 2200);
         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();
             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();
             return;