nodebb-plugin-ezoic-infinite 0.6.5 → 0.6.7

package/package.json

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

package/plugin.json

@@ -22,5 +22,8 @@
   "scripts": [
     "public/client.js"
   ],
-  "templates": "public/templates"
+  "templates": "public/templates",
+  "css": [
+    "public/style.css"
+  ]
 }

package/public/client.js

@@ -12,12 +12,12 @@ let rerunRequested = false;
 
 // Per-page incremental state
 let pageKey = null;
-let injectedSlots = new Set();       // slot numbers already injected on this page
+let seenSlots = new Set();           // slots already processed (never cleared on eviction)
 let usedIds = new Set();             // IDs currently present in DOM
-let adsFIFO = [];                    // [{type, slot, id}] oldest first
+let adsFIFO = [];                    // [{slot, id}] oldest first
 
 function resetPageState() {
-  injectedSlots = new Set();
+  seenSlots = new Set();
   usedIds = new Set();
   adsFIFO = [];
 }
@@ -58,36 +58,44 @@ function isCategoryTopicListPage() {
 }
 
 function getTopicPosts() {
+  // Only real posts
   const $primary = $('[component="post"][data-pid]');
-  if ($primary.length) return $primary.not('.ezoic-ad-post');
+  if ($primary.length) return $primary;
 
+  // Fallback: top-level with post/content
   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;
-  }).not('.ezoic-ad-post');
+  });
 }
 
 function getCategoryTopicItems() {
-  return $('li[component="category/topic"]').not('.ezoic-ad-topic');
+  return $('li[component="category/topic"]');
 }
 
-function tagName($el) {
-  return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
+// If target's parent is UL/OL, wrapper MUST be LI (otherwise browser may move it to top)
+function wrapperTagFor($target) {
+  if (!$target || !$target.length) return 'div';
+  const parentTag = ($target.parent().prop('tagName') || '').toUpperCase();
+  if (parentTag === 'UL' || parentTag === 'OL') return 'li';
+  const selfTag = ($target.prop('tagName') || '').toUpperCase();
+  if (selfTag === 'LI') return 'li';
+  return 'div';
 }
 
 function makeWrapperLike($target, classes, innerHtml, attrs) {
-  const t = tagName($target);
+  const tag = wrapperTagFor($target);
   const attrStr = attrs ? ' ' + attrs : '';
-  if (t === 'LI') {
+  if (tag === 'li') {
     return '<li class="' + classes + ' list-unstyled"' + attrStr + '>' + innerHtml + '</li>';
   }
   return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
 }
 
 function cleanupWrappersOnNav() {
-  $('.ezoic-ad-post, .ezoic-ad-between, .ezoic-ad-topic').remove();
+  $('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad-between').remove();
 }
 
 function pickNextId(pool) {
@@ -105,7 +113,6 @@ function evictOldestOne() {
   const $el = $(sel);
   if ($el.length) $el.remove();
 
-  injectedSlots.delete(old.slot);
   usedIds.delete(old.id);
   return true;
 }
@@ -145,7 +152,7 @@ function injectBetweenIncremental($items, pool, interval, wrapperClass) {
   const newIds = [];
 
   for (let slot = 1; slot <= maxSlot; slot++) {
-    if (injectedSlots.has(slot)) continue;
+    if (seenSlots.has(slot)) continue;
 
     const index = slot * interval - 1;
     const $target = $items.eq(index);
@@ -153,7 +160,6 @@ function injectBetweenIncremental($items, pool, interval, wrapperClass) {
 
     let id = pickNextId(pool);
     if (!id) {
-      // Pool full: evict oldest, then reuse freed ID
       if (!evictOldestOne()) break;
       id = pickNextId(pool);
       if (!id) break;
@@ -162,16 +168,16 @@ function injectBetweenIncremental($items, pool, interval, wrapperClass) {
     const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
     const html = makeWrapperLike(
       $target,
-      wrapperClass,
+      wrapperClass + ' ezoic-ad',
       placeholder,
       'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
     );
 
     $target.after(html);
 
-    injectedSlots.add(slot);
+    seenSlots.add(slot);
     usedIds.add(id);
-    adsFIFO.push({ type: 'between', slot: slot, id: id });
+    adsFIFO.push({ slot: slot, id: id });
     newIds.push(id);
   }
 
@@ -186,7 +192,7 @@ function injectMessageIncremental($posts, pool, interval) {
   const newIds = [];
 
   for (let slot = 1; slot <= maxSlot; slot++) {
-    if (injectedSlots.has(slot)) continue;
+    if (seenSlots.has(slot)) continue;
 
     const index = slot * interval - 1;
     const $target = $posts.eq(index);
@@ -199,19 +205,20 @@ function injectMessageIncremental($posts, pool, interval) {
       if (!id) break;
     }
 
-    const inner = '<div class="content"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
+    // Do NOT use class "post" nor component="post" for ads: can break NodeBB infinite scroll.
+    const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
     const html = makeWrapperLike(
       $target,
-      'post ezoic-ad-post',
+      'ezoic-ad-post ezoic-ad',
       inner,
       'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
     );
 
     $target.after(html);
 
-    injectedSlots.add(slot);
+    seenSlots.add(slot);
     usedIds.add(id);
-    adsFIFO.push({ type: 'message', slot: slot, id: id });
+    adsFIFO.push({ slot: slot, id: id });
     newIds.push(id);
   }
 
@@ -219,7 +226,6 @@ function injectMessageIncremental($posts, pool, interval) {
 }
 
 async function refreshAds() {
-  // Reset state on navigation
   const key = currentPageKey();
   if (pageKey !== key) {
     pageKey = key;
@@ -250,9 +256,6 @@ async function refreshAds() {
 
     const newIds = [];
 
-    // Your rule:
-    // - Category topic list: BETWEEN only
-    // - Topic page: MESSAGE only
     if ($topicItems.length) {
       if (cfg.enableBetweenAds && betweenPool.length) {
         newIds.push(...injectBetweenIncremental($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
@@ -278,7 +281,7 @@ async function refreshAds() {
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 180);
+  debounceTimer = setTimeout(refreshAds, 200);
 }
 
 $(document).ready(debounceRefresh);

package/public/style.css

@@ -0,0 +1,2 @@
+.ezoic-ad-post{margin:0.75rem 0;}
+.ezoic-ad-message-inner{padding:0.75rem 0;}