nodebb-plugin-ezoic-infinite 0.4.4 → 0.4.7

package/library.js

@@ -23,9 +23,11 @@ function parseBool(v, def = false) {
 async function getAllGroups() {
   const names = await db.getSortedSetRange('groups:createtime', 0, -1);
   const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
-  return groups.getGroupsData(filtered);
+  const data = await groups.getGroupsData(filtered);
+  // Sort alphabetically for ACP usability
+  data.sort((a, b) => String(a.name).localeCompare(String(b.name), 'fr', { sensitivity: 'base' }));
+  return data;
 }
-
 async function getSettings() {
   const s = await meta.settings.get(SETTINGS_KEY);
   return {

package/package.json

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

package/public/admin.js

@@ -1,4 +1,4 @@
-/* globals app */
+/* globals ajaxify */
 'use strict';
 
 (function () {
@@ -6,13 +6,19 @@
     const $form = $('.ezoic-infinite-settings');
     if (!$form.length) return;
 
-    require(['settings'], function (Settings) {
+    require(['settings', 'alerts'], function (Settings, alerts) {
       Settings.load('ezoic-infinite', $form);
 
       $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', function (e) {
         e.preventDefault();
+
         Settings.save('ezoic-infinite', $form, function () {
-          app.alertSuccess('Enregistré');
+          // Toast vert (NodeBB core)
+          if (alerts && typeof alerts.success === 'function') {
+            alerts.success('Enregistré');
+          } else if (window.app && typeof window.app.alertSuccess === 'function') {
+            window.app.alertSuccess('Enregistré');
+          }
         });
       });
     });

package/public/client.js

@@ -16,26 +16,44 @@ 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 selectors:
+ * - Topic page posts: [component="post"]
+ * - Category topics list: li[component="category/topic"]
+ * - Categories list: li[component="categories/category"]
+ */
+function getTopicPosts() {
+  const $p = $('[component="post"]').not('.ezoic-ad-post');
+  if ($p.length) return $p;
+  return $('.posts .post').not('.ezoic-ad-post');
+}
+
+function getCategoryTopics() {
+  return $('li[component="category/topic"]').not('.ezoic-ad-topic');
+}
+
+function getCategoriesList() {
+  return $('li[component="categories/category"]').not('.ezoic-ad-category');
 }
 
 function removePlaceholdersByPool(pool) {
   pool.forEach(id => $('#ezoic-pub-ad-placeholder-' + id).remove());
 }
 
-function removeAdMessageWrappers() {
+function removeAdWrappers() {
   $('.ezoic-ad-post').remove();
+  $('.ezoic-ad-topic').remove();
+  $('.ezoic-ad-category').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 +61,8 @@ function computeWindowSlots(totalPosts, interval, poolSize) {
   return out;
 }
 
-function insertBetweenPosts(pool, interval) {
-  if (!isTopicPage()) return [];
-
-  const $posts = $('.posts .post').not('.ezoic-ad-post');
-  const total = $posts.length;
-  if (!total) return [];
-
+function insertBetween($items, pool, interval, wrapperClass) {
+  const total = $items.length;
   const slotsToRender = computeWindowSlots(total, interval, pool.length);
   if (!slotsToRender.length) return [];
 
@@ -57,23 +70,19 @@ 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 = $items.eq(index);
     if (!$target.length) continue;
 
-    $target.after('<div id="ezoic-pub-ad-placeholder-' + id + '"></div>');
+    const html = '<div class="' + wrapperClass + '" id="ezoic-pub-ad-placeholder-' + id + '"></div>';
+    $target.after(html);
     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 +90,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 +110,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 +117,46 @@ async function refreshAds() {
   const messagePool = parsePool(cfg.messagePlaceholderIds);
   const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-  removeAdMessageWrappers();
+  // Clean first
+  removeAdWrappers();
   removePlaceholdersByPool(betweenPool);
   removePlaceholdersByPool(messagePool);
 
   const activeIds = [];
 
-  if (cfg.enableBetweenAds && betweenPool.length) {
-    activeIds.push(...insertBetweenPosts(betweenPool, betweenInterval));
-  }
-
-  if (cfg.enableMessageAds && messagePool.length) {
-    activeIds.push(...insertAdMessages(messagePool, messageInterval));
+  const $posts = getTopicPosts();
+  const $topics = getCategoryTopics();
+  const $cats = getCategoriesList();
+
+  if ($posts.length) {
+    // Topic page (between replies)
+    if (cfg.enableBetweenAds && betweenPool.length) {
+      activeIds.push(...insertBetween($posts, betweenPool, betweenInterval, 'ezoic-ad-between'));
+    }
+    if (cfg.enableMessageAds && messagePool.length) {
+      activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
+    }
+  } else if ($topics.length) {
+    // Category topic list (between topics)
+    if (cfg.enableBetweenAds && betweenPool.length) {
+      activeIds.push(...insertBetween($topics, betweenPool, betweenInterval, 'ezoic-ad-topic'));
+    }
+  } else if ($cats.length) {
+    // Categories list (between categories)
+    if (cfg.enableBetweenAds && betweenPool.length) {
+      activeIds.push(...insertBetween($cats, betweenPool, betweenInterval, 'ezoic-ad-category'));
+    }
+  } else {
+    return;
   }
 
-  if (activeIds.length && window.ezstandalone?.destroyPlaceholders) {
-    window.ezstandalone.destroyPlaceholders();
+  // Ezoic render (placeholders are present in DOM regardless)
+  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 +165,4 @@ function debounceRefresh() {
 }
 
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
+setTimeout(debounceRefresh, 800);