nodebb-plugin-ezoic-infinite 0.5.9 → 0.6.1

package/package.json

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

package/public/client.js

@@ -28,32 +28,44 @@ function parsePool(raw) {
   ));
 }
 
-function isTopicTemplate() {
-  return !!(ajaxify && ajaxify.data && (ajaxify.data.template === 'topic' || ajaxify.data.template === 'topicEvents'));
+function guessIsTopicPage() {
+  // Prefer ajaxify template, fallback to DOM presence
+  try {
+    if (ajaxify && ajaxify.data && ajaxify.data.template) {
+      return ['topic', 'topicEvents'].includes(ajaxify.data.template);
+    }
+  } catch (e) {}
+  return $('[component="post/content"]').length > 0;
 }
 
-function isCategoryTemplate() {
-  return !!(ajaxify && ajaxify.data && ajaxify.data.template === 'category');
+function guessIsCategoryPage() {
+  try {
+    if (ajaxify && ajaxify.data && ajaxify.data.template) {
+      return ajaxify.data.template === 'category';
+    }
+  } catch (e) {}
+  return $('li[component="category/topic"]').length > 0;
 }
 
 function getTopicPosts() {
-  if (!isTopicTemplate()) return $();
+  if (!guessIsTopicPage()) return $();
+
+  // Harmony standard wrapper
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary.not('.ezoic-ad-post');
 
+  // Fallback: top-level data-pid that contains post content and isn't nested
   const $top = $('[data-pid]').filter(function () {
     const $el = $(this);
     const hasContent = $el.find('[component="post/content"]').length > 0;
     const nested = $el.parents('[data-pid]').length > 0;
     return hasContent && !nested;
   });
-  if ($top.length) return $top.not('.ezoic-ad-post');
-
-  return $('.posts .post').not('.ezoic-ad-post');
+  return $top.not('.ezoic-ad-post');
 }
 
 function getCategoryTopicItems() {
-  if (!isCategoryTemplate()) return $();
+  if (!guessIsCategoryPage()) return $();
   return $('li[component="category/topic"]').not('.ezoic-ad-topic');
 }
 
@@ -65,7 +77,6 @@ function removeExistingEzoicNodes() {
   $('.ezoic-ad-post').remove();
   $('.ezoic-ad-between').remove();
   $('.ezoic-ad-topic').remove();
-  $('[id^="ezoic-pub-ad-placeholder-"]').remove();
 }
 
 function computeWindowSlots(totalItems, interval, poolSize) {
@@ -126,34 +137,32 @@ function insertAdMessagesBetweenReplies($posts, ids, interval) {
   return activeIds;
 }
 
-function uniqueConcat(a, b) {
-  const seen = new Set();
-  const out = [];
-  [...a, ...b].forEach((x) => {
-    if (!seen.has(x)) {
-      seen.add(x);
-      out.push(x);
-    }
-  });
-  return out;
-}
-
-function ezoicCall(ids) {
+function ezoicRender(ids) {
   if (!ids || !ids.length) return;
 
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
+  // Ezoic doc: showAds(101,102,103) within cmd.push for dynamic content citeturn0search0turn0search6
   window.ezstandalone.cmd.push(function () {
     try {
-      if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-        window.ezstandalone.destroyPlaceholders.apply(window.ezstandalone, ids);
+      if (typeof window.ezstandalone.refreshAds === 'function') {
+        window.ezstandalone.refreshAds.apply(window.ezstandalone, ids);
+        return;
       }
     } catch (e) {}
 
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
         window.ezstandalone.showAds.apply(window.ezstandalone, ids);
+        return;
+      }
+    } catch (e) {}
+
+    // Last resort: call showAds() with no args = "all placeholders" citeturn0search0turn0search6
+    try {
+      if (typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds();
       }
     } catch (e) {}
   });
@@ -196,32 +205,29 @@ async function refreshAds() {
 
     removeExistingEzoicNodes();
 
-    const combinedUnique = uniqueConcat(betweenPool, messagePool);
     const activeIds = [];
 
-    // Category topic list page: use BETWEEN only
+    // Category pages: BETWEEN only
     if ($topicItems.length) {
       if (cfg.enableBetweenAds && betweenPool.length) {
-        activeIds.push(...insertBetweenGeneric($topicItems, combinedUnique.slice(0, betweenPool.length), betweenInterval, 'ezoic-ad-topic'));
+        activeIds.push(...insertBetweenGeneric($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
       }
-      ezoicCall(activeIds);
+      ezoicRender(activeIds);
       return;
     }
 
-    // Topic page: ONLY message ads (as requested)
+    // Topic pages: MESSAGE only (as you requested)
     if ($posts.length) {
       if (cfg.enableMessageAds && messagePool.length) {
-        // Use messagePool slice from the combined unique set, but keep it stable
-        const idsForMessage = combinedUnique.slice(0, messagePool.length);
-        activeIds.push(...insertAdMessagesBetweenReplies($posts, idsForMessage, messageInterval));
+        activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
       }
-      ezoicCall(activeIds);
+      ezoicRender(activeIds);
     }
   } finally {
     inFlight = false;
     if (rerunRequested) {
       rerunRequested = false;
-      setTimeout(refreshAds, 50);
+      setTimeout(refreshAds, 80);
     }
   }
 }