nodebb-plugin-ezoic-infinite 0.9.16 → 1.0.0

package/README.md

@@ -0,0 +1,12 @@
+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/library.js

@@ -1,52 +1,29 @@
 'use strict';
 
 const meta = require.main.require('./src/meta');
-const db = require.main.require('./src/database');
 const groups = require.main.require('./src/groups');
+const routeHelpers = require.main.require('./src/routes/helpers');
 
 const Plugin = {};
 
-Plugin.init = async function (params) {
-  const { router, middleware } = params;
-
-  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
+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('/api/admin/plugins/ezoic-infinite', renderAdmin);
 };
 
-async function getAllGroupNames() {
-  const keys = [
-    'groups:createtime',
-    'groups:visible:createtime',
-    'groups:system:createtime',
-    'groups:alphabetical',
-    'groups:visible:alphabetical',
-  ];
-
-  for (const key of keys) {
-    try {
-      const names = await db.getSortedSetRange(key, 0, -1);
-      if (Array.isArray(names) && names.length) {
-        return names;
-      }
-    } catch (e) {}
-  }
+async function renderAdmin(req, res) {
+  const settings = await meta.settings.get('ezoic-infinite');
 
-  // Last resort: ask groups module for any known set
+  let groupNames = [];
   const candidates = ['groups:createtime', 'groups:visible:createtime'];
   for (const set of candidates) {
     try {
-      const names = await groups.getGroupsFromSet(set, 0, -1);
-      if (Array.isArray(names) && names.length) return names;
+      groupNames = await groups.getGroupsFromSet(set, 0, -1);
+      if (Array.isArray(groupNames) && groupNames.length) break;
     } catch (e) {}
   }
 
-  return [];
-}
-
-async function renderAdmin(req, res) {
-  const settings = await meta.settings.get('ezoic-infinite');
-
-  const groupNames = await getAllGroupNames();
   let groupList = [];
   try {
     groupList = await groups.getGroupsData(groupNames);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.16",
+  "version": "1.0.0",
   "description": "Injection de publicités Ezoic entre les topics et entre les messages avec infinite scroll (NodeBB 4.x).",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -16,14 +16,14 @@
   "staticDirs": {
     "public": "public"
   },
-  "acpScripts": [
-    "public/admin.js"
-  ],
   "scripts": [
     "public/client.js"
   ],
   "css": [
     "public/style.css"
   ],
-  "templates": "public/templates"
+  "templates": "public/templates",
+  "modules": {
+    "../admin/plugins/ezoic-infinite.js": "public/admin.js"
+  }
 }

package/public/admin.js

@@ -1,55 +1,27 @@
-/* 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 || '');        }
-
-        const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-        $select.find('option').each(function () {
-          $(this).prop('selected', selected.includes($(this).val()));
-        });
+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');
       });
     });
-  }
-
-  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');
-    });
-  }
+  };
 
-  $('.ezoic-infinite-save').on('click', save);
-  load();
+  return ACP;
 });

package/public/client.js

@@ -1,4 +1,4 @@
-/* global $, ajaxify, app, socket */
+/* global $, ajaxify, app */
 'use strict';
 
 (function () {
@@ -6,17 +6,15 @@
   window.ezoicInfiniteLoaded = true;
 
   const SETTINGS_NS = 'ezoic-infinite';
-
   let settings = null;
   let pageKey = null;
 
   // State per page
-  let usedTopic = new Set(); // ids currently in DOM (topic)
-  let usedCat = new Set();   // ids currently in DOM (category)
-  let fifoTopic = [];        // [{id, afterNo}]
-  let fifoCat = [];          // [{id, afterPos}]
+  let usedTopic = new Set();
+  let usedCat = new Set();
+  let fifoTopic = [];
+  let fifoCat = [];
 
-  // Refresh single-flight
   let refreshInFlight = false;
   let refreshQueued = false;
 
@@ -103,14 +101,13 @@
     destroyPlaceholder(id);
   }
 
-  // IMPORTANT: showAds is called ONLY for a single newly injected placeholder id (never a batch)
   function callEzoicSingle(id) {
     if (!id) return;
 
     const now = Date.now();
     window.__ezoicLastSingle = window.__ezoicLastSingle || {};
     const last = window.__ezoicLastSingle[id] || 0;
-    if (now - last < 800) return;
+    if (now - last < 1200) return;
     window.__ezoicLastSingle[id] = now;
 
     try {
@@ -129,7 +126,6 @@
 
       window.ezstandalone.cmd.push(function () { run(); });
 
-      // Retry a few times if ez loads late
       let tries = 0;
       const tick = function () {
         tries++;
@@ -140,7 +136,6 @@
     } catch (e) {}
   }
 
-  // Auto height: wrapper visible only when placeholder gets children
   function setupAutoHeightOnce() {
     if (window.__ezoicAutoHeight) return;
     window.__ezoicAutoHeight = true;
@@ -315,8 +310,15 @@
   }
 
   function loadSettings(cb) {
-    socket.emit('admin.settings.get', { hash: SETTINGS_NS }, function (err, data) {
-      settings = data || {};
+    // 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();
     });
   }

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

@@ -5,13 +5,14 @@
     Format placeholder&nbsp;: <code>&lt;div id="ezoic-pub-ad-placeholder-XXX"&gt;&lt;/div&gt;</code>
   </div>
 
-  <form role="form" class="ezoic-infinite-settings">
+  <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>
+        <!-- END groups -->
+      </select>
       <div class="form-text">Maintenez Ctrl/Cmd pour sélectionner plusieurs groupes. Liste triée par ordre alphabétique.</div>
     </div>
 
@@ -53,6 +54,12 @@
       <textarea class="form-control" name="messagePlaceholderIds" rows="6"></textarea>
     </div>
 
-    <button type="button" class="btn btn-primary ezoic-infinite-save">Enregistrer</button>
+    <!-- IMPORT admin/partials/save_button.tpl -->
   </form>
 </div>
+
+<script>
+require(['admin/plugins/ezoic-infinite'], function (acp) {
+  acp.init();
+});
+</script>