nodebb-plugin-ezoic-infinite 1.6.96 → 1.6.97

package/library.js

@@ -11,44 +11,25 @@ async function getSettings() {
     return await meta.settings.get(SETTINGS_KEY);
 }
 
-/**
- * Vérifie l'exclusion par groupe avec gestion du format NodeBB
- */
 async function isUserExcluded(uid, excludedGroups) {
     if (!uid || uid <= 0) return false;
-    if (!excludedGroups || (Array.isArray(excludedGroups) && excludedGroups.length === 0)) return false;
-
-    const excludedList = Array.isArray(excludedGroups) ? excludedGroups : [excludedGroups];
+    if (!excludedGroups || !excludedGroups.length) return false;
     const userGroups = await groups.getUserGroupsNames([uid]);
-    
-    // userGroups[0] contient le tableau des noms de groupes de l'utilisateur
-    return excludedList.some(g => userGroups[0].includes(g));
+    return excludedGroups.some(g => userGroups[0].includes(g));
 }
 
 async function getAllGroups() {
     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;
+    const data = await groups.getGroupsData(names);
+    return data.filter(g => g && g.name).map(g => ({ name: g.name }));
 }
 
 plugin.init = async ({ router, middleware }) => {
     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 s'assure que les checkbox sont bien cochées dans l'admin
-            enableCategoryAds_checked: settings.enableCategoryAds === 'on' ? 'checked' : '',
-            enableBetweenAds_checked: settings.enableBetweenAds === 'on' ? 'checked' : '',
-            enableMessageAds_checked: settings.enableMessageAds === 'on' ? 'checked' : '',
             allGroups,
         });
     }
@@ -56,47 +37,30 @@ plugin.init = async ({ router, middleware }) => {
     router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
     router.get('/api/admin/plugins/ezoic-infinite', render);
 
-    // API consommée par le client.js
     router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
         const settings = await getSettings();
-        const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
-
+        const excluded = await isUserExcluded(req.uid, settings.excludedGroups || []);
         res.json({
             excluded,
-            // Pool Accueil
             enableCategoryAds: settings.enableCategoryAds === 'on',
             showFirstCategoryAd: settings.showFirstCategoryAd === 'on',
-            categoryPlaceholderIds: settings.categoryPlaceholderIds || "",
+            categoryPlaceholderIds: settings.categoryPlaceholderIds,
             intervalCategories: parseInt(settings.intervalCategories, 10) || 5,
-
-            // Pool Topics (Catégories)
             enableBetweenAds: settings.enableBetweenAds === 'on',
             showFirstTopicAd: settings.showFirstTopicAd === 'on',
-            placeholderIds: settings.placeholderIds || "",
+            placeholderIds: settings.placeholderIds,
             intervalPosts: parseInt(settings.intervalPosts, 10) || 10,
-
-            // Pool Messages (Topics)
             enableMessageAds: settings.enableMessageAds === 'on',
             showFirstMessageAd: settings.showFirstMessageAd === 'on',
-            messagePlaceholderIds: settings.messagePlaceholderIds || "",
+            messagePlaceholderIds: settings.messagePlaceholderIds,
             messageIntervalPosts: parseInt(settings.messageIntervalPosts, 10) || 10,
         });
     });
 };
 
 plugin.addAdminNavigation = async (header) => {
-    header.plugins.push({
-        route: '/plugins/ezoic-infinite',
-        icon: 'fa-ad',
-        name: 'Ezoic Infinite'
-    });
+    header.plugins.push({ route: '/plugins/ezoic-infinite', icon: 'fa-ad', name: 'Ezoic Infinite' });
     return header;
 };
 
-plugin.onSettingsSet = async (data) => {
-    if (data.plugin === 'ezoic-infinite') {
-        // Optionnel : purger un cache si nécessaire
-    }
-};
-
 module.exports = plugin;

package/package.json

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

package/public/client.js

@@ -8,6 +8,7 @@
   const POOL_ID = 'nodebb-ezoic-placeholder-pool';
   let config = null;
   let isInternalChange = false;
+  let activeIds = new Set();
 
   function getPool() {
     let p = document.getElementById(POOL_ID);
@@ -20,68 +21,67 @@
     return p;
   }
 
-  // Cette fonction force Ezoic à remplir le placeholder
-  function forceFillAd(id) {
+  function callEzoic(id) {
     if (typeof window.ezstandalone === 'undefined') return;
+    const pid = parseInt(id, 10);
+    if (isNaN(pid)) return;
 
     window.ezstandalone.cmd.push(function() {
-      // 1. On s'assure que l'ID est bien dans la liste d'Ezoic
-      window.ezstandalone.define(parseInt(id, 10));
-      
-      // 2. On attend un micro-délai pour que le DOM soit stable
-      setTimeout(() => {
-        try {
-          // La doc précise que showAds avec IDs est le mode "Dynamic"
-          window.ezstandalone.showAds(parseInt(id, 10));
-          // On force un rafraîchissement spécifique si showAds ne suffit pas
-          if (window.ezstandalone.refresh) {
-             window.ezstandalone.refresh(parseInt(id, 10));
-          }
-        } catch (e) {
-          console.warn('[Ezoic] Fill failed for', id, e);
-        }
-      }, 200);
+      window.ezstandalone.define(pid);
+      if (!window.ezstandalone.enabled) {
+        window.ezstandalone.enable();
+        window.ezstandalone.showAds();
+      } else {
+        window.ezstandalone.showAds(pid);
+      }
+      activeIds.add(pid);
     });
   }
 
   function redistribute() {
     if (!config || config.excluded) return;
 
-    const selectors = {
-      'home': '.category-item, [component="categories/category"]',
-      'topic-list': 'li[component="category/topic"]',
-      'message': '[component="post"]'
-    };
-
-    const process = (items, kind, interval, showFirst) => {
-      const int = parseInt(interval, 10) || 10;
-      const pool = getPool();
-
-      items.forEach((item, index) => {
-        const pos = index + 1;
-        const shouldHaveAd = (pos === 1 && showFirst) || (pos % int === 0);
-        const next = item.nextElementSibling;
-
-        if (shouldHaveAd && !(next && next.classList.contains(WRAP_CLASS))) {
-          const available = pool.querySelector(`.${WRAP_CLASS}[data-kind="${kind}"]`);
-          if (available) {
-            isInternalChange = true;
-            // On insère l'élément
-            item.parentNode.insertBefore(available, item.nextSibling);
-            
-            // On déclenche le remplissage publicitaire
-            const pid = available.getAttribute('data-placeholder-id');
-            forceFillAd(pid);
-            
-            setTimeout(() => { isInternalChange = false; }, 50);
-          }
-        }
-      });
-    };
+    // 1. Accueil / Catégories
+    const categoryItems = document.querySelectorAll('.category-item, [component="categories/category"]');
+    if (config.enableCategoryAds) process(Array.from(categoryItems), 'home', config.intervalCategories, config.showFirstCategoryAd, 'div');
+
+    // 2. Liste des Topics (Harmony utilise des <li>)
+    const topicItems = document.querySelectorAll('li[component="category/topic"]');
+    if (config.enableBetweenAds) process(Array.from(topicItems), 'topic-list', config.intervalPosts, config.showFirstTopicAd, 'li');
 
-    if (config.enableCategoryAds) process(Array.from(document.querySelectorAll(selectors.home)), 'home', config.intervalCategories, config.showFirstCategoryAd);
-    if (config.enableBetweenAds) process(Array.from(document.querySelectorAll(selectors['topic-list'])), 'topic-list', config.intervalPosts, config.showFirstTopicAd);
-    if (config.enableMessageAds) process(Array.from(document.querySelectorAll(selectors.message)), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
+    // 3. Messages (Posts)
+    const postItems = document.querySelectorAll('[component="post"]');
+    if (config.enableMessageAds) process(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd, 'div');
+  }
+
+  function process(items, kind, interval, showFirst, wrapperTag) {
+    const int = parseInt(interval, 10) || 10;
+    const pool = getPool();
+
+    items.forEach((item, index) => {
+      const pos = index + 1;
+      const shouldHaveAd = (pos === 1 && showFirst) || (pos % int === 0);
+      const next = item.nextElementSibling;
+
+      if (shouldHaveAd && !(next && next.classList.contains(WRAP_CLASS))) {
+        const available = pool.querySelector(`[data-kind="${kind}"]`);
+        if (available) {
+          isInternalChange = true;
+          
+          // Création d'un conteneur qui respecte le type de parent (li ou div)
+          const wrapper = document.createElement(wrapperTag);
+          wrapper.className = WRAP_CLASS + ' ezoic-added-content';
+          wrapper.setAttribute('data-kind', kind);
+          wrapper.setAttribute('data-placeholder-id', available.getAttribute('data-placeholder-id'));
+          wrapper.innerHTML = available.innerHTML;
+
+          item.parentNode.insertBefore(wrapper, item.nextSibling);
+          callEzoic(available.getAttribute('data-placeholder-id'));
+          
+          setTimeout(() => { isInternalChange = false; }, 50);
+        }
+      }
+    });
   }
 
   function init() {
@@ -90,21 +90,16 @@
       .then(data => {
         config = data;
         const pool = getPool();
-        
         const setup = (raw, kind) => {
           if (!raw) return;
           raw.split(/[\s,]+/).filter(Boolean).forEach(id => {
-            if (!document.getElementById(`ezoic-pub-ad-placeholder-${id}`)) {
-              const d = document.createElement('div');
-              d.className = WRAP_CLASS;
-              d.setAttribute('data-kind', kind);
-              d.setAttribute('data-placeholder-id', id);
-              d.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}"></div>`;
-              pool.appendChild(d);
-            }
+            const d = document.createElement('div');
+            d.setAttribute('data-kind', kind);
+            d.setAttribute('data-placeholder-id', id);
+            d.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}"></div>`;
+            pool.appendChild(d);
           });
         };
-
         setup(config.categoryPlaceholderIds, 'home');
         setup(config.placeholderIds, 'topic-list');
         setup(config.messagePlaceholderIds, 'message');
@@ -118,8 +113,18 @@
       });
   }
 
-  window.addEventListener('action:ajaxify.end', () => {
-    setTimeout(redistribute, 500);
+  // GESTION NAVIGATION SANS RECHARGE (SPA)
+  window.addEventListener('action:ajaxify.start', function() {
+    if (typeof window.ezstandalone !== 'undefined' && activeIds.size > 0) {
+      window.ezstandalone.cmd.push(function() {
+        window.ezstandalone.destroyAll();
+        activeIds.clear();
+      });
+    }
+  });
+
+  window.addEventListener('action:ajaxify.end', function() {
+    setTimeout(redistribute, 600);
   });
 
   if (document.readyState === 'loading') {

package/public/style.css

@@ -1,91 +1,37 @@
-/* ============================================================
-   CONTAINER GLOBAL DES PUBS
-   ============================================================ */
+/* Isolation et Taille */
 .nodebb-ezoic-wrap {
     display: block !important;
     width: 100% !important;
-    min-height: 250px; /* Réserve l'espace pour éviter le saut de contenu (CLS) */
+    min-height: 250px !important;
     margin: 30px 0 !important;
-    padding: 0;
     clear: both !important;
     text-align: center;
-    position: relative;
-    overflow: hidden;
+    list-style: none !important; /* Pour les injections en <li> */
 }
 
-/* On s'assure que le contenu Ezoic à l'intérieur est centré */
-.nodebb-ezoic-wrap > div {
-    margin: 0 auto !important;
-}
-
-/* ============================================================
-   1. PAGE D'ACCUEIL (Liste des 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);
-    padding-top: 25px;
-    background: transparent;
-}
-
-/* ============================================================
-   2. PAGE CATÉGORIE (Liste des Topics / Sujets)
-   ============================================================ */
-/* Important : NodeBB Harmony utilise des <li> pour les topics. 
-   On s'assure que notre wrap ne casse pas la structure de liste 
-   mais s'affiche comme un bloc complet. */
-li[component="category/topic"] + .nodebb-ezoic-wrap {
-    list-style: none !important;
-    margin: 0 !important;
-    padding: 20px 0 !important;
-    border-bottom: 1px solid rgba(0,0,0,0.05);
-    display: block !important;
+/* Fix pour l'accueil Harmony */
+li.nodebb-ezoic-wrap {
     float: none !important;
-    width: 100%;
+    padding: 20px 0;
+    border-bottom: 1px solid rgba(0,0,0,0.05);
 }
 
-/* ============================================================
-   3. PAGE DES POSTS (Messages à l'intérieur d'un topic)
-   ============================================================ */
+/* Éviter que les pubs ne se collent aux messages */
 [component="post"] + .nodebb-ezoic-wrap {
-    margin: 45px 0 !important;
-    padding: 25px;
-    background: rgba(0,0,0,0.02); /* Léger fond pour distinguer le message pub */
-    border-radius: 12px;
-    border: 1px inset rgba(0,0,0,0.03);
+    background: rgba(0,0,0,0.02);
+    padding: 20px;
+    border-radius: 10px;
 }
 
-/* ============================================================
-   CORRECTIFS ANTI "PILE-UP" & AFFICHAGE
-   ============================================================ */
-
-/* Évite que les pubs ne soient invisibles si Ezoic ne charge rien immédiatement */
-.nodebb-ezoic-wrap:empty {
-    min-height: 1px;
-    height: 1px;
+/* Anti-remontée (Pile-up) */
+.nodebb-ezoic-wrap::before, .nodebb-ezoic-wrap::after {
+    content: "";
+    display: table;
+    clear: both;
 }
 
-/* Neutralise les marges forcées par Ezoic qui pourraient décaler le layout */
+/* Centrage forcé des iframes Ezoic */
 .ezoic-ad {
-    margin: 10px auto !important;
+    margin: 0 auto !important;
     display: block !important;
-}
-
-/* Mobile : Réduction des marges pour ne pas perdre trop de place */
-@media (max-width: 767px) {
-    .nodebb-ezoic-wrap {
-        margin: 20px 0 !important;
-        min-height: 100px;
-    }
-    [component="post"] + .nodebb-ezoic-wrap {
-        padding: 10px;
-        margin: 25px 0 !important;
-    }
-}
-
-/* Empêche les sauts de ligne bizarres dans les listes Harmony */
-.categories > li.nodebb-ezoic-wrap,
-.category > li.nodebb-ezoic-wrap {
-    float: none !important;
 }