nodebb-plugin-onekite-calendar 1.0.15 → 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

@@ -12,6 +12,83 @@ const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
 
+// Resolve group identifiers from ACP.
+// Admins may enter a group *name* ("Test") or a *slug* ("onekite-ffvl-2026").
+// Depending on NodeBB version and group type (system/custom), some core methods
+// accept one or the other. We try both to be tolerant.
+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 {
+    members = await groups.getMembers(id, 0, -1);
+  } catch (e) {
+    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') {
+    let groupName = null;
+    try {
+      if (groups.getGroupNameByGroupSlug.length >= 2) {
+        groupName = await new Promise((resolve) => {
+          groups.getGroupNameByGroupSlug(id, (err, name) => resolve(err ? null : name));
+        });
+      } else {
+        groupName = await groups.getGroupNameByGroupSlug(id);
+      }
+    } catch (e) {
+      groupName = null;
+    }
+
+    if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
+      try {
+        members = await groups.getMembers(String(groupName).trim(), 0, -1);
+      } catch (e) {
+        members = [];
+      }
+      const byNameUids = toUids(members);
+      if (byNameUids.length) return byNameUids;
+    }
+  }
+
+  return [];
+}
+
 // Fast membership check without N calls to groups.isMember.
 // NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
 // We compare against both group slugs and names to be tolerant with older settings.
@@ -43,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.
@@ -56,30 +134,50 @@ const discord = require('./discord');
 // We try the common forms. Any failure is logged for debugging.
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
+
+  // Language can come from plugin settings or NodeBB config depending on version.
+  let lang = 'fr';
+  try {
+    const s = await meta.settings.get('calendar-onekite').catch(() => ({}));
+    lang = (s && s.defaultLang) || (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+  } catch (e) {
+    lang = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+  }
+
+  // Subject is not a positional arg; it must be injected via params.subject.
+  const params = Object.assign({}, data || {}, subject ? { subject } : {});
+
+  // Prefer sendToEmail when available (most consistent across versions).
   try {
-    // NodeBB core signature (historically):
-    //   Emailer.sendToEmail(template, email, language, params[, callback])
-    // Subject is not a positional arg; it must be injected (either by NodeBB itself
-    // or via filter:email.modify). We always pass it in params.subject.
-    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-    const params = Object.assign({}, data || {}, subject ? { subject } : {});
     if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, language, params);
+      // NodeBB: sendToEmail(template, email, language, params)
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, lang, params);
+      } else {
+        // Older signature: sendToEmail(template, email, params)
+        await emailer.sendToEmail(template, toEmail, params);
+      }
       return;
     }
-    // Fallback for older/unusual builds (rare)
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
+  }
+
+  // Very old/unusual builds: try send() but only if it clearly accepts an email.
+  try {
     if (typeof emailer.send === 'function') {
       // Some builds accept (template, email, language, params)
       if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, language, params);
-        return;
+        await emailer.send(template, toEmail, lang, params);
+      } else {
+        // Some builds accept (template, email, params)
+        await emailer.send(template, toEmail, params);
       }
-      // Some builds accept (template, email, params)
-      await emailer.send(template, toEmail, params);
     }
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
   }
 }
 
@@ -710,7 +808,7 @@ api.createReservation = async function (req, res) {
       const requester = await user.getUserFields(uid, ['username', 'email']);
       const itemsLabel = (resv.itemNames || []).join(', ');
       for (const g of notifyGroups) {
-        const members = await groups.getMembers(g, 0, -1);
+        const members = await getMembersByGroupIdentifier(g);
         const uids = Array.isArray(members) ? members : [];
 
         // Batch fetch user email/username when supported by this NodeBB version.

package/lib/scheduler.js

@@ -59,28 +59,47 @@ async function processAwaitingPayment() {
 
   async function sendEmail(template, toEmail, subject, data) {
     if (!toEmail) return;
+
+    // Language can come from plugin settings or NodeBB config depending on version.
+    let lang = 'fr';
     try {
-      // NodeBB core signature:
-      //   Emailer.sendToEmail(template, email, language, params[, callback])
-      // Subject is NOT a positional argument; it must be provided in params.subject
-      // and optionally copied into the final email by filter:email.modify.
-      const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-      const params = Object.assign({}, data || {}, subject ? { subject } : {});
+      const s = await meta.settings.get('calendar-onekite').catch(() => ({}));
+      lang = (s && s.defaultLang) || (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+    } catch (e) {
+      lang = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+    }
 
+    // Subject is NOT a positional argument; it must be provided in params.subject.
+    const params = Object.assign({}, data || {}, subject ? { subject } : {});
+
+    try {
       if (typeof emailer.sendToEmail === 'function') {
-        await emailer.sendToEmail(template, toEmail, language, params);
+        // NodeBB: sendToEmail(template, email, language, params)
+        if (emailer.sendToEmail.length >= 4) {
+          await emailer.sendToEmail(template, toEmail, lang, params);
+        } else {
+          // Older signature: sendToEmail(template, email, params)
+          await emailer.sendToEmail(template, toEmail, params);
+        }
         return;
       }
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
+        template,
+        toEmail,
+        err: String((err && err.message) || err),
+      });
+    }
 
-      // Fallbacks for older/unusual builds
+    // Very old/unusual builds: try send() but only if it clearly accepts an email.
+    try {
       if (typeof emailer.send === 'function') {
-        // Some builds accept (template, email, language, params)
         if (emailer.send.length >= 4) {
-          await emailer.send(template, toEmail, language, params);
-          return;
+          await emailer.send(template, toEmail, lang, params);
+        } else {
+          await emailer.send(template, toEmail, params);
         }
-        // Some builds accept (template, email, params)
-        await emailer.send(template, toEmail, params);
       }
     } catch (err) {
       // eslint-disable-next-line no-console

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.0.15",
+  "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.15"
+  "version": "1.0.21"
 }