nodebb-plugin-ezoic-infinite 0.5.4 → 0.5.6

package/package.json

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

package/public/client.js

@@ -24,17 +24,10 @@ function parsePool(raw) {
   ));
 }
 
-/**
- * Harmony: the real post wrapper is usually [component="post"][data-pid]
- * We must avoid counting nested nodes like component="post/parent" or other elements
- * that can also carry data-pid in some setups.
- */
 function getTopicPosts() {
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary.not('.ezoic-ad-post');
 
-  // Fallback: top-level nodes with data-pid that contain the post content,
-  // excluding nodes nested inside another data-pid container.
   const $top = $('[data-pid]').filter(function () {
     const $el = $(this);
     const hasContent = $el.find('[component="post/content"]').length > 0;
@@ -46,27 +39,27 @@ function getTopicPosts() {
   return $('.posts .post').not('.ezoic-ad-post');
 }
 
+function getCategoryTopicItems() {
+  return $('li[component="category/topic"]').not('.ezoic-ad-topic');
+}
+
 function tagName($el) {
   return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
 }
 
 function removePlaceholdersByPool(pool) {
-  pool.forEach(id => $('#ezoic-pub-ad-placeholder-' + id).remove());
+  pool.forEach(id => $('[id="ezoic-pub-ad-placeholder-' + id + '"]').remove());
 }
 
 function removeAdWrappers() {
   $('.ezoic-ad-post').remove();
   $('.ezoic-ad-between').remove();
+  $('.ezoic-ad-topic').remove();
 }
 
 function computeWindowSlots(totalItems, interval, poolSize) {
-  // totalItems posts -> number of ad slots at positions interval, 2*interval, ...
   const slots = Math.floor(totalItems / interval);
   if (slots <= 0) return [];
-
-  // IMPORTANT:
-  // We cannot display more than poolSize ads at once because Ezoic placeholder IDs
-  // must be unique on the page. If slots > poolSize, we only render the latest poolSize slots.
   const start = Math.max(1, slots - poolSize + 1);
   const out = [];
   for (let s = start; s <= slots; s++) out.push(s);
@@ -81,35 +74,35 @@ function makeWrapperLike($target, classes, innerHtml) {
   return '<div class="' + classes + '" data-ezoic-ad="1">' + innerHtml + '</div>';
 }
 
-function insertBetweenPosts($posts, pool, interval) {
-  const total = $posts.length;
-  const slotsToRender = computeWindowSlots(total, interval, pool.length);
+function insertBetweenGeneric($items, ids, interval, wrapperClass) {
+  const total = $items.length;
+  const slotsToRender = computeWindowSlots(total, interval, ids.length);
   if (!slotsToRender.length) return [];
 
   const activeIds = [];
   for (let i = 0; i < slotsToRender.length; i++) {
     const slotNumber = slotsToRender[i];
-    const id = pool[i]; // map latest slots to pool in order
-    const index = slotNumber * interval - 1; // 0-based index of the post after which we insert
-    const $target = $posts.eq(index);
+    const id = ids[i];
+    const index = slotNumber * interval - 1;
+    const $target = $items.eq(index);
     if (!$target.length) continue;
 
-    const html = makeWrapperLike($target, 'ezoic-ad-between', '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>');
+    const html = makeWrapperLike($target, wrapperClass, '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>');
     $target.after(html);
     activeIds.push(id);
   }
   return activeIds;
 }
 
-function insertAdMessagesBetweenReplies($posts, pool, interval) {
+function insertAdMessagesBetweenReplies($posts, ids, interval) {
   const total = $posts.length;
-  const slotsToRender = computeWindowSlots(total, interval, pool.length);
+  const slotsToRender = computeWindowSlots(total, interval, ids.length);
   if (!slotsToRender.length) return [];
 
   const activeIds = [];
   for (let i = 0; i < slotsToRender.length; i++) {
     const slotNumber = slotsToRender[i];
-    const id = pool[i];
+    const id = ids[i];
     const index = slotNumber * interval - 1;
     const $target = $posts.eq(index);
     if (!$target.length) continue;
@@ -122,6 +115,18 @@ function insertAdMessagesBetweenReplies($posts, pool, 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;
+}
+
 async function refreshAds() {
   let cfg;
   try { cfg = await fetchConfig(); } catch (e) { return; }
@@ -134,24 +139,41 @@ async function refreshAds() {
   const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
   const $posts = getTopicPosts();
-  if (!$posts.length) return;
+  const $topicItems = getCategoryTopicItems();
+
+  if (!$posts.length && !$topicItems.length) return;
 
-  // Clean first
   removeAdWrappers();
-  removePlaceholdersByPool(betweenPool);
-  removePlaceholdersByPool(messagePool);
+  removePlaceholdersByPool(uniqueConcat(betweenPool, messagePool));
+
+  const combinedUnique = uniqueConcat(betweenPool, messagePool);
 
   const activeIds = [];
 
-  if (cfg.enableBetweenAds && betweenPool.length) {
-    activeIds.push(...insertBetweenPosts($posts, betweenPool, betweenInterval));
+  // Category topic list page: inject between topic items
+  if (!$posts.length && $topicItems.length) {
+    if (cfg.enableBetweenAds && betweenPool.length) {
+      activeIds.push(...insertBetweenGeneric($topicItems, combinedUnique.slice(0, betweenPool.length), betweenInterval, 'ezoic-ad-topic'));
+    }
   }
 
-  if (cfg.enableMessageAds && messagePool.length) {
-    activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
+  // Topic page: inject between replies + message ads
+  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));
+    }
   }
 
-  // Ezoic render
   if (activeIds.length && window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
     try { window.ezstandalone.destroyPlaceholders(); } catch (e) {}
   }

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -33,7 +33,7 @@
     <div class="mb-3">
       <label class="form-label" for="messagePlaceholderIds">Pool d’IDs Ezoic (message)</label>
       <textarea id="messagePlaceholderIds" name="messagePlaceholderIds" class="form-control" rows="4">{messagePlaceholderIds}</textarea>
-      <p class="form-text">Pool séparé recommandé pour éviter la réutilisation d’IDs.</p>
+      <p class="form-text">Pool séparé recommandé pour éviter la réutilisation d’IDs. IMPORTANT : ne réutilise pas les mêmes IDs dans les deux pools.</p>
     </div>
 
     <div class="mb-3">