nodebb-plugin-ezoic-infinite 1.6.57 → 1.6.59

package/library.js

@@ -4,50 +4,127 @@ 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 = {};
 
-// Helper pour garantir des valeurs par défaut
+function normalizeExcludedGroups(value) {
+  if (!value) return [];
+  if (Array.isArray(value)) return value;
+  return String(value).split(',').map(s => s.trim()).filter(Boolean);
+}
+
+function parseBool(v, def = false) {
+  if (v === undefined || v === null || v === '') return def;
+  if (typeof v === 'boolean') return v;
+  const s = String(v).toLowerCase();
+  return s === '1' || s === 'true' || s === 'on' || s === 'yes';
+}
+
+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);
+  // Filter out nulls (groups deleted between the sorted-set read and getGroupsData)
+  const valid = data.filter(g => g && g.name);
+  valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+  return valid;
+}
+let _settingsCache = null;
+let _settingsCacheAt = 0;
+const SETTINGS_TTL = 30000; // 30s
+
 async function getSettings() {
-    const settings = await meta.settings.get('ezoic-infinite');
-    return {
-        enableBetweenAds: settings.enableBetweenAds === 'on',
-        showFirstTopicAd: settings.showFirstTopicAd === 'on',
-        placeholderIds: settings.placeholderIds || '',
-        intervalPosts: parseInt(settings.intervalPosts, 10) || 5,
-        enableMessageAds: settings.enableMessageAds === 'on',
-        showFirstMessageAd: settings.showFirstMessageAd === 'on',
-        messagePlaceholderIds: settings.messagePlaceholderIds || '',
-        messageIntervalPosts: parseInt(settings.messageIntervalPosts, 10) || 5,
-        excludedGroups: settings.excludedGroups || [],
-    };
+  const now = Date.now();
+  if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
+  const s = await meta.settings.get(SETTINGS_KEY);
+  _settingsCacheAt = Date.now();
+  _settingsCache = {
+    // Between-post ads (simple blocks) in category topic list
+    enableBetweenAds: parseBool(s.enableBetweenAds, true),
+    showFirstTopicAd: parseBool(s.showFirstTopicAd, false),
+    placeholderIds: (s.placeholderIds || '').trim(),
+    intervalPosts: Math.max(1, parseInt(s.intervalPosts, 10) || 6),
+
+    // Home/categories list ads (between categories on / or /categories)
+    enableCategoryAds: parseBool(s.enableCategoryAds, false),
+    showFirstCategoryAd: parseBool(s.showFirstCategoryAd, false),
+    categoryPlaceholderIds: (s.categoryPlaceholderIds || '').trim(),
+    intervalCategories: Math.max(1, parseInt(s.intervalCategories, 10) || 4),
+
+    // "Ad message" between replies (looks like a post)
+    enableMessageAds: parseBool(s.enableMessageAds, false),
+    showFirstMessageAd: parseBool(s.showFirstMessageAd, false),
+    messagePlaceholderIds: (s.messagePlaceholderIds || '').trim(),
+    messageIntervalPosts: Math.max(1, parseInt(s.messageIntervalPosts, 10) || 3),
+
+    excludedGroups: normalizeExcludedGroups(s.excludedGroups),
+  };
+  return _settingsCache;
+}
+
+async function isUserExcluded(uid, excludedGroups) {
+  if (!uid || !excludedGroups.length) return false;
+  const userGroups = await groups.getUserGroups([uid]);
+  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
 }
 
+plugin.onSettingsSet = function (data) {
+  // Invalider le cache dès que les settings de ce plugin sont sauvegardés via l'ACP
+  if (data && data.hash === SETTINGS_KEY) {
+    _settingsCache = null;
+  }
+};
+
+plugin.addAdminNavigation = async (header) => {
+  header.plugins = header.plugins || [];
+  header.plugins.push({
+    route: '/plugins/ezoic-infinite',
+    icon: 'fa-ad',
+    name: 'Ezoic Infinite Ads'
+  });
+  return header;
+};
+
 plugin.init = async ({ router, middleware }) => {
-    const render = async (req, res) => {
-        const settings = await getSettings();
-        const allGroups = await getAllGroups(); // Utilise votre fonction existante
-        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);
-
-    // L'API que le client.js appelle
-    router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
-        const settings = await getSettings();
-        let excluded = false;
-
-        if (req.uid && settings.excludedGroups.length) {
-            excluded = await groups.isMemberOfAny(req.uid, settings.excludedGroups);
-        }
-
-        res.json({
-            ...settings,
-            excluded
-        });
+  async function render(req, res) {
+    const settings = await getSettings();
+    const allGroups = await getAllGroups();
+
+    res.render('admin/plugins/ezoic-infinite', {
+      title: 'Ezoic Infinite Ads',
+      ...settings,
+      enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
+      enableMessageAds_checked: settings.enableMessageAds ? 'checked' : '',
+      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);
 
-// ... gardez vos fonctions getAllGroups et addAdminNavigation ...
+    res.json({
+      excluded,
+      enableBetweenAds: settings.enableBetweenAds,
+      showFirstTopicAd: settings.showFirstTopicAd,
+      placeholderIds: settings.placeholderIds,
+      intervalPosts: settings.intervalPosts,
+      enableCategoryAds: settings.enableCategoryAds,
+      showFirstCategoryAd: settings.showFirstCategoryAd,
+      categoryPlaceholderIds: settings.categoryPlaceholderIds,
+      intervalCategories: settings.intervalCategories,
+      enableMessageAds: settings.enableMessageAds,
+      showFirstMessageAd: settings.showFirstMessageAd,
+      messagePlaceholderIds: settings.messagePlaceholderIds,
+      messageIntervalPosts: settings.messageIntervalPosts,
+    });
+  });
+};
 
-module.exports = plugin;
+module.exports = plugin;

package/package.json

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

package/public/client.js

@@ -2,151 +2,86 @@
   'use strict';
 
   const WRAP_CLASS = 'nodebb-ezoic-wrap';
-  const PINNED_ATTR = 'data-ezoic-pinned';
   const PLACEHOLDER_PREFIX = 'ezoic-pub-ad-placeholder-';
   
   let config = null;
   let usedIds = new Set();
-  let isEzoicEnabled = false; // Flag crucial pour corriger vos logs d'erreur
-  let scheduleTimer = null;
+  let isEzoicEnabled = false;
+  let isRefreshing = false;
 
-  // --- SÉLECTEURS ---
-  function getTopicList() {
-    return document.querySelector('[component="topic/list"], [component="category"], [component="categories"]');
-  }
-
-  function getPostList() {
-    return document.querySelector('[component="topic"], [component="post/list"]');
-  }
-
-  // --- LOGIQUE EZOIC ---
-  function callEzoic(idsToDefine) {
-    if (!window.ezstandalone || !idsToDefine.length) return;
+  // --- LOGIQUE SDK EZOIC ---
+  function callEzoic(newIds) {
+    if (!window.ezstandalone || !newIds.length) return;
 
     try {
-      // 1. Définir les placeholders
-      window.ezstandalone.define(idsToDefine);
+      window.ezstandalone.define(newIds);
 
-      // 2. Logique Enable vs Refresh (Correction de vos erreurs log)
+      // Si c'est le TOUT PREMIER appel sur la page
       if (!isEzoicEnabled && !window.ezstandalone.enabled) {
         window.ezstandalone.enable();
         window.ezstandalone.display();
-        isEzoicEnabled = true; 
-        console.log('[Ezoic] First Enable & Display');
-      } else {
-        // On attend un cycle pour s'assurer qu'Ezoic est prêt pour le refresh
+        isEzoicEnabled = true;
+      } 
+      // Sinon, on utilise refresh MAIS avec un verrou de sécurité
+      else if (isEzoicEnabled && !isRefreshing) {
+        isRefreshing = true;
         setTimeout(() => {
           window.ezstandalone.refresh();
-          console.log('[Ezoic] Refreshing existing instance');
-        }, 100);
+          isRefreshing = false;
+        }, 500); // Délai de 500ms pour laisser le SDK respirer
       }
-    } catch (e) {
-      console.warn('[Ezoic] SDK Error:', e);
-    }
-  }
-
-  function getNextId(poolStr) {
-    if (!poolStr) return null;
-    const ids = poolStr.split(/[\s,]+/).filter(Boolean);
-    for (const id of ids) {
-      const num = id.replace(/[^\d]/g, '');
-      if (num && !usedIds.has(num)) {
-        usedIds.add(num);
-        return num;
-      }
-    }
-    return null;
+    } catch (e) { console.warn('[Ezoic] Error:', e); }
   }
 
   // --- INJECTION ---
   function inject() {
     if (!config || config.excluded) return;
-    const newIds = [];
+    const ul = document.querySelector('[component="topic/list"], [component="category"]');
+    if (!ul) return;
 
-    // A. Topics / Categories
-    const ul = getTopicList();
-    if (ul && config.enableBetweenAds) {
-      // Nettoyage anti-pileup (remontée)
-      ul.querySelectorAll('.' + WRAP_CLASS).forEach(w => {
-        if (!w.previousElementSibling || w.previousElementSibling.tagName !== 'LI') w.remove();
-      });
+    const items = Array.from(ul.children).filter(c => c.tagName === 'LI' && !c.classList.contains(WRAP_CLASS));
+    const newIdsFound = [];
+    const interval = parseInt(config.intervalPosts, 10) || 5;
 
-      const items = Array.from(ul.children).filter(c => c.tagName === 'LI' && !c.classList.contains(WRAP_CLASS));
-      
-      // First Ad
-      if (config.showFirstTopicAd && !ul.querySelector(`[${PINNED_ATTR}="true"]`)) {
+    items.forEach((li, idx) => {
+      const pos = idx + 1;
+      if (pos % interval === 0 && !li.nextElementSibling?.classList.contains(WRAP_CLASS)) {
         const id = getNextId(config.placeholderIds);
         if (id) {
-          insertAd(items[0], id, true);
-          newIds.push(parseInt(id, 10));
+          const wrap = document.createElement('div');
+          wrap.className = WRAP_CLASS;
+          wrap.innerHTML = `<div id="${PLACEHOLDER_PREFIX}${id}"></div>`;
+          li.after(wrap);
+          newIdsFound.push(parseInt(id, 10));
         }
       }
+    });
 
-      // Intervals
-      const interval = parseInt(config.intervalPosts, 10) || 5;
-      items.forEach((li, idx) => {
-        if ((idx + 1) % interval === 0 && idx > 0) {
-          if (!li.nextElementSibling || !li.nextElementSibling.classList.contains(WRAP_CLASS)) {
-            const id = getNextId(config.placeholderIds);
-            if (id) {
-              insertAd(li, id, false);
-              newIds.push(parseInt(id, 10));
-            }
-          }
-        }
-      });
+    if (newIdsFound.length > 0) {
+      callEzoic(newIdsFound);
     }
+  }
 
-    // B. Messages (Posts)
-    const postList = getPostList();
-    if (postList && config.enableMessageAds) {
-      const posts = Array.from(postList.querySelectorAll('[component="post"]'));
-      if (config.showFirstMessageAd && posts.length > 0 && !postList.querySelector('.ezoic-msg-first')) {
-        const id = getNextId(config.messagePlaceholderIds);
-        if (id) {
-          insertAd(posts[0], id, false, 'ezoic-msg-first');
-          newIds.push(parseInt(id, 10));
-        }
+  function getNextId(pool) {
+    const ids = pool.split(/[\s,]+/).filter(Boolean);
+    for (const id of ids) {
+      const n = id.trim();
+      if (n && !usedIds.has(n)) {
+        usedIds.add(n);
+        return n;
       }
     }
-
-    if (newIds.length > 0) {
-      callEzoic(newIds);
-    }
-  }
-
-  function insertAd(target, id, isPinned, extraClass = '') {
-    const wrap = document.createElement('div');
-    wrap.className = `${WRAP_CLASS} ezoic-ad-between ${extraClass}`;
-    if (isPinned) wrap.setAttribute(PINNED_ATTR, 'true');
-    wrap.innerHTML = `<div id="${PLACEHOLDER_PREFIX}${id}"></div>`;
-    target.after(wrap);
+    return null;
   }
 
-  // --- INIT ---
   async function init() {
-    try {
-      const res = await fetch('/api/plugins/ezoic-infinite/config');
-      config = await res.json();
-      
-      inject();
+    const res = await fetch('/api/plugins/ezoic-infinite/config');
+    config = await res.json();
+    inject();
 
-      const observer = new MutationObserver((mutations) => {
-        if (mutations.some(m => m.addedNodes.length > 0)) {
-          if (scheduleTimer) clearTimeout(scheduleTimer);
-          scheduleTimer = setTimeout(inject, 300);
-        }
-      });
-      observer.observe(document.body, { childList: true, subtree: true });
-
-      if (window.jQuery) {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', () => {
-          setTimeout(inject, 500);
-        });
-      }
-    } catch (e) {}
+    // Ecoute du scroll infini NodeBB
+    $(window).on('action:infiniteScroll.loaded', () => setTimeout(inject, 100));
   }
 
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
-  else init();
+  $(document).ready(init);
 })();

package/public/style.css

@@ -1,80 +1,28 @@
-/* --- Conteneur principal inséré entre les sujets/messages --- */
+/* Conteneur de pub */
 .nodebb-ezoic-wrap {
-    display: block !important;
-    width: 100% !important;
-    clear: both !important;
-    margin: 20px 0 !important;
-    padding: 0 !important;
-    /* Important : Empêche les éléments de déborder lors du recyclage du DOM */
-    overflow: hidden; 
-    /* Améliore les performances de rendu sur NodeBB 4.x */
-    contain: layout style;
-    /* Assure une visibilité minimale pour que le SDK Ezoic puisse mesurer l'emplacement */
-    min-height: 50px;
+  display: block !important;
+  width: 100% !important;
+  clear: both !important;
+  margin: 25px 0 !important;
+  min-height: 100px; /* Crucial pour que Ezoic détecte l'emplacement */
+  text-align: center;
 }
 
-/* --- Protection spécifique pour la 1ère publicité (Pinned) --- */
+/* Fix spécifique pour le premier sujet */
 .nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
-    /* Réserve une hauteur pour éviter le "Layout Shift" (saut d'écran) au scroll up */
-    min-height: 150px;
-    border-bottom: 1px solid rgba(0,0,0,0.05);
-    margin-top: 5px !important;
+  min-height: 150px;
+  border-bottom: 1px solid rgba(0,0,0,0.05);
+  margin-top: 0 !important;
 }
 
-/* --- Le placeholder Ezoic interne --- */
-[id^="ezoic-pub-ad-placeholder-"] {
-    margin: 0 auto !important;
-    padding: 0 !important;
-    text-align: center;
-    min-height: 1px;
-    line-height: 0;
-}
-
-/* --- Forcer le centrage et la réactivité des pubs Ezoic --- */
-.nodebb-ezoic-wrap span.ezoic-ad,
-.nodebb-ezoic-wrap .ezoic-ad,
-.nodebb-ezoic-wrap iframe {
-    display: block !important;
-    margin: 0 auto !important;
-    max-width: 100% !important;
-}
-
-/* --- Gestion des blocs vides (Anti-Trous blancs) --- */
-/* Si Ezoic ne remplit pas l'emplacement ou si le script le vide, 
-   on réduit l'espace pour ne pas casser le design du forum */
+/* Cache les blocs vides pour éviter les trous blancs */
 .nodebb-ezoic-wrap:empty {
-    height: 0 !important;
-    min-height: 0 !important;
-    margin: 0 !important;
-    border: none !important;
-}
-
-/* --- Adaptation pour les messages (Topic View) --- */
-.ezoic-msg-first {
-    margin-bottom: 35px !important;
-    padding-bottom: 15px !important;
-    border-bottom: 1px solid var(--border-color, #eee);
-}
-
-/* --- Correction pour le mode sombre (NodeBB 4 Harmony) --- */
-[data-theme="dark"] .nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
-    border-bottom-color: rgba(255,255,255,0.1);
-}
-
-/* --- Neutralisation des marges Ezoic sur mobile --- */
-@media (max-width: 767px) {
-    .nodebb-ezoic-wrap {
-        margin: 10px 0 !important;
-        min-height: 30px;
-    }
-    .nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
-        min-height: 100px;
-    }
+  height: 0 !important;
+  min-height: 0 !important;
+  margin: 0 !important;
 }
 
-/* --- Sécurité Anti-Sticky --- 
-   Ezoic injecte parfois du 'position: sticky' qui fait "flotter" les pubs 
-   de manière erratique lors du scroll infini. On le neutralise ici. */
+/* Évite que les pubs "volent" au scroll */
 .nodebb-ezoic-wrap .ezads-sticky-intradiv {
-    position: static !important;
+  position: static !important;
 }