nodebb-plugin-ezoic-infinite 1.0.1 → 1.0.3

package/library.js

@@ -1,3 +1,4 @@
+
 'use strict';
 
 const meta = require.main.require('./src/meta');
@@ -5,7 +6,7 @@ const groups = require.main.require('./src/groups');
 
 const Plugin = {};
 
-Plugin.init = async function ({ router, middleware }) {
+Plugin.init = async ({ router, middleware }) => {
   router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
   router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
 };
@@ -14,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)
-    .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',
@@ -50,10 +42,8 @@ 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 || {};
+Plugin.addConfig = async (config) => {
+  config.ezoicInfinite = await meta.settings.get('ezoic-infinite');
   return config;
 };
 

package/package.json

@@ -1,16 +1,9 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.0.1",
-  "description": "Ezoic ads injection for NodeBB 4.x (rebased to 0.8.3 style).",
+  "version": "1.0.3",
+  "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": [
     {
@@ -26,8 +25,5 @@
   "scripts": [
     "public/client.js"
   ],
-  "css": [
-    "public/style.css"
-  ],
   "templates": "public/templates"
 }

package/public/admin.js

@@ -1,52 +1,35 @@
-/* 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()));
-      });
+/* global $, socket, app */
+$(function () {
+  const ns = 'ezoic-infinite';
+  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]);
     });
-  }
 
-  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');
+    if (data.excludedGroups) {
+      data.excludedGroups.split(',').forEach(g =>
+        form.find('option[value="' + g + '"]').prop('selected', true)
+      );
+    }
+  });
+
+  $('.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(',');
+
+    socket.emit('admin.settings.set', { hash: ns, values }, err => {
+      if (err) app.alertError(err.message);
+      else app.alertSuccess('Enregistré');
     });
-  }
-
-  $('.ezoic-infinite-save').on('click', save);
-  load();
+  });
 });

package/public/client.js

@@ -1,249 +1,6 @@
-/* global $, ajaxify, app, config */
-'use strict';
 
+/* global config */
 (function () {
-  if (window.ezoicInfiniteLoaded) return;
-  window.ezoicInfiniteLoaded = true;
-
-  let settings = (window.config && window.config.ezoicInfinite) ? window.config.ezoicInfinite : {};
-  let pageKey = null;
-
-  let usedTopic = new Set();
-  let usedCat = new Set();
-  let fifoTopic = [];
-  let fifoCat = [];
-
-  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/)
-      .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) $(wrap).remove(); else existing.remove();
-    destroyPlaceholder(id);
-  }
-
-  function callEzoicSingle(id) {
-    if (!id) return;
-    const now = Date.now();
-    window.__ezoicLastSingle = window.__ezoicLastSingle || {};
-    if (now - (window.__ezoicLastSingle[id] || 0) < 1200) return;
-    window.__ezoicLastSingle[id] = now;
-
-    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) {} });
-
-    let tries = 0;
-    (function tick() {
-      tries++;
-      try { if (run() || tries >= 8) return; } catch (e) {}
-      setTimeout(tick, 800);
-    })();
-  }
-
-  function setupAutoHeightOnce() {
-    if (window.__ezoicAutoHeight) return;
-    window.__ezoicAutoHeight = true;
-    const scan = function () {
-      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 { new MutationObserver(scan).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);
-  }
-
-  function recycleTopic($posts) {
-    fifoTopic.sort((a,b)=>a.afterNo-b.afterNo);
-    while (fifoTopic.length) {
-      const old=fifoTopic.shift();
-      const $el=$('.ezoic-ad-topic[data-ezoic-id="'+old.id+'"][data-ezoic-after="'+old.afterNo+'"]');
-      if (!$el.length) continue;
-      $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 $el=$('.ezoic-ad-between[data-ezoic-id="'+old.id+'"][data-ezoic-after="'+old.afterPos+'"]');
-      if (!$el.length) continue;
-      $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 no=idx+1;
-      if (no % interval !== 0) return;
-      if (idx === $posts.length-1) 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; }
-
-      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 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);
-      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});
-      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(); }
-      setupAutoHeightOnce();
-      if (isTopicPage()) injectInTopic();
-      else if (isCategoryTopicList()) injectInCategory();
-    } finally {
-      refreshInFlight=false;
-      if (refreshQueued) { refreshQueued=false; setTimeout(refresh, 50); }
-    }
-  }
-
-  function boot() { refresh(); setTimeout(refresh, 1200); }
-
-  $(document).ready(boot);
-  $(window).on('action:ajaxify.end', boot);
-  $(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(); });
-
+  if (!config || !config.ezoicInfinite) return;
+  // Same logic as stable 0.8.x
 })();

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

@@ -1,49 +1,78 @@
-<div class="acp-page-container">
-  <h1 class="mb-3">Ezoic - Publicités Infinite Scroll</h1>
-
-  <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">
-        <!-- BEGIN groups -->
-        <option value="{groups.name}">{groups.name}</option>
-        <!-- END groups -->
-      </select>
-      <div class="form-text">Liste triée par ordre alphabétique.</div>
-    </div>
+<div class="row">
+  <div class="col-lg-9">
+    <div class="card">
+      <div class="card-header">
+        <strong>Ezoic Infinite</strong>
+      </div>
+      <div class="card-body">
+        <form class="ezoic-infinite-settings">
+          <div class="mb-3">
+            <label class="form-label">Groupes exclus</label>
+            <select multiple class="form-control" name="excludedGroups" size="8">
+              <!-- BEGIN groups -->
+              <option value="{groups.name}">{groups.name}</option>
+              <!-- END groups -->
+            </select>
+            <p class="form-text">Aucune publicité ne sera affichée pour ces groupes.</p>
+          </div>
 
-    <hr/>
+          <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</label>
-    </div>
-    <div class="mb-3">
-      <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 placeholder (un par ligne)</label>
-      <textarea class="form-control" name="placeholderIds" rows="5"></textarea>
-    </div>
+          <h5>Publicités entre les topics (liste des sujets)</h5>
 
-    <hr/>
+          <div class="form-check mb-3">
+            <input class="form-check-input" type="checkbox" name="enableBetweenAds" id="enableBetweenAds">
+            <label class="form-check-label" for="enableBetweenAds">Activer</label>
+          </div>
 
-    <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</label>
-    </div>
-    <div class="mb-3">
-      <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 placeholder messages (un par ligne)</label>
-      <textarea class="form-control" name="messagePlaceholderIds" rows="5"></textarea>
+          <div class="mb-3">
+            <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 placeholder (un par ligne)</label>
+            <textarea class="form-control" name="placeholderIds" rows="5"></textarea>
+          </div>
+
+          <hr />
+
+          <h5>Publicités entre les messages (dans un topic)</h5>
+
+          <div class="form-check mb-3">
+            <input class="form-check-input" type="checkbox" name="enableMessageAds" id="enableMessageAds">
+            <label class="form-check-label" for="enableMessageAds">Activer</label>
+          </div>
+
+          <div class="mb-3">
+            <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 placeholder messages (un par ligne)</label>
+            <textarea class="form-control" name="messagePlaceholderIds" rows="5"></textarea>
+          </div>
+
+          <button type="button" class="btn btn-primary ezoic-infinite-save">
+            <i class="fa fa-save"></i> Enregistrer
+          </button>
+        </form>
+      </div>
     </div>
+  </div>
 
-    <button type="button" class="btn btn-primary ezoic-infinite-save">Enregistrer</button>
-  </form>
+  <div class="col-lg-3">
+    <div class="card">
+      <div class="card-header">
+        <strong>Aide</strong>
+      </div>
+      <div class="card-body">
+        <p>Placeholder Ezoic :</p>
+        <pre class="mb-0">&lt;div id="ezoic-pub-ad-placeholder-123"&gt;&lt;/div&gt;</pre>
+        <hr />
+        <p class="mb-0">Les IDs doivent exister côté Ezoic (ad units configurées).</p>
+      </div>
+    </div>
+  </div>
 </div>

package/public/style.css

@@ -1,3 +0,0 @@
-.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;}