nodebb-plugin-ezoic-infinite 0.5.3 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.5.3",
+  "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

@@ -1,6 +1,8 @@
 /* globals ajaxify */
 'use strict';
 
+window.ezoicInfiniteLoaded = true;
+
 let cachedConfig;
 let lastFetch = 0;
 let debounceTimer;
@@ -23,17 +25,27 @@ function parsePool(raw) {
 }
 
 function getTopicPosts() {
-  const $p = $('[component="post"]').not('.ezoic-ad-post');
-  if ($p.length) return $p;
+  const $primary = $('[component="post"][data-pid]');
+  if ($primary.length) return $primary.not('.ezoic-ad-post');
+
+  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');
 }
 
-function isLi($el) {
-  return ($el && $el.length && (($el.prop('tagName') || '').toUpperCase() === 'LI'));
+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() {
@@ -50,77 +62,70 @@ function computeWindowSlots(totalItems, interval, poolSize) {
   return out;
 }
 
-function makeBetweenWrapper($targetPost, placeholderId) {
-  if (isLi($targetPost)) {
-    return (
-      '<li class="ezoic-ad-between list-unstyled" data-ezoic-ad="1">' +
-        '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
-      '</li>'
-    );
+function makeWrapperLike($target, classes, innerHtml) {
+  const t = tagName($target);
+  if (t === 'LI') {
+    return '<li class="' + classes + ' list-unstyled" data-ezoic-ad="1">' + innerHtml + '</li>';
   }
-  return '<div class="ezoic-ad-between" id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>';
-}
-
-function makeAdMessageWrapper($targetPost, placeholderId) {
-  if (isLi($targetPost)) {
-    return (
-      '<li class="post ezoic-ad-post" data-ezoic-ad="1">' +
-        '<div class="content">' +
-          '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
-        '</div>' +
-      '</li>'
-    );
-  }
-
-  return (
-    '<div class="post ezoic-ad-post" data-ezoic-ad="1">' +
-      '<div class="content">' +
-        '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
-      '</div>' +
-    '</div>'
-  );
+  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];
+    const id = ids[i];
     const index = slotNumber * interval - 1;
     const $target = $posts.eq(index);
     if (!$target.length) continue;
 
-    $target.after(makeBetweenWrapper($target, id));
+    const html = makeWrapperLike($target, 'ezoic-ad-between', '<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;
 
-    $target.after(makeAdMessageWrapper($target, id));
+    const inner = '<div class="content"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
+    const html = makeWrapperLike($target, 'post ezoic-ad-post', inner);
+    $target.after(html);
     activeIds.push(id);
   }
   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() {
-  const cfg = await fetchConfig();
+  let cfg;
+  try { cfg = await fetchConfig(); } catch (e) { return; }
   if (!cfg || cfg.excluded) return;
 
   const betweenPool = parsePool(cfg.placeholderIds);
@@ -132,32 +137,48 @@ async function refreshAds() {
   const $posts = getTopicPosts();
   if (!$posts.length) return;
 
+  // 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
   if (activeIds.length && window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
     try { window.ezstandalone.destroyPlaceholders(); } catch (e) {}
   }
   activeIds.forEach(id => {
-    try { window.ezstandalone && typeof window.ezstandalone.showAds === 'function' && window.ezstandalone.showAds(id); } catch (e) {}
+    try {
+      if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds(id);
+      }
+    } catch (e) {}
   });
 }
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 100);
+  debounceTimer = setTimeout(refreshAds, 150);
 }
 
+$(document).ready(debounceRefresh);
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 800);
+setTimeout(debounceRefresh, 1500);

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