nodebb-plugin-ezoic-infinite 1.6.87 → 1.6.89

package/library.js

@@ -2,58 +2,64 @@
 
 const meta = require.main.require('./src/meta');
 const groups = require.main.require('./src/groups');
+const db = require.main.require('./src/database');
 
 const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
 async function getSettings() {
-    return await meta.settings.get(SETTINGS_KEY) || {};
+  return await meta.settings.get(SETTINGS_KEY);
+}
+
+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));
+}
+
+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 }));
 }
 
 plugin.init = async ({ router, middleware }) => {
-    const renderAdmin = async (req, res) => {
-        const settings = await getSettings();
-        const db = require.main.require('./src/database');
-        const names = await db.getSortedSetRange('groups:createtime', 0, -1);
-        const groupsData = await groups.getGroupsData(names);
-        const allGroups = groupsData.filter(g => g && g.name).map(g => ({ name: g.name }));
-
-        res.render('admin/plugins/ezoic-infinite', {
-            ...settings,
-            allGroups,
-            enableBetweenAds_checked: settings.enableBetweenAds === 'on' ? 'checked' : '',
-            enableMessageAds_checked: settings.enableMessageAds === 'on' ? 'checked' : ''
-        });
-    };
-
-    router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
-    router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
-
-    router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
-        const settings = await getSettings();
-        let excluded = false;
-        if (req.uid && settings.excludedGroups) {
-            const groupsList = Array.isArray(settings.excludedGroups) ? settings.excludedGroups : [settings.excludedGroups];
-            excluded = await groups.isMemberOfGroups(req.uid, groupsList);
-        }
-
-        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', {
+      ...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,
     });
+  });
 };
 
 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;
 };
 
 module.exports = plugin;

package/package.json

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

package/public/client.js

@@ -9,7 +9,9 @@
   
   let config = null;
   let isInternalChange = false;
-  let activePlaceholders = new Set();
+  let definedIds = new Set();
+  let pendingIds = new Set();
+  let refreshTimer = null;
 
   function getPool() {
     let p = document.getElementById(POOL_ID);
@@ -22,48 +24,64 @@
     return p;
   }
 
-  // Utilisation stricte de la file d'attente CMD du zip
-  function callEzoic(id) {
-    if (typeof window.ezstandalone === 'undefined') return;
-    
+  // Cette fonction centralise les appels pour éviter de spammer Refresh()
+  function triggerEzoic() {
+    if (typeof window.ezstandalone === 'undefined' || pendingIds.size === 0) return;
+
     window.ezstandalone.cmd.push(function() {
-      // Si l'ID est déjà affiché, on ne fait rien pour éviter le spam de refresh
-      if (activePlaceholders.has(id)) {
-          window.ezstandalone.refresh();
-          return;
-      }
+      const idsToProcess = Array.from(pendingIds);
+      pendingIds.clear();
 
-      window.ezstandalone.define(id);
-      activePlaceholders.add(id);
+      // 1. Définir les nouveaux IDs
+      window.ezstandalone.define(idsToProcess);
 
+      // 2. Si c'est le tout premier appel de la page
       if (!window.ezstandalone.enabled) {
         window.ezstandalone.enable();
         window.ezstandalone.display();
       } else {
-        window.ezstandalone.refresh();
+        // 3. Sinon, on utilise Refresh MAIS seulement si on n'est pas 
+        // dans la même micro-seconde que l'initialisation
+        try {
+            window.ezstandalone.refresh();
+        } catch (e) {
+            console.warn('[Ezoic] Refresh skipped to prevent conflict');
+        }
       }
     });
   }
 
+  function callEzoic(id) {
+    const pid = parseInt(id, 10);
+    if (isNaN(pid)) return;
+
+    // On ajoute l'ID à la liste des IDs à traiter
+    pendingIds.add(pid);
+    definedIds.add(pid);
+
+    // On attend 200ms que les autres pubs du même scroll arrivent
+    // avant de lancer l'appel Ezoic unique. C'est le "Debounce".
+    clearTimeout(refreshTimer);
+    refreshTimer = setTimeout(triggerEzoic, 200);
+  }
+
   function redistribute() {
     if (!config || config.excluded) return;
 
-    // Utilisation des sélecteurs exacts du zip V17 (Harmony/NodeBB 4)
+    // Sélecteurs Harmony
     const topicItems = document.querySelectorAll('li[component="category/topic"]');
-    const postItems = document.querySelectorAll('[component="post"][data-pid]');
+    const postItems = document.querySelectorAll('[component="post"]');
 
-    // Injection pour la page d'accueil / catégories
     if (topicItems.length > 0 && config.enableBetweenAds) {
-      inject(Array.from(topicItems), 'between', config.intervalPosts, config.showFirstTopicAd);
+      processItems(Array.from(topicItems), 'between', config.intervalPosts, config.showFirstTopicAd);
     }
-
-    // Injection pour les messages (topics)
+    
     if (postItems.length > 0 && config.enableMessageAds) {
-      inject(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
+      processItems(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
     }
   }
 
-  function inject(items, kind, interval, showFirst) {
+  function processItems(items, kind, interval, showFirst) {
     const int = parseInt(interval, 10) || 10;
     items.forEach((item, index) => {
       const pos = index + 1;
@@ -73,15 +91,10 @@
       if (shouldHaveAd && !(next && next.classList.contains(WRAP_CLASS))) {
         const pool = getPool();
         const available = pool.querySelector(`.${WRAP_CLASS}[data-kind="${kind}"]`);
-        
         if (available) {
           isInternalChange = true;
-          // On insère l'élément comme dans le zip original
           item.parentNode.insertBefore(available, item.nextSibling);
-          
-          const pid = parseInt(available.getAttribute('data-placeholder-id'), 10);
-          callEzoic(pid);
-          
+          callEzoic(available.getAttribute('data-placeholder-id'));
           setTimeout(() => { isInternalChange = false; }, 100);
         }
       }
@@ -94,8 +107,7 @@
       .then(data => {
         config = data;
         const pool = getPool();
-        
-        const setupPool = (raw, kind) => {
+        const setup = (raw, kind) => {
           if (!raw) return;
           raw.split(/[\s,]+/).filter(Boolean).forEach(id => {
             if (!document.querySelector(`[data-placeholder-id="${id}"]`)) {
@@ -103,19 +115,16 @@
               d.className = WRAP_CLASS;
               d.setAttribute('data-kind', kind);
               d.setAttribute('data-placeholder-id', id);
-              // Structure HTML propre
-              d.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}" class="ezoic-ad"></div>`;
+              d.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}"></div>`;
               pool.appendChild(d);
             }
           });
         };
-
-        setupPool(config.placeholderIds, 'between');
-        setupPool(config.messagePlaceholderIds, 'message');
+        setup(config.placeholderIds, 'between');
+        setup(config.messagePlaceholderIds, 'message');
         
         redistribute();
 
-        // Observer pour l'infinite scroll (reprise du zip)
         const observer = new MutationObserver(() => {
           if (!isInternalChange) redistribute();
         });
@@ -123,12 +132,19 @@
       });
   }
 
-  // Événements NodeBB pour gérer la navigation sans rechargement
-  if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function() {
-      setTimeout(redistribute, 500);
-    });
-  }
+  // Crucial pour les SPA : Nettoyer l'état d'Ezoic lors d'un changement de page
+  window.addEventListener('action:ajaxify.start', function() {
+    if (typeof window.ezstandalone !== 'undefined' && window.ezstandalone.enabled) {
+        // Optionnel : window.ezstandalone.destroy(); 
+        // Mais souvent il vaut mieux juste laisser Ezoic gérer
+    }
+    definedIds.clear();
+    pendingIds.clear();
+  });
+
+  window.addEventListener('action:ajaxify.end', function() {
+    setTimeout(redistribute, 600);
+  });
 
   if (document.readyState === 'loading') {
     document.addEventListener('DOMContentLoaded', init);

package/public/style.css

@@ -1,20 +1,29 @@
+/* Container global */
 .nodebb-ezoic-wrap {
-  display: block !important;
-  width: 100% !important;
-  margin: 30px 0 !important;
-  min-height: 250px; 
-  clear: both;
+    display: block !important;
+    width: 100% !important;
+    min-width: 100% !important;
+    margin: 20px 0 !important;
+    min-height: 250px; 
+    clear: both;
+    text-align: center;
 }
 
-/* Fix pour les listes de l'accueil Harmony */
+/* Fix spécifique pour la liste des topics (Accueil Harmony) */
 li[component="category/topic"] + .nodebb-ezoic-wrap {
-  list-style: none;
-  padding: 15px;
-  background: rgba(0,0,0,0.02);
-  border-radius: 8px;
+    list-style: none !important;
+    margin-left: 0 !important;
+    padding: 15px 0;
+    border-bottom: 1px solid rgba(0,0,0,0.05);
 }
 
-/* Éviter les trous si la pub ne charge pas */
+/* Si le bloc est vide ou n'a pas encore chargé */
 .nodebb-ezoic-wrap:empty {
-  min-height: 1px;
+    min-height: 1px;
+}
+
+/* Neutralisation des marges internes d'Ezoic */
+.ezoic-ad {
+    margin: 0 auto !important;
+    display: inline-block !important;
 }