nodebb-plugin-onekite-calendar 1.0.20 → 1.0.21

package/CHANGELOG.md

@@ -4,6 +4,8 @@
 - Suppression du texte d’archivage dans le toast de purge (plus de « 0 archivés »)
 - Renommage du plugin : nodebb-plugin-onekite-calendar
 - Discord : notification « ❌ Réservation annulée » (annulation manuelle + annulation automatique) + option ACP
+- Groupes ACP : les champs CSV acceptent aussi ; et retours à la ligne
+- Notifications email (groupes) : résolution robuste nom/slug et normalisation des membres (uids)
 
 ## 1.0.2
 - Purge calendrier : suppression réelle des réservations (aucune logique d’archivage)

package/lib/api.js

@@ -20,6 +20,27 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
   const id = String(groupIdentifier || '').trim();
   if (!id) return [];
 
+  const toUids = (arr) => {
+    if (!Array.isArray(arr)) return [];
+    // NodeBB may return an array of uids (numbers/strings), or an array of user objects (with uid).
+    const uids = arr.map((v) => {
+      if (v == null) return null;
+      if (typeof v === 'number') return v;
+      if (typeof v === 'string') {
+        const n = parseInt(v, 10);
+        return Number.isFinite(n) ? n : null;
+      }
+      if (typeof v === 'object') {
+        const maybe = v.uid ?? v.userId ?? v.id;
+        const n = parseInt(String(maybe), 10);
+        return Number.isFinite(n) ? n : null;
+      }
+      return null;
+    }).filter((n) => Number.isFinite(n));
+    // de-dupe
+    return [...new Set(uids)];
+  };
+
   // First try direct.
   let members = [];
   try {
@@ -27,7 +48,17 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
   } catch (e) {
     members = [];
   }
-  if (Array.isArray(members) && members.length) return members;
+  const directUids = toUids(members);
+  if (directUids.length) return directUids;
+
+  // Some NodeBB builds expose getMembersByGroupSlug (slug -> uids)
+  if (typeof groups.getMembersByGroupSlug === 'function') {
+    try {
+      const bySlug = await groups.getMembersByGroupSlug(id, 0, -1);
+      const bySlugUids = toUids(bySlug);
+      if (bySlugUids.length) return bySlugUids;
+    } catch (e) {}
+  }
 
   // Then try slug -> groupName mapping when available.
   if (typeof groups.getGroupNameByGroupSlug === 'function') {
@@ -50,11 +81,12 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
       } catch (e) {
         members = [];
       }
-      if (Array.isArray(members) && members.length) return members;
+      const byNameUids = toUids(members);
+      if (byNameUids.length) return byNameUids;
     }
   }
 
-  return Array.isArray(members) ? members : [];
+  return [];
 }
 
 // Fast membership check without N calls to groups.isMember.
@@ -88,7 +120,8 @@ function normalizeAllowedGroups(raw) {
       if (Array.isArray(parsed)) return parsed.map(v => String(v).trim()).filter(Boolean);
     } catch (e) {}
   }
-  return s.split(',').map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
+  // Accept commas, semicolons, or new lines as separators
+  return s.split(/[,;\n]+/).map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
 }
 
 // NOTE: Avoid per-group async checks (groups.isMember) when possible.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.20"
+  "version": "1.0.21"
 }