nodebb-plugin-ezoic-infinite 0.5.8 → 0.6.0

package/package.json

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

package/public/client.js

@@ -28,24 +28,28 @@ function parsePool(raw) {
   ));
 }
 
+function isTopicTemplate() {
+  return !!(ajaxify && ajaxify.data && (ajaxify.data.template === 'topic' || ajaxify.data.template === 'topicEvents'));
+}
+
+function isCategoryTemplate() {
+  return !!(ajaxify && ajaxify.data && ajaxify.data.template === 'category');
+}
+
 function getTopicPosts() {
+  if (!isTopicTemplate()) return $();
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary.not('.ezoic-ad-post');
-
-  const $top = $('[data-pid]').filter(function () {
+  return $('[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');
+  }).not('.ezoic-ad-post');
 }
 
 function getCategoryTopicItems() {
-  // Only on category topic list pages
-  if (!ajaxify || !ajaxify.data || ajaxify.data.template !== 'category') return $();
+  if (!isCategoryTemplate()) return $();
   return $('li[component="category/topic"]').not('.ezoic-ad-topic');
 }
 
@@ -54,10 +58,10 @@ function tagName($el) {
 }
 
 function removeExistingEzoicNodes() {
+  // Remove only the wrappers we created. Their inner placeholder divs go away with them.
   $('.ezoic-ad-post').remove();
   $('.ezoic-ad-between').remove();
   $('.ezoic-ad-topic').remove();
-  $('[id^="ezoic-pub-ad-placeholder-"]').remove();
 }
 
 function computeWindowSlots(totalItems, interval, poolSize) {
@@ -118,31 +122,13 @@ 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 ezoicShow(ids) {
   if (!ids || !ids.length) return;
 
+  // Ezoic supports showAds(101,102,103) and recommends a single call with all ids.
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-
   window.ezstandalone.cmd.push(function () {
-    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);
@@ -188,37 +174,29 @@ async function refreshAds() {
 
     removeExistingEzoicNodes();
 
-    const combinedUnique = uniqueConcat(betweenPool, messagePool);
     const activeIds = [];
 
-    if (!$posts.length && $topicItems.length) {
+    // Category pages: BETWEEN only (between topics)
+    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'));
       }
+      ezoicShow(activeIds);
+      return;
     }
 
+    // Topic pages: MESSAGE only (between replies)
     if ($posts.length) {
-      let cursor = 0;
-
-      if (cfg.enableBetweenAds && betweenPool.length) {
-        const idsForBetween = combinedUnique.slice(cursor, cursor + betweenPool.length);
-        cursor += idsForBetween.length;
-        activeIds.push(...insertBetweenGeneric($posts, idsForBetween, betweenInterval, 'ezoic-ad-between'));
-      }
-
       if (cfg.enableMessageAds && messagePool.length) {
-        const idsForMessage = combinedUnique.slice(cursor, cursor + messagePool.length);
-        cursor += idsForMessage.length;
-        activeIds.push(...insertAdMessagesBetweenReplies($posts, idsForMessage, messageInterval));
+        activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
       }
+      ezoicShow(activeIds);
     }
-
-    ezoicCall(activeIds);
   } finally {
     inFlight = false;
     if (rerunRequested) {
       rerunRequested = false;
-      setTimeout(refreshAds, 50);
+      setTimeout(refreshAds, 80);
     }
   }
 }