nodebb-plugin-ezoic-infinite 1.0.0 → 1.0.1

package/library.js

@@ -2,13 +2,11 @@
 
 const meta = require.main.require('./src/meta');
 const groups = require.main.require('./src/groups');
-const routeHelpers = require.main.require('./src/routes/helpers');
 
 const Plugin = {};
 
 Plugin.init = async function ({ router, middleware }) {
-  // Official helper ensures correct ACP behavior under ajaxify
-  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/ezoic-infinite', middleware, [], renderAdmin);
+  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
   router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
 };
 
@@ -32,7 +30,7 @@ async function renderAdmin(req, res) {
   }
 
   groupList = (groupList || [])
-    .filter(g => g && g.name && typeof g.name === 'string')
+    .filter(g => g && g.name)
     .sort((a, b) => (a.name || '').localeCompare(b.name || '', 'fr', { sensitivity: 'base' }));
 
   res.render('admin/plugins/ezoic-infinite', {
@@ -52,4 +50,11 @@ Plugin.addAdminNavigation = async function (header) {
   return header;
 };
 
+// Expose settings to client without any admin API calls
+Plugin.addConfig = async function (config) {
+  const settings = await meta.settings.get('ezoic-infinite');
+  config.ezoicInfinite = settings || {};
+  return config;
+};
+
 module.exports = Plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.0.0",
-  "description": "Injection de publicités Ezoic entre les topics et entre les messages avec infinite scroll (NodeBB 4.x).",
+  "version": "1.0.1",
+  "description": "Ezoic ads injection for NodeBB 4.x (rebased to 0.8.3 style).",
   "main": "library.js",
   "license": "MIT",
   "keywords": [

package/plugin.json

@@ -11,19 +11,23 @@
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminNavigation"
+    },
+    {
+      "hook": "filter:config.get",
+      "method": "addConfig"
     }
   ],
   "staticDirs": {
     "public": "public"
   },
+  "acpScripts": [
+    "public/admin.js"
+  ],
   "scripts": [
     "public/client.js"
   ],
   "css": [
     "public/style.css"
   ],
-  "templates": "public/templates",
-  "modules": {
-    "../admin/plugins/ezoic-infinite.js": "public/admin.js"
-  }
+  "templates": "public/templates"
 }

package/public/admin.js

@@ -1,27 +1,52 @@
-define('admin/plugins/ezoic-infinite', ['settings', 'alerts'], function (Settings, alerts) {
-  'use strict';
-
-  const ACP = {};
-
-  ACP.init = function () {
-    const $form = $('.ezoic-infinite-settings');
-
-    // Charge les settings dans le formulaire
-    Settings.load('ezoic-infinite', $form);
-
-    // Le save_button.tpl déclenche un event "click" sur .save
-    // On écoute l'event standard Settings.
-    $form.on('click', '.save', function (e) {
-      e.preventDefault();
-      Settings.save('ezoic-infinite', $form, function (err) {
-        if (err) {
-          alerts.error(err.message || err);
-          return;
-        }
-        alerts.success('Paramètres enregistrés');
+/* global $, app, socket */
+'use strict';
+
+$(document).ready(function () {
+  const namespace = 'ezoic-infinite';
+
+  function load() {
+    socket.emit('admin.settings.get', { hash: namespace }, function (err, data) {
+      if (err) return;
+      data = data || {};
+
+      const form = $('.ezoic-infinite-settings');
+
+      form.find('[name="enableBetweenAds"]').prop('checked', data.enableBetweenAds === true || data.enableBetweenAds === 'on');
+      form.find('[name="intervalTopics"]').val(parseInt(data.intervalTopics, 10) || 6);
+      form.find('[name="placeholderIds"]').val(data.placeholderIds || '');
+
+      form.find('[name="enableMessageAds"]').prop('checked', data.enableMessageAds === true || data.enableMessageAds === 'on');
+      form.find('[name="messageIntervalPosts"]').val(parseInt(data.messageIntervalPosts, 10) || 3);
+      form.find('[name="messagePlaceholderIds"]').val(data.messagePlaceholderIds || '');
+
+      // Do NOT clear groups; server rendered
+      const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
+      form.find('[name="excludedGroups"] option').each(function () {
+        $(this).prop('selected', selected.includes($(this).val()));
       });
     });
-  };
+  }
+
+  function save() {
+    const form = $('.ezoic-infinite-settings');
+    const payload = {
+      enableBetweenAds: form.find('[name="enableBetweenAds"]').is(':checked'),
+      intervalTopics: parseInt(form.find('[name="intervalTopics"]').val(), 10) || 6,
+      placeholderIds: form.find('[name="placeholderIds"]').val() || '',
+
+      enableMessageAds: form.find('[name="enableMessageAds"]').is(':checked'),
+      messageIntervalPosts: parseInt(form.find('[name="messageIntervalPosts"]').val(), 10) || 3,
+      messagePlaceholderIds: form.find('[name="messagePlaceholderIds"]').val() || '',
+
+      excludedGroups: (form.find('[name="excludedGroups"]').val() || []).join(','),
+    };
+
+    socket.emit('admin.settings.set', { hash: namespace, values: payload }, function (err) {
+      if (err) { app.alertError(err.message || err); return; }
+      app.alertSuccess('Paramètres enregistrés');
+    });
+  }
 
-  return ACP;
+  $('.ezoic-infinite-save').on('click', save);
+  load();
 });

package/public/client.js

@@ -1,15 +1,13 @@
-/* global $, ajaxify, app */
+/* global $, ajaxify, app, config */
 'use strict';
 
 (function () {
   if (window.ezoicInfiniteLoaded) return;
   window.ezoicInfiniteLoaded = true;
 
-  const SETTINGS_NS = 'ezoic-infinite';
-  let settings = null;
+  let settings = (window.config && window.config.ezoicInfinite) ? window.config.ezoicInfinite : {};
   let pageKey = null;
 
-  // State per page
   let usedTopic = new Set();
   let usedCat = new Set();
   let fifoTopic = [];
@@ -18,6 +16,10 @@
   let refreshInFlight = false;
   let refreshQueued = false;
 
+  function reloadSettingsFromConfig() {
+    settings = (window.config && window.config.ezoicInfinite) ? window.config.ezoicInfinite : (settings || {});
+  }
+
   function parsePool(text) {
     return String(text || '')
       .split(/\r?\n/)
@@ -29,15 +31,13 @@
 
   function userExcluded() {
     try {
-      const raw = (settings && settings.excludedGroups) ? String(settings.excludedGroups) : '';
+      const raw = settings && settings.excludedGroups ? String(settings.excludedGroups) : '';
       if (!raw) return false;
       const excluded = raw.split(',').map(s => s.trim()).filter(Boolean);
       if (!excluded.length) return false;
       const myGroups = (app.user && app.user.groups) ? app.user.groups : [];
       return excluded.some(g => myGroups.includes(g));
-    } catch (e) {
-      return false;
-    }
+    } catch (e) { return false; }
   }
 
   function getPageKey() {
@@ -61,16 +61,12 @@
 
   function cleanupForNewPage() {
     $('.ezoic-ad').remove();
-    usedTopic = new Set();
-    usedCat = new Set();
-    fifoTopic = [];
-    fifoCat = [];
+    usedTopic = new Set(); usedCat = new Set();
+    fifoTopic = []; fifoCat = [];
   }
 
   function pickNextId(pool, usedSet) {
-    for (const id of pool) {
-      if (!usedSet.has(id)) return id;
-    }
+    for (const id of pool) if (!usedSet.has(id)) return id;
     return null;
   }
 
@@ -91,74 +87,49 @@
   function ensureUniquePlaceholder(id) {
     const existing = document.getElementById('ezoic-pub-ad-placeholder-' + id);
     if (!existing) return;
-
     const wrap = existing.closest('.ezoic-ad');
-    if (wrap) {
-      try { $(wrap).remove(); } catch (e) { wrap.remove(); }
-    } else {
-      existing.remove();
-    }
+    if (wrap) $(wrap).remove(); else existing.remove();
     destroyPlaceholder(id);
   }
 
   function callEzoicSingle(id) {
     if (!id) return;
-
     const now = Date.now();
     window.__ezoicLastSingle = window.__ezoicLastSingle || {};
-    const last = window.__ezoicLastSingle[id] || 0;
-    if (now - last < 1200) return;
+    if (now - (window.__ezoicLastSingle[id] || 0) < 1200) return;
     window.__ezoicLastSingle[id] = now;
 
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+    window.ezstandalone = window.ezstandalone || {};
+    window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+    const run = function () {
+      if (typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds(id);
+        return true;
+      }
+      return false;
+    };
+    window.ezstandalone.cmd.push(function () { try { run(); } catch (e) {} });
 
-      const run = function () {
-        try {
-          if (typeof window.ezstandalone.showAds === 'function') {
-            window.ezstandalone.showAds(id);
-            return true;
-          }
-        } catch (e) {}
-        return false;
-      };
-
-      window.ezstandalone.cmd.push(function () { run(); });
-
-      let tries = 0;
-      const tick = function () {
-        tries++;
-        if (run() || tries >= 8) return;
-        setTimeout(tick, 800);
-      };
+    let tries = 0;
+    (function tick() {
+      tries++;
+      try { if (run() || tries >= 8) return; } catch (e) {}
       setTimeout(tick, 800);
-    } catch (e) {}
+    })();
   }
 
   function setupAutoHeightOnce() {
     if (window.__ezoicAutoHeight) return;
     window.__ezoicAutoHeight = true;
-
-    const mark = function (wrap) {
-      if (!wrap) return;
-      const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
-      if (ph && ph.children && ph.children.length) {
-        wrap.classList.add('ezoic-filled');
-      }
-    };
-
     const scan = function () {
-      document.querySelectorAll('.ezoic-ad').forEach(mark);
+      document.querySelectorAll('.ezoic-ad').forEach((wrap) => {
+        const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
+        if (ph && ph.children && ph.children.length) wrap.classList.add('ezoic-filled');
+      });
     };
-
     scan();
     setInterval(scan, 1000);
-
-    try {
-      const mo = new MutationObserver(scan);
-      mo.observe(document.body, { childList: true, subtree: true });
-    } catch (e) {}
+    try { new MutationObserver(scan).observe(document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
   function insertAfter($target, id, cls, afterVal) {
@@ -169,52 +140,27 @@
       '</div>'
     );
     $target.after(wrap);
-    return wrap;
   }
 
   function recycleTopic($posts) {
-    fifoTopic.sort((a, b) => a.afterNo - b.afterNo);
+    fifoTopic.sort((a,b)=>a.afterNo-b.afterNo);
     while (fifoTopic.length) {
-      const old = fifoTopic.shift();
-      const sel = '.ezoic-ad-topic[data-ezoic-id="' + old.id + '"][data-ezoic-after="' + old.afterNo + '"]';
-      const $el = $(sel);
+      const old=fifoTopic.shift();
+      const $el=$('.ezoic-ad-topic[data-ezoic-id="'+old.id+'"][data-ezoic-after="'+old.afterNo+'"]');
       if (!$el.length) continue;
-
-      try {
-        const $last = $posts.last();
-        if ($last.length && $el.prev().is($last)) {
-          fifoTopic.push(old);
-          return null;
-        }
-      } catch (e) {}
-
-      $el.remove();
-      usedTopic.delete(old.id);
-      destroyPlaceholder(old.id);
+      $el.remove(); usedTopic.delete(old.id); destroyPlaceholder(old.id);
       return old.id;
     }
     return null;
   }
 
   function recycleCat($items) {
-    fifoCat.sort((a, b) => a.afterPos - b.afterPos);
+    fifoCat.sort((a,b)=>a.afterPos-b.afterPos);
     while (fifoCat.length) {
-      const old = fifoCat.shift();
-      const sel = '.ezoic-ad-between[data-ezoic-id="' + old.id + '"][data-ezoic-after="' + old.afterPos + '"]';
-      const $el = $(sel);
+      const old=fifoCat.shift();
+      const $el=$('.ezoic-ad-between[data-ezoic-id="'+old.id+'"][data-ezoic-after="'+old.afterPos+'"]');
       if (!$el.length) continue;
-
-      try {
-        const $last = $items.last();
-        if ($last.length && $el.prev().is($last)) {
-          fifoCat.push(old);
-          return null;
-        }
-      } catch (e) {}
-
-      $el.remove();
-      usedCat.delete(old.id);
-      destroyPlaceholder(old.id);
+      $el.remove(); usedCat.delete(old.id); destroyPlaceholder(old.id);
       return old.id;
     }
     return null;
@@ -222,125 +168,82 @@
 
   function injectInTopic() {
     if (!(settings && (settings.enableMessageAds === true || settings.enableMessageAds === 'on'))) return;
-
-    const interval = parseInt(settings.messageIntervalPosts, 10) || 3;
+    const interval = parseInt(settings.messageIntervalPosts,10) || 3;
     const pool = parsePool(settings.messagePlaceholderIds);
     if (!pool.length) return;
 
     const $posts = $('[component="post"][data-pid]');
     if (!$posts.length) return;
 
-    $posts.each(function (idx) {
-      const postNo = idx + 1;
-      if (postNo % interval !== 0) return;
-      if (idx === $posts.length - 1) return;
+    $posts.each(function(idx){
+      const no=idx+1;
+      if (no % interval !== 0) return;
+      if (idx === $posts.length-1) return;
 
-      const $post = $(this);
-      const existing = $post.next('.ezoic-ad-topic');
-      if (existing.length) return;
+      const $post=$(this);
+      if ($post.next('.ezoic-ad-topic').length) return;
 
-      let id = pickNextId(pool, usedTopic);
-      if (!id) {
-        id = recycleTopic($posts);
-        if (!id) return;
-      }
+      let id=pickNextId(pool, usedTopic);
+      if (!id) { id=recycleTopic($posts); if (!id) return; }
 
-      usedTopic.add(id);
-      fifoTopic.push({ id, afterNo: postNo });
-
-      insertAfter($post, id, 'ezoic-ad-topic', postNo);
+      usedTopic.add(id); fifoTopic.push({id, afterNo:no});
+      insertAfter($post, id, 'ezoic-ad-topic', no);
       callEzoicSingle(id);
     });
   }
 
   function injectInCategory() {
     if (!(settings && (settings.enableBetweenAds === true || settings.enableBetweenAds === 'on'))) return;
-
-    const interval = parseInt(settings.intervalTopics, 10) || 6;
+    const interval = parseInt(settings.intervalTopics,10) || 6;
     const pool = parsePool(settings.placeholderIds);
     if (!pool.length) return;
 
     const $items = $('li[component="category/topic"]');
     if (!$items.length) return;
 
-    $items.each(function (idx) {
-      const pos = idx + 1;
+    $items.each(function(idx){
+      const pos=idx+1;
       if (pos % interval !== 0) return;
-      if (idx === $items.length - 1) return;
+      if (idx === $items.length-1) return;
 
-      const $li = $(this);
-      const existing = $li.next('.ezoic-ad-between');
-      if (existing.length) return;
+      const $li=$(this);
+      if ($li.next('.ezoic-ad-between').length) return;
 
-      let id = pickNextId(pool, usedCat);
-      if (!id) {
-        id = recycleCat($items);
-        if (!id) return;
-      }
-
-      usedCat.add(id);
-      fifoCat.push({ id, afterPos: pos });
+      let id=pickNextId(pool, usedCat);
+      if (!id) { id=recycleCat($items); if (!id) return; }
 
+      usedCat.add(id); fifoCat.push({id, afterPos:pos});
       insertAfter($li, id, 'ezoic-ad-between', pos);
       callEzoicSingle(id);
     });
   }
 
   function refresh() {
+    reloadSettingsFromConfig();
     if (!settings) return;
     if (userExcluded()) return;
 
     if (refreshInFlight) { refreshQueued = true; return; }
     refreshInFlight = true;
     try {
-      const key = getPageKey();
-      if (pageKey !== key) {
-        pageKey = key;
-        cleanupForNewPage();
-      }
-
+      const key=getPageKey();
+      if (pageKey !== key) { pageKey=key; cleanupForNewPage(); }
       setupAutoHeightOnce();
-
       if (isTopicPage()) injectInTopic();
       else if (isCategoryTopicList()) injectInCategory();
     } finally {
-      refreshInFlight = false;
-      if (refreshQueued) { refreshQueued = false; setTimeout(refresh, 50); }
+      refreshInFlight=false;
+      if (refreshQueued) { refreshQueued=false; setTimeout(refresh, 50); }
     }
   }
 
-  function loadSettings(cb) {
-    // Use public settings endpoint to avoid any admin socket calls on frontend
-    const base = (window.config && window.config.relative_path) ? window.config.relative_path : '';
-    $.get(base + '/api/admin/settings/' + SETTINGS_NS).done(function (data) {
-      // If access denied, settings stays null; plugin won't inject
-      settings = (data && data.settings) ? data.settings : data;
-      cb && cb();
-    }).fail(function () {
-      // Fallback: try window.ajaxify data if available
-      settings = settings || {};
-      cb && cb();
-    });
-  }
-
-  function boot() {
-    loadSettings(function () {
-      refresh();
-      setTimeout(refresh, 1200);
-    });
-  }
+  function boot() { refresh(); setTimeout(refresh, 1200); }
 
   $(document).ready(boot);
   $(window).on('action:ajaxify.end', boot);
-
-  $(window).on('action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', function () {
-    refresh();
-    setTimeout(refresh, 600);
-  });
-
-  $(window).on('action:ajaxify.start', function () {
-    pageKey = null;
-    cleanupForNewPage();
+  $(window).on('action:posts.loaded action:topics.loaded action:topic.loaded action:category.loaded', function(){
+    refresh(); setTimeout(refresh, 600);
   });
+  $(window).on('action:ajaxify.start', function(){ pageKey=null; cleanupForNewPage(); });
 
 })();

package/public/style.css

@@ -1,5 +1,3 @@
-/* Le conteneur est caché tant qu'Ezoic n'a pas injecté de contenu */
 .ezoic-ad{min-height:0 !important;height:auto !important;padding:0 !important;margin:0.5rem 0;}
 .ezoic-ad:not(.ezoic-filled){display:none !important;}
 .ezoic-ad .ezoic-ad-inner{padding:0;margin:0;}
-.ezoic-ad .ezoic-ad-inner > div{margin:0;padding:0;}

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -1,11 +1,7 @@
 <div class="acp-page-container">
   <h1 class="mb-3">Ezoic - Publicités Infinite Scroll</h1>
 
-  <div class="alert alert-info">
-    Format placeholder&nbsp;: <code>&lt;div id="ezoic-pub-ad-placeholder-XXX"&gt;&lt;/div&gt;</code>
-  </div>
-
-  <form class="ezoic-infinite-settings" role="form">
+  <form role="form" class="ezoic-infinite-settings">
     <div class="mb-3">
       <label class="form-label">Groupes exclus (pas de pubs pour ces groupes)</label>
       <select multiple class="form-select" name="excludedGroups">
@@ -13,53 +9,41 @@
         <option value="{groups.name}">{groups.name}</option>
         <!-- END groups -->
       </select>
-      <div class="form-text">Maintenez Ctrl/Cmd pour sélectionner plusieurs groupes. Liste triée par ordre alphabétique.</div>
+      <div class="form-text">Liste triée par ordre alphabétique.</div>
     </div>
 
     <hr/>
 
     <h3>Entre les topics dans une catégorie (liste des sujets)</h3>
-
     <div class="form-check form-switch mb-2">
       <input class="form-check-input" type="checkbox" name="enableBetweenAds">
-      <label class="form-check-label">Activer les pubs entre les topics</label>
+      <label class="form-check-label">Activer</label>
     </div>
-
     <div class="mb-3">
-      <label class="form-label">Intervalle (insérer après chaque N topics)</label>
+      <label class="form-label">Intervalle (après chaque N topics)</label>
       <input type="number" class="form-control" name="intervalTopics" min="1" step="1">
     </div>
-
     <div class="mb-3">
-      <label class="form-label">Pool d'IDs de placeholder (un par ligne)</label>
-      <textarea class="form-control" name="placeholderIds" rows="6"></textarea>
+      <label class="form-label">Pool d'IDs placeholder (un par ligne)</label>
+      <textarea class="form-control" name="placeholderIds" rows="5"></textarea>
     </div>
 
     <hr/>
 
     <h3>Dans les topics (entre les messages)</h3>
-
     <div class="form-check form-switch mb-2">
       <input class="form-check-input" type="checkbox" name="enableMessageAds">
-      <label class="form-check-label">Activer les pubs entre les messages</label>
+      <label class="form-check-label">Activer</label>
     </div>
-
     <div class="mb-3">
-      <label class="form-label">Intervalle (insérer après chaque N messages)</label>
+      <label class="form-label">Intervalle (après chaque N messages)</label>
       <input type="number" class="form-control" name="messageIntervalPosts" min="1" step="1">
     </div>
-
     <div class="mb-3">
-      <label class="form-label">Pool d'IDs de placeholder pour messages (un par ligne)</label>
-      <textarea class="form-control" name="messagePlaceholderIds" rows="6"></textarea>
+      <label class="form-label">Pool d'IDs placeholder messages (un par ligne)</label>
+      <textarea class="form-control" name="messagePlaceholderIds" rows="5"></textarea>
     </div>
 
-    <!-- IMPORT admin/partials/save_button.tpl -->
+    <button type="button" class="btn btn-primary ezoic-infinite-save">Enregistrer</button>
   </form>
 </div>
-
-<script>
-require(['admin/plugins/ezoic-infinite'], function (acp) {
-  acp.init();
-});
-</script>

package/README.md

@@ -1,12 +0,0 @@
-nodebb-plugin-ezoic-infinite v1.0.0
-==================================
-
-ACP (NodeBB 4.x official pattern):
-- routeHelpers.setupAdminPageRoute
-- Settings framework (Settings.load/save)
-- server-rendered groups (no dynamic fetch)
-
-Frontend:
-- inject ads between topics list + between posts in topic
-- showAds called one placeholder id at a time (no batch)
-- FIFO recycling pool on same page