nodebb-plugin-onekite-calendar 1.0.21 → 1.0.23

package/CHANGELOG.md

@@ -4,8 +4,6 @@
 - 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/admin.js

@@ -32,49 +32,24 @@ function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   return out;
 }
 
-async function sendEmail(template, toEmail, subject, data) {
-  // Prefer sending by uid (NodeBB core expects uid in various places)
-  const uid = data && Number.isInteger(data.uid) ? data.uid : null;
-  if (!toEmail && !uid) return;
+async function sendEmail(template, uid, subject, data) {
+  const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
+  if (!Number.isInteger(toUid) || toUid <= 0) return;
 
-  const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
-  const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
   const params = Object.assign({}, data || {}, subject ? { subject } : {});
 
-  // If we have a uid, use the native uid-based sender first.
   try {
-    if (uid && typeof emailer.send === 'function') {
-      // NodeBB: send(template, uid, params)
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, uid, params);
-      } else {
-        await emailer.send(template, uid, params);
-      }
-      return;
+    if (typeof emailer.send !== 'function') return;
+    // NodeBB 4.x: send(template, uid, params)
+    if (emailer.send.length >= 3) {
+      await emailer.send(template, toUid, params);
+    } else {
+      await emailer.send(template, toUid);
     }
   } catch (err) {
     console.warn('[calendar-onekite] Failed to send email', {
       template,
-      toEmail,
-      err: err && err.message ? err.message : String(err),
-    });
-  }
-
-  try {
-    if (typeof emailer.sendToEmail === 'function') {
-      // 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) {
-    console.warn('[calendar-onekite] Failed to send email', {
-      template,
-      toEmail,
+      uid: toUid,
       err: err && err.message ? err.message : String(err),
     });
   }
@@ -187,11 +162,11 @@ admin.approveReservation = async function (req, res) {
       // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
       callbackUrl: returnUrl,
       webhookUrl: webhookUrl,
-      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
+      itemName: buildHelloAssoItemName('Réservation matériel Onekite', Array.isArray(r.itemNames) ? r.itemNames : [], r.start, r.end),
       containsDonation: false,
       metadata: {
         reservationId: String(rid),
-        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : []).filter(Boolean),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       },
     });
@@ -213,18 +188,19 @@ admin.approveReservation = async function (req, res) {
 
   // Email requester
   try {
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    if (requester && requester.email) {
+    const requesterUid = parseInt(r.uid, 10);
+    const requester = await user.getUserFields(requesterUid, ['username']);
+    if (requesterUid) {
       const latNum = Number(r.pickupLat);
       const lonNum = Number(r.pickupLon);
       const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
         ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
         : '';
-      await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
-        uid: parseInt(r.uid, 10),
-        username: requester.username,
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+      await sendEmail('calendar-onekite_approved', requesterUid, 'Location matériel - Réservation validée', {
+        uid: requesterUid,
+        username: requester && requester.username ? requester.username : '',
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentUrl: paymentUrl || '',
         pickupAddress: r.pickupAddress || '',
@@ -253,13 +229,14 @@ admin.refuseReservation = async function (req, res) {
   await dbLayer.saveReservation(r);
 
   try {
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    if (requester && requester.email) {
-      await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
-        uid: parseInt(r.uid, 10),
-        username: requester.username,
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+    const requesterUid = parseInt(r.uid, 10);
+    const requester = await user.getUserFields(requesterUid, ['username']);
+    if (requesterUid) {
+      await sendEmail('calendar-onekite_refused', requesterUid, 'Location matériel - Réservation refusée', {
+        uid: requesterUid,
+        username: requester && requester.username ? requester.username : '',
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         start: formatFR(r.start),
         end: formatFR(r.end),
@@ -442,7 +419,7 @@ admin.getAccounting = async function (req, res) {
 
     const itemNames = Array.isArray(r.itemNames) && r.itemNames.length
       ? r.itemNames
-      : (r.itemName ? [r.itemName] : []);
+      : [];
 
     const total = Number(r.total) || 0;
     const startDate = formatFR(r.start);

package/lib/api.js

@@ -20,27 +20,6 @@ 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 {
@@ -48,17 +27,7 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
   } 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) {}
-  }
+  if (Array.isArray(members) && members.length) return members;
 
   // Then try slug -> groupName mapping when available.
   if (typeof groups.getGroupNameByGroupSlug === 'function') {
@@ -81,12 +50,27 @@ async function getMembersByGroupIdentifier(groupIdentifier) {
       } catch (e) {
         members = [];
       }
-      const byNameUids = toUids(members);
-      if (byNameUids.length) return byNameUids;
+      if (Array.isArray(members) && members.length) return members;
     }
   }
 
-  return [];
+  return Array.isArray(members) ? members : [];
+}
+
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) { out.push(m); continue; }
+    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
+    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
+      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
+      if (!Number.isNaN(u)) out.push(u);
+    }
+  }
+  // de-dupe
+  return Array.from(new Set(out));
 }
 
 // Fast membership check without N calls to groups.isMember.
@@ -120,8 +104,7 @@ function normalizeAllowedGroups(raw) {
       if (Array.isArray(parsed)) return parsed.map(v => String(v).trim()).filter(Boolean);
     } catch (e) {}
   }
-  // Accept commas, semicolons, or new lines as separators
-  return s.split(/[,;\n]+/).map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
+  return s.split(',').map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
 }
 
 // NOTE: Avoid per-group async checks (groups.isMember) when possible.
@@ -130,54 +113,25 @@ function normalizeAllowedGroups(raw) {
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 
-// Email helper: NodeBB's Emailer signature differs across versions.
-// 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';
-  }
+// Email helper (NodeBB 4.x): always send by uid.
+// Subject must be provided inside params.subject.
+async function sendEmail(template, uid, subject, data) {
+  const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
+  if (!Number.isInteger(toUid) || toUid <= 0) return;
 
-  // 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 {
-    if (typeof emailer.sendToEmail === 'function') {
-      // 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', { 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, lang, params);
-      } else {
-        // Some builds accept (template, email, params)
-        await emailer.send(template, toEmail, params);
-      }
+    if (typeof emailer.send !== 'function') return;
+    // NodeBB: send(template, uid, params)
+    if (emailer.send.length >= 3) {
+      await emailer.send(template, toUid, params);
+    } else {
+      await emailer.send(template, toUid);
     }
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
+    console.warn('[calendar-onekite] Failed to send email', { template, uid: toUid, err: String((err && err.message) || err) });
   }
 }
 
@@ -374,15 +328,18 @@ function eventsFor(resv) {
   const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
   const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
 
-  const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds : (resv.itemId ? [resv.itemId] : []);
-  const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : []);
+  const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds.filter(Boolean) : [];
+  const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames.filter(Boolean) : [];
 
   // One line = one material: return one calendar event per item
+  if (!itemIds.length && !itemNames.length) {
+    return [];
+  }
   const out = [];
-  const count = Math.max(itemIds.length, itemNames.length, 1);
+  const count = Math.max(itemIds.length, itemNames.length);
   for (let i = 0; i < count; i++) {
-    const itemId = String(itemIds[i] || itemIds[0] || resv.itemId || '');
-    const itemName = String(itemNames[i] || itemNames[0] || resv.itemName || itemId);
+    const itemId = String(itemIds[i] || itemIds[0] || i);
+    const itemName = String(itemNames[i] || itemNames[0] || itemId);
     out.push({
       // keep id unique per item for FullCalendar, but keep the real rid in extendedProps.rid
       id: `${resv.rid}:${itemId || i}`,
@@ -399,15 +356,14 @@ function eventsFor(resv) {
         uid: resv.uid,
         approvedBy: resv.approvedBy || 0,
         approvedByUsername: resv.approvedByUsername || '',
-        itemIds: itemIds.filter(Boolean),
-        itemNames: itemNames.filter(Boolean),
+        itemIds: itemIds,
+        itemNames: itemNames,
         itemIdLine: itemId,
         itemNameLine: itemName,
       },
     });
   }
   return out;
-}
 
 function eventsForSpecial(ev) {
   const start = new Date(parseInt(ev.start, 10));
@@ -577,8 +533,8 @@ api.getReservationDetails = async function (req, res) {
     status: r.status,
     uid: r.uid,
     username: r.username || '',
-    itemNames: Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : []),
-    itemIds: Array.isArray(r.itemIds) ? r.itemIds : (r.itemId ? [r.itemId] : []),
+    itemNames: Array.isArray(r.itemNames) ? r.itemNames : [],
+    itemIds: Array.isArray(r.itemIds) ? r.itemIds : [],
     start: r.start,
     end: r.end,
     approvedByUsername: r.approvedByUsername || '',
@@ -742,9 +698,9 @@ api.createReservation = async function (req, res) {
     return res.status(400).json({ error: "bad-dates" });
   }
 
-  // Support both legacy single itemId and new itemIds[] payload
-  const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds.map(String) : ((req.body.itemId ? [String(req.body.itemId)] : []));
-  const itemNames = Array.isArray(req.body.itemNames) ? req.body.itemNames.map(String) : (req.body.itemName ? [String(req.body.itemName)] : []);
+  // NodeBB 4.x only: require modern payload
+  const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds.map(String) : [];
+  const itemNames = Array.isArray(req.body.itemNames) ? req.body.itemNames.map(String) : [];
 
   const total = typeof req.body.total === 'number' ? req.body.total : parseFloat(String(req.body.total || '0'));
 
@@ -763,7 +719,7 @@ api.createReservation = async function (req, res) {
     const exStart = parseInt(existing.start, 10);
     const exEnd = parseInt(existing.end, 10);
     if (!(exStart < end && start < exEnd)) continue;
-    const exItemIds = Array.isArray(existing.itemIds) ? existing.itemIds : (existing.itemId ? [existing.itemId] : []);
+    const exItemIds = Array.isArray(existing.itemIds) ? existing.itemIds : [];
     const shared = exItemIds.filter(x => itemIds.includes(String(x)));
     if (shared.length) {
       conflicts.push({ rid: existing.rid, itemIds: shared, status: existing.status });
@@ -788,9 +744,6 @@ api.createReservation = async function (req, res) {
     username: username || null,
     itemIds,
     itemNames: itemNames.length ? itemNames : itemIds,
-    // keep legacy fields for backward compatibility
-    itemId: itemIds[0],
-    itemName: (itemNames[0] || itemIds[0]),
     start,
     end,
     status: 'pending',
@@ -801,44 +754,35 @@ api.createReservation = async function (req, res) {
   // Save
   await dbLayer.saveReservation(resv);
 
-  // Notify groups by email (NodeBB emailer config)
+  // Notify groups by email (NodeBB 4.x, UID-only)
   try {
-    const notifyGroups = (settings.notifyGroups || '').split(',').map(s => s.trim()).filter(Boolean);
+    const notifyGroups = String(settings.notifyGroups || '')
+      .split(/[\n,;]+/)
+      .map(s => s.trim())
+      .filter(Boolean);
+
     if (notifyGroups.length) {
-      const requester = await user.getUserFields(uid, ['username', 'email']);
-      const itemsLabel = (resv.itemNames || []).join(', ');
+      const requester = await user.getUserFields(uid, ['username']);
+      const itemsLabel = (itemNames && itemNames.length ? itemNames : itemIds).join(', ');
+
       for (const g of notifyGroups) {
         const members = await getMembersByGroupIdentifier(g);
-        const uids = Array.isArray(members) ? members : [];
-
-        // Batch fetch user email/username when supported by this NodeBB version.
-        let usersData = [];
-        try {
-          if (typeof user.getUsersFields === 'function') {
-            usersData = await user.getUsersFields(uids, ['username', 'email']);
-          } else {
-            usersData = await Promise.all(uids.map(async (memberUid) => {
-              try { return await user.getUserFields(memberUid, ['username', 'email']); }
-              catch (e) { return null; }
-            }));
-          }
-        } catch (e) {
-          usersData = [];
-        }
-
-        for (const md of (usersData || [])) {
-          if (md && md.email) {
-            await sendEmail('calendar-onekite_pending', md.email, 'Location matériel - Demande de réservation', {
-              username: md.username,
-              requester: requester.username,
-              itemName: itemsLabel,
-              itemNames: resv.itemNames || [],
-              dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
-              start: formatFR(start),
-              end: formatFR(end),
-              total: resv.total || 0,
-            });
-          }
+        const uids = normalizeUids(members);
+
+        for (const memberUid of uids) {
+          const u = parseInt(memberUid, 10);
+          if (!Number.isInteger(u) || u <= 0) continue;
+
+          await sendEmail('calendar-onekite_pending', u, 'Location matériel - Demande de réservation', {
+            uid: u,
+            requester: requester && requester.username ? requester.username : '',
+            itemName: itemsLabel,
+            itemNames: (itemNames && itemNames.length ? itemNames : itemIds),
+            dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+            start: formatFR(start),
+            end: formatFR(end),
+            total: resv.total || 0,
+          });
         }
       }
     }
@@ -852,8 +796,8 @@ api.createReservation = async function (req, res) {
       rid: resv.rid,
       uid: resv.uid,
       username: resv.username || '',
-      itemIds: resv.itemIds || [],
-      itemNames: resv.itemNames || [],
+      itemIds: itemIds || [],
+      itemNames: itemNames || [],
       start: resv.start,
       end: resv.end,
       status: resv.status,
@@ -877,8 +821,7 @@ api.approveReservation = async function (req, res) {
   if (r.status !== 'pending') return res.status(400).json({ error: 'bad-status' });
 
   r.status = 'awaiting_payment';
-  // Backwards compatible: old clients sent `adminNote` to describe the pickup place.
-  r.pickupAddress = String((req.body && (req.body.pickupAddress || req.body.adminNote)) || '').trim();
+  r.pickupAddress = String((req.body && req.body.pickupAddress) || '').trim();
   r.notes = String((req.body && req.body.notes) || '').trim();
   r.pickupTime = String((req.body && req.body.pickupTime) || '').trim();
   r.pickupLat = String((req.body && req.body.pickupLat) || '').trim();
@@ -918,11 +861,11 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: buildHelloAssoItemName('', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
+      itemName: buildHelloAssoItemName('', Array.isArray(r.itemNames) ? r.itemNames : [], r.start, r.end),
       containsDonation: false,
       metadata: {
         reservationId: String(rid),
-        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : []).filter(Boolean),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       },
     });
@@ -943,17 +886,19 @@ api.approveReservation = async function (req, res) {
   await dbLayer.saveReservation(r);
 
   // Email requester
-  const requester = await user.getUserFields(r.uid, ['username', 'email']);
-  if (requester && requester.email) {
+  const requesterUid = parseInt(r.uid, 10);
+  const requester = await user.getUserFields(requesterUid, ['username']);
+  if (requesterUid) {
     const latNum = Number(r.pickupLat);
     const lonNum = Number(r.pickupLon);
     const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
       ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
       : '';
-    await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
-      username: requester.username,
-      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+    await sendEmail('calendar-onekite_approved', requesterUid, 'Location matériel - Réservation validée', {
+      uid: requesterUid,
+      username: requester && requester.username ? requester.username : '',
+      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       start: formatFR(r.start),
       end: formatFR(r.end),
@@ -987,12 +932,14 @@ api.refuseReservation = async function (req, res) {
   r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
   await dbLayer.saveReservation(r);
 
-  const requester = await user.getUserFields(r.uid, ['username', 'email']);
-  if (requester && requester.email) {
-    await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Demande de réservation', {
-      username: requester.username,
-      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+  const requesterUid2 = parseInt(r.uid, 10);
+  const requester = await user.getUserFields(requesterUid2, ['username']);
+  if (requesterUid2) {
+    await sendEmail('calendar-onekite_refused', requesterUid2, 'Location matériel - Demande de réservation', {
+      uid: requesterUid2,
+      username: requester && requester.username ? requester.username : '',
+      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       start: formatFR(r.start),
       end: formatFR(r.end),

package/lib/helloassoWebhook.js

@@ -24,50 +24,22 @@ const SETTINGS_KEY = 'calendar-onekite';
 // Replay protection: store processed payment ids.
 const PROCESSED_KEY = 'calendar-onekite:helloasso:processedPayments';
 
-async function sendEmail(template, toEmail, subject, data) {
-  const uidFromData = data && Number.isInteger(data.uid) ? data.uid : null;
-  if (!toEmail && !uidFromData) return;
+async function sendEmail(template, uid, subject, data) {
+  const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
+  if (!Number.isInteger(toUid) || toUid <= 0) return;
   try {
     const emailer = require.main.require('./src/emailer');
-    // NodeBB core signature is typically:
-    //   sendToEmail(template, email, language, params)
-    // Subject must be provided inside params.subject (and can be finalized via filter:email.modify).
-    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+    if (typeof emailer.send !== 'function') return;
     const params = Object.assign({}, data || {}, subject ? { subject } : {});
-
-    // In NodeBB 4.x, various email flows expect a uid to be present.
-    // If we have it, always prefer the uid-based sender.
-    let uid = uidFromData;
-    if (!uid && toEmail && typeof user.getUidByEmail === 'function') {
-      try {
-        uid = await user.getUidByEmail(toEmail);
-        if (uid && typeof uid === 'string') uid = parseInt(uid, 10);
-      } catch (e) {
-        uid = null;
-      }
-    }
-    if (uid && typeof emailer.send === 'function') {
-      // NodeBB: send(template, uid, params)
-      await emailer.send(template, uid, params);
-      return;
+    // NodeBB 4.x: send(template, uid, params)
+    if (emailer.send.length >= 3) {
+      await emailer.send(template, toUid, params);
+    } else {
+      await emailer.send(template, toUid);
     }
-
-    if (typeof emailer.sendToEmail === 'function') {
-      // Prefer the canonical signature.
-      // If a fork uses a shorter signature, we'll still try passing params as 3rd arg.
-      if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, language, params);
-      } else {
-        await emailer.sendToEmail(template, toEmail, params);
-      }
-      return;
-    }
-
-    // Do not call emailer.send with an email address (it expects uid). If we reach here,
-    // fall back to sendToEmail only.
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
+    console.warn('[calendar-onekite] Failed to send email (webhook)', { template, uid: toUid, err: String((err && err.message) || err) });
   }
 }
 
@@ -352,13 +324,14 @@ async function handler(req, res, next) {
     } catch (e) {}
 
     // Notify requester
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    if (requester && requester.email) {
-      await sendEmail('calendar-onekite_paid', requester.email, 'Location matériel - Paiement reçu', {
-        uid: parseInt(r.uid, 10),
-        username: requester.username,
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+    const requesterUid = parseInt(r.uid, 10);
+    const requester = await user.getUserFields(requesterUid, ['username']);
+    if (requesterUid) {
+      await sendEmail('calendar-onekite_paid', requesterUid, 'Location matériel - Paiement reçu', {
+        uid: requesterUid,
+        username: requester && requester.username ? requester.username : '',
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentReceiptUrl: r.paymentReceiptUrl || '',
       });
@@ -370,8 +343,8 @@ async function handler(req, res, next) {
         rid: r.rid,
         uid: r.uid,
         username: (requester && requester.username) ? requester.username : (r.username || ''),
-        itemIds: r.itemIds || (r.itemId ? [r.itemId] : []),
-        itemNames: r.itemNames || (r.itemName ? [r.itemName] : []),
+        itemIds: Array.isArray(r.itemIds) ? r.itemIds : [],
+        itemNames: Array.isArray(r.itemNames) ? r.itemNames : [],
         start: r.start,
         end: r.end,
         status: r.status,

package/lib/scheduler.js

@@ -57,55 +57,26 @@ async function processAwaitingPayment() {
   const emailer = require.main.require('./src/emailer');
   const user = require.main.require('./src/user');
 
-  async function sendEmail(template, toEmail, subject, data) {
-    if (!toEmail) return;
+  // NodeBB 4.x: always send by uid.
+  async function sendEmail(template, uid, subject, data) {
+    const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(uid, 10) : NaN);
+    if (!Number.isInteger(toUid) || toUid <= 0) 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 argument; it must be provided in params.subject.
     const params = Object.assign({}, data || {}, subject ? { subject } : {});
 
     try {
-      if (typeof emailer.sendToEmail === 'function') {
-        // 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;
+      if (typeof emailer.send !== 'function') return;
+      // NodeBB: send(template, uid, params)
+      if (emailer.send.length >= 3) {
+        await emailer.send(template, toUid, params);
+      } else {
+        await emailer.send(template, toUid);
       }
     } 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),
-      });
-    }
-
-    // Very old/unusual builds: try send() but only if it clearly accepts an email.
-    try {
-      if (typeof emailer.send === 'function') {
-        if (emailer.send.length >= 4) {
-          await emailer.send(template, toEmail, lang, params);
-        } else {
-          await emailer.send(template, toEmail, params);
-        }
-      }
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
-        template,
-        toEmail,
+        uid: toUid,
         err: String((err && err.message) || err),
       });
     }
@@ -140,18 +111,22 @@ async function processAwaitingPayment() {
         await dbLayer.saveReservation(r);
         continue;
       }
-      const u = await user.getUserFields(r.uid, ['username', 'email']);
-      if (u && u.email) {
-        await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
-          username: u.username,
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+
+      const toUid = parseInt(r.uid, 10);
+      const u = await user.getUserFields(toUid, ['username']);
+      if (toUid) {
+        await sendEmail('calendar-onekite_reminder', toUid, 'Location matériel - Rappel', {
+          uid: toUid,
+          username: (u && u.username) ? u.username : '',
+          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           paymentUrl: r.paymentUrl || '',
           delayMinutes: holdMins,
           pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
         });
       }
+
       r.reminderSent = true;
       r.reminderAt = now;
       await dbLayer.saveReservation(r);
@@ -170,12 +145,15 @@ async function processAwaitingPayment() {
       const firstDiscord = await db.setAdd(discordKey, rid);
       const shouldDiscord = !!firstDiscord;
 
-      const u = await user.getUserFields(r.uid, ['username', 'email']);
-      if (shouldEmail && u && u.email) {
-        await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
-          username: u.username,
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+      const toUid = parseInt(r.uid, 10);
+      const u = await user.getUserFields(toUid, ['username']);
+
+      if (shouldEmail && toUid) {
+        await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Rappel', {
+          uid: toUid,
+          username: (u && u.username) ? u.username : '',
+          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
+          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
         });
@@ -197,6 +175,7 @@ async function processAwaitingPayment() {
           });
         } catch (e) {}
       }
+
       await dbLayer.removeReservation(rid);
     }
   }

package/library.js

@@ -109,13 +109,8 @@ Plugin.init = async function (params) {
     },
     type: ['application/json', 'application/*+json'],
   });
-  // Accept webhook on both legacy root path and namespaced plugin path.
-  // Some reverse proxies block unknown root paths, so /plugins/... is recommended.
-  router.post('/helloasso', helloassoJson, helloassoWebhook.handler);
   router.post('/plugins/calendar-onekite/helloasso', helloassoJson, helloassoWebhook.handler);
 
-  // Optional: health checks
-  router.get('/helloasso', (req, res) => res.json({ ok: true }));
   router.get('/plugins/calendar-onekite/helloasso', (req, res) => res.json({ ok: true }));
 
   scheduler.start();
@@ -133,8 +128,7 @@ Plugin.addAdminNavigation = async function (header) {
 
 
 // Ensure our transactional emails always get a subject.
-// NodeBB's Emailer.sendToEmail signature expects (template, email, language, params),
-// so plugins typically inject/modify the subject via this hook.
+// Ensure our transactional emails always get a subject (NodeBB email hook).
 Plugin.emailModify = async function (data) {
   try {
     if (!data || !data.template) return data;

package/package.json

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

package/public/admin.js

@@ -221,14 +221,14 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     for (const r of list) {
       if (r && r.rid) pendingCache.set(String(r.rid), r);
       const created = r.createdAt ? fmtFR(r.createdAt) : '';
-      const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
+      const itemNames = Array.isArray(r.itemNames) ? r.itemNames : [];
       const itemsHtml = `<ul style="margin: 0 0 10px 18px;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
       const div = document.createElement('div');
       div.className = 'list-group-item onekite-pending-row';
       div.innerHTML = `
         <div class="d-flex justify-content-between align-items-start gap-2">
           <div style="min-width: 0;">
-            <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
+            <div><strong>${itemsHtml}</strong></div>
             <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
             <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
           </div>
@@ -492,7 +492,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
               ? r.itemNames
               : (typeof r.itemNames === 'string' && r.itemNames.trim()
                 ? r.itemNames.split(',').map(s => s.trim()).filter(Boolean)
-                : ([r.itemName || r.itemId].filter(Boolean)));
+                : ([]));
             const itemsListHtml = itemNames.length
               ? `<div class="mb-2"><strong>Matériel</strong><ul style="margin:0.25rem 0 0 1.1rem; padding:0;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul></div>`
               : '';

package/public/client.js

@@ -787,7 +787,7 @@ function toDatetimeLocalValue(date) {
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
         if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
-        const ids = (ev.extendedProps && ev.extendedProps.itemIds) || (ev.extendedProps && ev.extendedProps.itemId ? [ev.extendedProps.itemId] : []);
+        const ids = (ev.extendedProps && ev.extendedProps.itemIds) || [];
         ids.forEach((id) => blocked.add(String(id)));
       });
     } catch (e) {}
@@ -1300,12 +1300,7 @@ function toDatetimeLocalValue(date) {
             p = Object.assign({}, p0, details);
           } else if (p0.type === 'special' && p0.eid) {
             const details = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(String(p0.eid))}`);
-            p = Object.assign({}, p0, details, {
-              // keep backward compat with older field names used by templates below
-              pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
-              pickupLat: details.lat || details.pickupLat || p0.pickupLat,
-              pickupLon: details.lon || details.pickupLon || p0.pickupLon,
-            });
+            p = Object.assign({}, p0, details);
           }
         } catch (e) {
           // ignore detail fetch errors; fall back to minimal props
@@ -1370,7 +1365,7 @@ function toDatetimeLocalValue(date) {
           ? `<div class="mb-2"><strong>Réservée par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
           : '';
         const itemsHtml = (() => {
-        const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
+        const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : []);
         if (names.length) {
           return `<ul style="margin:0 0 0 1.1rem; padding:0;">${names.map(n => `<li>${String(n).replace(/</g,'&lt;').replace(/>/g,'&gt;')}</li>`).join('')}</ul>`;
         }
@@ -1505,7 +1500,7 @@ function toDatetimeLocalValue(date) {
             callback: async () => {
               const itemNames = Array.isArray(p.itemNames) && p.itemNames.length
                 ? p.itemNames
-                : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
+                : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : []);
               const itemsListHtml = itemNames.length
                 ? `<div class="mb-2"><strong>Matériel</strong><ul style="margin:0.25rem 0 0 1.1rem; padding:0;">${itemNames.map(n => `<li>${String(n).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</li>`).join('')}</ul></div>`
                 : '';