nodebb-plugin-ezoic-infinite 0.4.5 → 0.5.0

package/package.json

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

package/public/client.js

@@ -16,26 +16,34 @@ async function fetchConfig() {
 function parsePool(raw) {
   if (!raw) return [];
   return Array.from(new Set(
-    raw.split(/[\n,;\s]+/)
+    String(raw).split(/[\n,;\s]+/)
       .map(x => parseInt(x, 10))
       .filter(n => Number.isFinite(n) && n > 0)
   ));
 }
 
-function isTopicPage() {
-  return ajaxify?.data?.template?.name === 'topic' || $('body').hasClass('page-topic');
+/**
+ * Harmony (topic page) selector:
+ * - Posts: [component="post"]
+ */
+function getTopicPosts() {
+  const $p = $('[component="post"]').not('.ezoic-ad-post');
+  if ($p.length) return $p;
+  // fallback
+  return $('.posts .post').not('.ezoic-ad-post');
 }
 
 function removePlaceholdersByPool(pool) {
   pool.forEach(id => $('#ezoic-pub-ad-placeholder-' + id).remove());
 }
 
-function removeAdMessageWrappers() {
+function removeAdWrappers() {
   $('.ezoic-ad-post').remove();
+  $('.ezoic-ad-between').remove();
 }
 
-function computeWindowSlots(totalPosts, interval, poolSize) {
-  const slots = Math.floor(totalPosts / interval);
+function computeWindowSlots(totalItems, interval, poolSize) {
+  const slots = Math.floor(totalItems / interval);
   if (slots <= 0) return [];
   const start = Math.max(1, slots - poolSize + 1);
   const out = [];
@@ -43,13 +51,8 @@ function computeWindowSlots(totalPosts, interval, poolSize) {
   return out;
 }
 
-function insertBetweenPosts(pool, interval) {
-  if (!isTopicPage()) return [];
-
-  const $posts = $('.posts .post').not('.ezoic-ad-post');
+function insertBetweenPosts($posts, pool, interval) {
   const total = $posts.length;
-  if (!total) return [];
-
   const slotsToRender = computeWindowSlots(total, interval, pool.length);
   if (!slotsToRender.length) return [];
 
@@ -57,23 +60,18 @@ function insertBetweenPosts(pool, interval) {
   for (let i = 0; i < slotsToRender.length; i++) {
     const slotNumber = slotsToRender[i];
     const id = pool[i];
-    const postIndex = slotNumber * interval - 1;
-    const $target = $posts.eq(postIndex);
+    const index = slotNumber * interval - 1;
+    const $target = $posts.eq(index);
     if (!$target.length) continue;
 
-    $target.after('<div id="ezoic-pub-ad-placeholder-' + id + '"></div>');
+    $target.after('<div class="ezoic-ad-between" id="ezoic-pub-ad-placeholder-' + id + '"></div>');
     activeIds.push(id);
   }
   return activeIds;
 }
 
-function insertAdMessages(pool, interval) {
-  if (!isTopicPage()) return [];
-
-  const $posts = $('.posts .post').not('.ezoic-ad-post');
+function insertAdMessagesBetweenReplies($posts, pool, interval) {
   const total = $posts.length;
-  if (!total) return [];
-
   const slotsToRender = computeWindowSlots(total, interval, pool.length);
   if (!slotsToRender.length) return [];
 
@@ -81,8 +79,8 @@ function insertAdMessages(pool, interval) {
   for (let i = 0; i < slotsToRender.length; i++) {
     const slotNumber = slotsToRender[i];
     const id = pool[i];
-    const postIndex = slotNumber * interval - 1;
-    const $target = $posts.eq(postIndex);
+    const index = slotNumber * interval - 1;
+    const $target = $posts.eq(index);
     if (!$target.length) continue;
 
     const html =
@@ -101,7 +99,6 @@ function insertAdMessages(pool, interval) {
 async function refreshAds() {
   const cfg = await fetchConfig();
   if (!cfg || cfg.excluded) return;
-  if (!isTopicPage()) return;
 
   const betweenPool = parsePool(cfg.placeholderIds);
   const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
@@ -109,24 +106,33 @@ async function refreshAds() {
   const messagePool = parsePool(cfg.messagePlaceholderIds);
   const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-  removeAdMessageWrappers();
+  const $posts = getTopicPosts();
+  if (!$posts.length) return; // only topic pages
+
+  // Clean first
+  removeAdWrappers();
   removePlaceholdersByPool(betweenPool);
   removePlaceholdersByPool(messagePool);
 
   const activeIds = [];
 
+  // Between posts
   if (cfg.enableBetweenAds && betweenPool.length) {
-    activeIds.push(...insertBetweenPosts(betweenPool, betweenInterval));
+    activeIds.push(...insertBetweenPosts($posts, betweenPool, betweenInterval));
   }
 
+  // "Ad message" between replies
   if (cfg.enableMessageAds && messagePool.length) {
-    activeIds.push(...insertAdMessages(messagePool, messageInterval));
+    activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
   }
 
-  if (activeIds.length && window.ezstandalone?.destroyPlaceholders) {
-    window.ezstandalone.destroyPlaceholders();
+  // Ezoic render
+  if (activeIds.length && window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
+    try { window.ezstandalone.destroyPlaceholders(); } catch (e) {}
   }
-  activeIds.forEach(id => window.ezstandalone?.showAds?.(id));
+  activeIds.forEach(id => {
+    try { window.ezstandalone && typeof window.ezstandalone.showAds === 'function' && window.ezstandalone.showAds(id); } catch (e) {}
+  });
 }
 
 function debounceRefresh() {
@@ -135,3 +141,4 @@ function debounceRefresh() {
 }
 
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
+setTimeout(debounceRefresh, 800);