nodebb-plugin-ezoic-infinite 1.6.88 → 1.6.90

package/library.js

@@ -7,59 +7,117 @@ const db = require.main.require('./src/database');
 const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
+/**
+ * Récupère les paramètres du plugin
+ */
 async function getSettings() {
-  return await meta.settings.get(SETTINGS_KEY);
+    return await meta.settings.get(SETTINGS_KEY);
 }
 
+/**
+ * Vérifie si l'utilisateur actuel fait partie d'un groupe exclu
+ */
 async function isUserExcluded(uid, excludedGroups) {
-  if (!uid || !excludedGroups || !excludedGroups.length) return false;
-  const userGroups = await groups.getUserGroupsNames([uid]);
-  return excludedGroups.some(g => userGroups[0].includes(g));
+    if (!uid || uid <= 0) return false;
+    if (!excludedGroups || !excludedGroups.length) return false;
+
+    // S'assurer que excludedGroups est un tableau
+    const excludedList = Array.isArray(excludedGroups) ? excludedGroups : [excludedGroups];
+    
+    // Récupérer les groupes de l'utilisateur
+    const userGroups = await groups.getUserGroupsNames([uid]);
+    
+    // Vérifier s'il y a une intersection entre les groupes de l'utilisateur et les exclus
+    return excludedList.some(g => userGroups[0].includes(g));
 }
 
+/**
+ * Récupère la liste de tous les groupes pour l'affichage dans l'admin
+ */
 async function getAllGroups() {
-  let names = await db.getSortedSetRange('groups:createtime', 0, -1);
-  const data = await groups.getGroupsData(names);
-  return data.filter(g => g && g.name).map(g => ({ name: g.name }));
+    let names = await db.getSortedSetRange('groups:createtime', 0, -1);
+    if (!names || !names.length) {
+        names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
+    }
+    const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
+    const data = await groups.getGroupsData(filtered);
+    const valid = data.filter(g => g && g.name);
+    valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+    return valid;
 }
 
+/**
+ * Initialisation du plugin (Routes et API)
+ */
 plugin.init = async ({ router, middleware }) => {
-  async function render(req, res) {
-    const settings = await getSettings();
-    const allGroups = await getAllGroups();
-    res.render('admin/plugins/ezoic-infinite', {
-      ...settings,
-      allGroups,
-    });
-  }
-
-  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
-  router.get('/api/admin/plugins/ezoic-infinite', render);
-
-  router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
-    const settings = await getSettings();
-    const excluded = await isUserExcluded(req.uid, settings.excludedGroups || []);
-    res.json({
-      excluded,
-      enableBetweenAds: settings.enableBetweenAds === 'on',
-      showFirstTopicAd: settings.showFirstTopicAd === 'on',
-      placeholderIds: settings.placeholderIds,
-      intervalPosts: settings.intervalPosts || 10,
-      enableMessageAds: settings.enableMessageAds === 'on',
-      showFirstMessageAd: settings.showFirstMessageAd === 'on',
-      messagePlaceholderIds: settings.messagePlaceholderIds,
-      messageIntervalPosts: settings.messageIntervalPosts || 10,
+    async function render(req, res) {
+        const settings = await getSettings();
+        const allGroups = await getAllGroups();
+
+        res.render('admin/plugins/ezoic-infinite', {
+            title: 'Ezoic Infinite Ads',
+            ...settings,
+            // On force les booléens pour les cases à cocher dans le template
+            enableCategoryAds_checked: settings.enableCategoryAds === 'on' || settings.enableCategoryAds === true ? 'checked' : '',
+            enableBetweenAds_checked: settings.enableBetweenAds === 'on' || settings.enableBetweenAds === true ? 'checked' : '',
+            enableMessageAds_checked: settings.enableMessageAds === 'on' || settings.enableMessageAds === true ? 'checked' : '',
+            allGroups,
+        });
+    }
+
+    router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
+    router.get('/api/admin/plugins/ezoic-infinite', render);
+
+    // API de configuration appelée par client.js
+    router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
+        const settings = await getSettings();
+        
+        // Vérification de l'exclusion
+        const excludedGroups = settings.excludedGroups ? (Array.isArray(settings.excludedGroups) ? settings.excludedGroups : [settings.excludedGroups]) : [];
+        const excluded = await isUserExcluded(req.uid, excludedGroups);
+
+        res.json({
+            excluded,
+            // 1. Accueil (Catégories)
+            enableCategoryAds: settings.enableCategoryAds === 'on' || settings.enableCategoryAds === true,
+            showFirstCategoryAd: settings.showFirstCategoryAd === 'on' || settings.showFirstCategoryAd === true,
+            categoryPlaceholderIds: settings.categoryPlaceholderIds || "",
+            intervalCategories: parseInt(settings.intervalCategories, 10) || 5,
+
+            // 2. Liste des Topics (Page catégorie)
+            enableBetweenAds: settings.enableBetweenAds === 'on' || settings.enableBetweenAds === true,
+            showFirstTopicAd: settings.showFirstTopicAd === 'on' || settings.showFirstTopicAd === true,
+            placeholderIds: settings.placeholderIds || "",
+            intervalPosts: parseInt(settings.intervalPosts, 10) || 10,
+
+            // 3. Messages (Dans un post)
+            enableMessageAds: settings.enableMessageAds === 'on' || settings.enableMessageAds === true,
+            showFirstMessageAd: settings.showFirstMessageAd === 'on' || settings.showFirstMessageAd === true,
+            messagePlaceholderIds: settings.messagePlaceholderIds || "",
+            messageIntervalPosts: parseInt(settings.messageIntervalPosts, 10) || 10,
+        });
     });
-  });
 };
 
+/**
+ * Ajoute le lien dans le menu de navigation de l'administration
+ */
 plugin.addAdminNavigation = async (header) => {
-  header.plugins.push({
-    route: '/plugins/ezoic-infinite',
-    icon: 'fa-ad',
-    name: 'Ezoic Infinite'
-  });
-  return header;
+    header.plugins.push({
+        route: '/plugins/ezoic-infinite',
+        icon: 'fa-ad',
+        name: 'Ezoic Infinite'
+    });
+    return header;
+};
+
+/**
+ * Gère la sauvegarde des paramètres
+ */
+plugin.onSettingsSet = async (data) => {
+    if (data.plugin === 'ezoic-infinite') {
+        // Logique optionnelle à l'enregistrement
+    }
 };
 
 module.exports = plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.88",
+  "version": "1.6.90",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -10,7 +10,12 @@
   let config = null;
   let isInternalChange = false;
   let definedIds = new Set();
-  let ezoicEnabledOnThisPage = false;
+  let pendingIds = new Set();
+  let refreshTimer = null;
+
+  if (typeof window.ezoicFirstEnableDone === 'undefined') {
+    window.ezoicFirstEnableDone = false;
+  }
 
   function getPool() {
     let p = document.getElementById(POOL_ID);
@@ -23,53 +28,68 @@
     return p;
   }
 
-  function callEzoic(id) {
-    if (typeof window.ezstandalone === 'undefined') return;
-    const pid = parseInt(id, 10);
-    if (isNaN(pid)) return;
+  function triggerEzoic() {
+    if (typeof window.ezstandalone === 'undefined' || pendingIds.size === 0) return;
 
     window.ezstandalone.cmd.push(function() {
-      // On définit l'ID s'il est nouveau
-      if (!definedIds.has(pid)) {
-        window.ezstandalone.define(pid);
-        definedIds.add(pid);
-      }
+      const idsToProcess = Array.from(pendingIds);
+      pendingIds.clear();
 
-      // Protection contre l'erreur "cannot call refresh on same page enable"
-      if (!window.ezstandalone.enabled && !ezoicEnabledOnThisPage) {
+      window.ezstandalone.define(idsToProcess);
+
+      if (!window.ezstandalone.enabled && !window.ezoicFirstEnableDone) {
         window.ezstandalone.enable();
         window.ezstandalone.display();
-        ezoicEnabledOnThisPage = true;
+        window.ezoicFirstEnableDone = true;
       } else {
-        // Délai de sécurité de 500ms pour laisser Ezoic finir son cycle initial
+        // Délai de sécurité pour éviter le conflit "same page enable"
         setTimeout(function() {
           try {
             window.ezstandalone.refresh();
           } catch (e) {
             console.debug('[Ezoic] Refresh deferred');
           }
-        }, 500);
+        }, 1000);
       }
     });
   }
 
+  function callEzoic(id) {
+    const pid = parseInt(id, 10);
+    if (isNaN(pid)) return;
+    pendingIds.add(pid);
+    definedIds.add(pid);
+
+    clearTimeout(refreshTimer);
+    refreshTimer = setTimeout(triggerEzoic, 300);
+  }
+
   function redistribute() {
     if (!config || config.excluded) return;
 
-    // Sélecteurs V17 (Harmony)
+    // 1. PAGE D'ACCUEIL (Liste des catégories)
+    const categoryItems = document.querySelectorAll('.category-item, [component="categories/category"]');
+    
+    // 2. PAGE CATEGORIE (Liste des topics)
     const topicItems = document.querySelectorAll('li[component="category/topic"]');
+    
+    // 3. PAGE TOPIC (Messages / Posts)
     const postItems = document.querySelectorAll('[component="post"]');
 
-    if (topicItems.length > 0 && config.enableBetweenAds) {
-      processItems(Array.from(topicItems), 'between', config.intervalPosts, config.showFirstTopicAd);
+    if (categoryItems.length > 0 && config.enableCategoryAds) {
+      process(Array.from(categoryItems), 'home', config.intervalCategories, config.showFirstCategoryAd);
     }
     
+    if (topicItems.length > 0 && config.enableBetweenAds) {
+      process(Array.from(topicItems), 'topic-list', config.intervalPosts, config.showFirstTopicAd);
+    }
+
     if (postItems.length > 0 && config.enableMessageAds) {
-      processItems(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
+      process(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
     }
   }
 
-  function processItems(items, kind, interval, showFirst) {
+  function process(items, kind, interval, showFirst) {
     const int = parseInt(interval, 10) || 10;
     items.forEach((item, index) => {
       const pos = index + 1;
@@ -95,6 +115,7 @@
       .then(data => {
         config = data;
         const pool = getPool();
+        
         const setup = (raw, kind) => {
           if (!raw) return;
           raw.split(/[\s,]+/).filter(Boolean).forEach(id => {
@@ -108,7 +129,10 @@
             }
           });
         };
-        setup(config.placeholderIds, 'between');
+
+        // On initialise les 3 pools séparés
+        setup(config.categoryPlaceholderIds, 'home');
+        setup(config.placeholderIds, 'topic-list');
         setup(config.messagePlaceholderIds, 'message');
         
         redistribute();
@@ -120,15 +144,7 @@
       });
   }
 
-  // Reset lors de la navigation NodeBB (SPA)
-  window.addEventListener('action:ajaxify.start', function() {
-    ezoicEnabledOnThisPage = false;
-    definedIds.clear(); 
-  });
-
-  window.addEventListener('action:ajaxify.end', function() {
-    setTimeout(redistribute, 600);
-  });
+  window.addEventListener('action:ajaxify.end', () => setTimeout(redistribute, 800));
 
   if (document.readyState === 'loading') {
     document.addEventListener('DOMContentLoaded', init);

package/public/style.css

@@ -1,29 +1,34 @@
-/* Container global */
+/* Container global de pub */
 .nodebb-ezoic-wrap {
     display: block !important;
     width: 100% !important;
-    min-width: 100% !important;
     margin: 20px 0 !important;
     min-height: 250px; 
     clear: both;
     text-align: center;
 }
 
-/* Fix spécifique pour la liste des topics (Accueil Harmony) */
+/* Accueil (Catégories) */
+[component="categories/category"] + .nodebb-ezoic-wrap,
+.category-item + .nodebb-ezoic-wrap {
+    margin: 40px 0 !important;
+    border-top: 1px solid rgba(0,0,0,0.05);
+}
+
+/* Liste des Topics (Page catégorie) */
 li[component="category/topic"] + .nodebb-ezoic-wrap {
     list-style: none !important;
-    margin-left: 0 !important;
     padding: 15px 0;
     border-bottom: 1px solid rgba(0,0,0,0.05);
 }
 
-/* Si le bloc est vide ou n'a pas encore chargé */
-.nodebb-ezoic-wrap:empty {
-    min-height: 1px;
+/* Messages (Dans un post) */
+[component="post"] + .nodebb-ezoic-wrap {
+    margin: 40px 0 !important;
+    padding: 20px;
+    background: rgba(0,0,0,0.01);
 }
 
-/* Neutralisation des marges internes d'Ezoic */
-.ezoic-ad {
-    margin: 0 auto !important;
-    display: inline-block !important;
-}
+/* Masquage des blocs vides */
+.nodebb-ezoic-wrap:empty { min-height: 1px; }
+.ezoic-ad { margin: 0 auto !important; }