nodebb-plugin-ezoic-infinite 0.9.13 → 0.9.15

package/library.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const meta = require.main.require('./src/meta');
+const groups = require.main.require('./src/groups');
 
 const Plugin = {};
 
@@ -14,9 +15,31 @@ Plugin.init = async function (params) {
 async function renderAdmin(req, res) {
   const settings = await meta.settings.get('ezoic-infinite');
 
+  let groupNames = [];
+  // NodeBB versions differ on which sorted set exists; 0.9.6 style used these successfully
+  const candidates = ['groups:createtime', 'groups:visible:createtime', 'groups:system:createtime'];
+  for (const set of candidates) {
+    try {
+      groupNames = await groups.getGroupsFromSet(set, 0, -1);
+      if (Array.isArray(groupNames) && groupNames.length) break;
+    } catch (e) {}
+  }
+
+  let groupList = [];
+  try {
+    groupList = await groups.getGroupsData(groupNames);
+  } catch (e) {
+    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,
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "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/public/admin.js

@@ -17,67 +17,7 @@ $(document).ready(function () {
 
       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 || '');
-
-      // Charger les groupes dynamiquement (NodeBB 4.x) - plusieurs fallbacks selon version
-      (function loadGroups() {
-        const $select = form.find('[name="excludedGroups"]');
-        $select.empty();
-
-        const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-
-        function renderGroups(list) {
-          const names = (list || [])
-            .map(g => (typeof g === 'string' ? g : (g && g.name)))
-            .filter(Boolean)
-            .sort((a, b) => a.localeCompare(b, 'fr', { sensitivity: 'base' }));
-
-          names.forEach((name) => $select.append($('<option>').val(name).text(name)));
-
-          $select.find('option').each(function () {
-            $(this).prop('selected', selected.includes($(this).val()));
-          });
-        }
-
-        function normalize(res) {
-          if (!res) return null;
-          if (Array.isArray(res)) return res;
-          if (Array.isArray(res.groups)) return res.groups;
-          if (Array.isArray(res.results)) return res.results;
-          return null;
-        }
-
-        const events = [
-          'groups.getGroups',
-          'admin.groups.get',
-          'admin.groups.list',
-          'groups.list',
-        ];
-
-        (function tryNext(i) {
-          if (i >= events.length) {
-            // REST fallback
-            try {
-              const base = (window.config && window.config.relative_path) ? window.config.relative_path : '';
-              $.get(base + '/api/groups', function (resp) {
-                const list = normalize(resp) || normalize(resp && resp.response) || (resp && resp.groups) || [];
-                if (Array.isArray(list) && list.length) return renderGroups(list);
-                // If still empty, leave blank silently
-              });
-            } catch (e) {}
-            return;
-          }
-
-          socket.emit(events[i], {}, function (err2, res) {
-            const list = (!err2) ? normalize(res) : null;
-            if (Array.isArray(list) && list.length) {
-              return renderGroups(list);
-            }
-            tryNext(i + 1);
-          });
-        })(0);
-      })();
-        }
+      form.find('[name="messagePlaceholderIds"]').val(data.messagePlaceholderIds || '');        }
 
         const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
         $select.find('option').each(function () {

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

@@ -8,7 +8,10 @@
   <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"></select>
+      <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>