nodebb-plugin-ezoic-infinite 0.9.12 → 0.9.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "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

@@ -19,19 +19,64 @@ $(document).ready(function () {
       form.find('[name="messageIntervalPosts"]').val(parseInt(data.messageIntervalPosts, 10) || 3);
       form.find('[name="messagePlaceholderIds"]').val(data.messagePlaceholderIds || '');
 
-      // Load groups dynamically (NodeBB 4.x)
-      socket.emit('groups.getGroups', {}, function (err2, groups) {
+      // Charger les groupes dynamiquement (NodeBB 4.x) - plusieurs fallbacks selon version
+      (function loadGroups() {
         const $select = form.find('[name="excludedGroups"]');
         $select.empty();
 
-        if (!err2 && Array.isArray(groups)) {
-          groups
-            .map(g => g && g.name)
+        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' }))
-            .forEach((name) => {
-              $select.append($('<option>').val(name).text(name));
-            });
+            .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);
+      })();
         }
 
         const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);