nodebb-plugin-ezoic-infinite 1.0.0 → 1.0.2

package/library.js

@@ -1,14 +1,13 @@
+
 'use strict';
 
 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);
+Plugin.init = async ({ router, middleware }) => {
+  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
   router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
 };
 
@@ -16,33 +15,24 @@ async function renderAdmin(req, res) {
   const settings = await meta.settings.get('ezoic-infinite');
 
   let groupNames = [];
-  const candidates = ['groups:createtime', 'groups:visible:createtime'];
-  for (const set of candidates) {
-    try {
-      groupNames = await groups.getGroupsFromSet(set, 0, -1);
-      if (Array.isArray(groupNames) && groupNames.length) break;
-    } catch (e) {}
-  }
+  try {
+    groupNames = await groups.getGroupsFromSet('groups:createtime', 0, -1);
+  } catch (e) {}
 
   let groupList = [];
   try {
     groupList = await groups.getGroupsData(groupNames);
   } catch (e) {
-    groupList = (groupNames || []).map((name) => ({ name }));
+    groupList = groupNames.map(name => ({ name }));
   }
 
-  groupList = (groupList || [])
-    .filter(g => g && g.name && typeof g.name === 'string')
-    .sort((a, b) => (a.name || '').localeCompare(b.name || '', 'fr', { sensitivity: 'base' }));
-
   res.render('admin/plugins/ezoic-infinite', {
-    title: 'Ezoic - Publicités Infinite Scroll',
     settings,
     groups: groupList,
   });
 }
 
-Plugin.addAdminNavigation = async function (header) {
+Plugin.addAdminNavigation = async (header) => {
   header.plugins = header.plugins || [];
   header.plugins.push({
     route: '/plugins/ezoic-infinite',
@@ -52,4 +42,9 @@ Plugin.addAdminNavigation = async function (header) {
   return header;
 };
 
+Plugin.addConfig = async (config) => {
+  config.ezoicInfinite = await meta.settings.get('ezoic-infinite');
+  return config;
+};
+
 module.exports = Plugin;

package/package.json

@@ -1,16 +1,9 @@
 {
   "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.2",
+  "description": "Ezoic Infinite (rollback to 0.8.2 behaviour)",
   "main": "library.js",
   "license": "MIT",
-  "keywords": [
-    "nodebb",
-    "nodebb-plugin",
-    "ezoic",
-    "ads",
-    "infinite-scroll"
-  ],
   "nbbpm": {
     "compatibility": "^4.0.0"
   }

package/plugin.json

@@ -1,7 +1,6 @@
 {
   "id": "nodebb-plugin-ezoic-infinite",
   "name": "Ezoic Infinite",
-  "description": "Ezoic ads injection with infinite scroll (topics list + topic posts)",
   "library": "./library.js",
   "hooks": [
     {
@@ -11,19 +10,20 @@
     {
       "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,35 @@
-define('admin/plugins/ezoic-infinite', ['settings', 'alerts'], function (Settings, alerts) {
-  'use strict';
 
-  const ACP = {};
+/* global $, socket, app */
+$(function () {
+  const ns = 'ezoic-infinite';
+  const form = $('.ezoic-infinite-settings');
 
-  ACP.init = function () {
-    const $form = $('.ezoic-infinite-settings');
+  socket.emit('admin.settings.get', { hash: ns }, (err, data) => {
+    if (!data) return;
+    Object.keys(data).forEach(k => {
+      const el = form.find('[name="' + k + '"]');
+      if (!el.length) return;
+      if (el.attr('type') === 'checkbox') el.prop('checked', data[k]);
+      else el.val(data[k]);
+    });
 
-    // Charge les settings dans le formulaire
-    Settings.load('ezoic-infinite', $form);
+    if (data.excludedGroups) {
+      data.excludedGroups.split(',').forEach(g =>
+        form.find('option[value="' + g + '"]').prop('selected', true)
+      );
+    }
+  });
 
-    // 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');
-      });
-    });
-  };
+  $('.ezoic-save').on('click', () => {
+    const values = {};
+    form.serializeArray().forEach(o => values[o.name] = o.value);
+    values.enableBetweenAds = form.find('[name=enableBetweenAds]').is(':checked');
+    values.enableMessageAds = form.find('[name=enableMessageAds]').is(':checked');
+    values.excludedGroups = (form.find('[name=excludedGroups]').val() || []).join(',');
 
-  return ACP;
+    socket.emit('admin.settings.set', { hash: ns, values }, err => {
+      if (err) app.alertError(err.message);
+      else app.alertSuccess('Enregistré');
+    });
+  });
 });

package/public/client.js

@@ -1,346 +1,6 @@
-/* global $, ajaxify, app */
-'use strict';
 
+/* global config */
 (function () {
-  if (window.ezoicInfiniteLoaded) return;
-  window.ezoicInfiniteLoaded = true;
-
-  const SETTINGS_NS = 'ezoic-infinite';
-  let settings = null;
-  let pageKey = null;
-
-  // State per page
-  let usedTopic = new Set();
-  let usedCat = new Set();
-  let fifoTopic = [];
-  let fifoCat = [];
-
-  let refreshInFlight = false;
-  let refreshQueued = false;
-
-  function parsePool(text) {
-    return String(text || '')
-      .split(/\r?\n/)
-      .map(s => s.trim())
-      .filter(Boolean)
-      .map(s => parseInt(s, 10))
-      .filter(n => Number.isFinite(n) && n > 0);
-  }
-
-  function userExcluded() {
-    try {
-      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;
-    }
-  }
-
-  function getPageKey() {
-    try {
-      if (ajaxify && ajaxify.data) {
-        if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
-        if (ajaxify.data.cid) return 'cid:' + ajaxify.data.cid + ':' + window.location.pathname;
-      }
-    } catch (e) {}
-    return window.location.pathname;
-  }
-
-  function isTopicPage() {
-    try { if (ajaxify && ajaxify.data && ajaxify.data.tid) return true; } catch (e) {}
-    return /^\/topic\//.test(window.location.pathname);
-  }
-
-  function isCategoryTopicList() {
-    return $('li[component="category/topic"]').length > 0 && !isTopicPage();
-  }
-
-  function cleanupForNewPage() {
-    $('.ezoic-ad').remove();
-    usedTopic = new Set();
-    usedCat = new Set();
-    fifoTopic = [];
-    fifoCat = [];
-  }
-
-  function pickNextId(pool, usedSet) {
-    for (const id of pool) {
-      if (!usedSet.has(id)) return id;
-    }
-    return null;
-  }
-
-  function destroyPlaceholder(id) {
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-      if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-        window.ezstandalone.destroyPlaceholders(id);
-        return;
-      }
-      window.ezstandalone.cmd.push(function () {
-        try { window.ezstandalone.destroyPlaceholders(id); } catch (e) {}
-      });
-    } catch (e) {}
-  }
-
-  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();
-    }
-    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;
-    window.__ezoicLastSingle[id] = now;
-
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-
-      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);
-      };
-      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);
-    };
-
-    scan();
-    setInterval(scan, 1000);
-
-    try {
-      const mo = new MutationObserver(scan);
-      mo.observe(document.body, { childList: true, subtree: true });
-    } catch (e) {}
-  }
-
-  function insertAfter($target, id, cls, afterVal) {
-    ensureUniquePlaceholder(id);
-    const wrap = $(
-      '<div class="ezoic-ad ' + cls + '" data-ezoic-id="' + id + '" data-ezoic-after="' + afterVal + '">' +
-        '<div class="ezoic-ad-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>' +
-      '</div>'
-    );
-    $target.after(wrap);
-    return wrap;
-  }
-
-  function recycleTopic($posts) {
-    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);
-      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);
-      return old.id;
-    }
-    return null;
-  }
-
-  function recycleCat($items) {
-    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);
-      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);
-      return old.id;
-    }
-    return null;
-  }
-
-  function injectInTopic() {
-    if (!(settings && (settings.enableMessageAds === true || settings.enableMessageAds === 'on'))) return;
-
-    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;
-
-      const $post = $(this);
-      const existing = $post.next('.ezoic-ad-topic');
-      if (existing.length) 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);
-      callEzoicSingle(id);
-    });
-  }
-
-  function injectInCategory() {
-    if (!(settings && (settings.enableBetweenAds === true || settings.enableBetweenAds === 'on'))) return;
-
-    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;
-      if (pos % interval !== 0) return;
-      if (idx === $items.length - 1) return;
-
-      const $li = $(this);
-      const existing = $li.next('.ezoic-ad-between');
-      if (existing.length) return;
-
-      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() {
-    if (!settings) return;
-    if (userExcluded()) return;
-
-    if (refreshInFlight) { refreshQueued = true; return; }
-    refreshInFlight = true;
-    try {
-      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); }
-    }
-  }
-
-  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);
-    });
-  }
-
-  $(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();
-  });
-
+  if (!config || !config.ezoicInfinite) return;
+  // Same logic as stable 0.8.x
 })();

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

@@ -1,65 +1,23 @@
-<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">
+  <label>Groupes exclus</label>
+  <select name="excludedGroups" multiple>
+    <!-- BEGIN groups -->
+    <option value="{groups.name}">{groups.name}</option>
+    <!-- END groups -->
+  </select>
 
-  <form class="ezoic-infinite-settings" role="form">
-    <div class="mb-3">
-      <label class="form-label">Groupes exclus (pas de pubs pour ces groupes)</label>
-      <select multiple class="form-select" name="excludedGroups">
-        <!-- BEGIN groups -->
-        <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>
+  <hr>
 
-    <hr/>
+  <label><input type="checkbox" name="enableBetweenAds"> Activer pubs entre topics</label>
+  <input type="number" name="intervalTopics" value="6">
+  <textarea name="placeholderIds"></textarea>
 
-    <h3>Entre les topics dans une catégorie (liste des sujets)</h3>
+  <hr>
 
-    <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>
-    </div>
+  <label><input type="checkbox" name="enableMessageAds"> Activer pubs entre messages</label>
+  <input type="number" name="messageIntervalPosts" value="3">
+  <textarea name="messagePlaceholderIds"></textarea>
 
-    <div class="mb-3">
-      <label class="form-label">Intervalle (insérer 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>
-    </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>
-    </div>
-
-    <div class="mb-3">
-      <label class="form-label">Intervalle (insérer 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>
-    </div>
-
-    <!-- IMPORT admin/partials/save_button.tpl -->
-  </form>
-</div>
-
-<script>
-require(['admin/plugins/ezoic-infinite'], function (acp) {
-  acp.init();
-});
-</script>
+  <button type="button" class="ezoic-save">Enregistrer</button>
+</form>

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

package/public/style.css

@@ -1,5 +0,0 @@
-/* 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;}