nodebb-plugin-ezoic-infinite 0.5.4 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "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;
@@ -50,8 +43,9 @@ function tagName($el) {
   return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
 }
 
+// Remove *all* nodes with a given id (duplicates are possible if misconfigured)
 function removePlaceholdersByPool(pool) {
-  pool.forEach(id => $('#ezoic-pub-ad-placeholder-' + id).remove());
+  pool.forEach(id => $('[id="ezoic-pub-ad-placeholder-' + id + '"]').remove());
 }
 
 function removeAdWrappers() {
@@ -60,13 +54,8 @@ function removeAdWrappers() {
 }
 
 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,16 +70,16 @@ function makeWrapperLike($target, classes, innerHtml) {
   return '<div class="' + classes + '" data-ezoic-ad="1">' + innerHtml + '</div>';
 }
 
-function insertBetweenPosts($posts, pool, interval) {
+function insertBetweenPosts($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]; // map latest slots to pool in order
-    const index = slotNumber * interval - 1; // 0-based index of the post after which we insert
+    const id = ids[i];
+    const index = slotNumber * interval - 1;
     const $target = $posts.eq(index);
     if (!$target.length) continue;
 
@@ -101,15 +90,15 @@ function insertBetweenPosts($posts, pool, interval) {
   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 +111,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; }
@@ -136,19 +137,28 @@ async function refreshAds() {
   const $posts = getTopicPosts();
   if (!$posts.length) return;
 
-  // Clean first
+  // Clean first (remove wrappers + any placeholders, even duplicates)
   removeAdWrappers();
-  removePlaceholdersByPool(betweenPool);
-  removePlaceholdersByPool(messagePool);
+  removePlaceholdersByPool(uniqueConcat(betweenPool, messagePool));
+
+  // IMPORTANT:
+  // IDs must be UNIQUE on the page. If admin reuses the same IDs for both pools,
+  // we allocate unique IDs across "between posts" and "message ads" to avoid duplicates.
+  const combinedUnique = uniqueConcat(betweenPool, messagePool);
 
   const activeIds = [];
+  let cursor = 0;
 
   if (cfg.enableBetweenAds && betweenPool.length) {
-    activeIds.push(...insertBetweenPosts($posts, betweenPool, betweenInterval));
+    const idsForBetween = combinedUnique.slice(cursor, cursor + betweenPool.length);
+    cursor += idsForBetween.length;
+    activeIds.push(...insertBetweenPosts($posts, idsForBetween, betweenInterval));
   }
 
   if (cfg.enableMessageAds && messagePool.length) {
-    activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
+    const idsForMessage = combinedUnique.slice(cursor, cursor + messagePool.length);
+    cursor += idsForMessage.length;
+    activeIds.push(...insertAdMessagesBetweenReplies($posts, idsForMessage, messageInterval));
   }
 
   // Ezoic render

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">