nodebb-plugin-onekite-calendar 1.0.22 → 1.0.24

package/lib/api.js

@@ -328,8 +328,8 @@ 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(undefineds) ? undefineds.filter(Boolean) : [];
-  const itemNames = Array.isArray(undefineds) ? undefineds.filter(Boolean) : [];
+  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) {
@@ -754,51 +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 = (undefineds || []).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 = normalizeUids(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']);
-            // Some NodeBB versions omit uid in returned rows; re-attach it from input order.
-            if (Array.isArray(usersData)) {
-              usersData = usersData.map((row, idx) => (row ? Object.assign({ uid: uids[idx] }, row) : null));
-            }
-          } 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 || [])) {
-          const memberUid = md && (md.uid || md.userId || md.userid || md.user_id);
+        for (const memberUid of uids) {
           const u = parseInt(memberUid, 10);
-          if (Number.isInteger(u) && u > 0) {
-            await sendEmail('calendar-onekite_pending', u, 'Location matériel - Demande de réservation', {
-              uid: u,
-              username: md && md.username ? md.username : '',
-              requester: requester.username,
-              itemName: itemsLabel,
-              itemNames: undefineds || [],
-              dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
-              start: formatFR(start),
-              end: formatFR(end),
-              total: resv.total || 0,
-            });
-          }
+          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,
+          });
         }
       }
     }
@@ -812,8 +796,8 @@ api.createReservation = async function (req, res) {
       rid: resv.rid,
       uid: resv.uid,
       username: resv.username || '',
-      itemIds: undefineds || [],
-      itemNames: undefineds || [],
+      itemIds: itemIds || [],
+      itemNames: itemNames || [],
       start: resv.start,
       end: resv.end,
       status: resv.status,
@@ -1016,4 +1000,6 @@ api.cancelReservation = async function (req, res) {
   return res.json({ ok: true, status: 'cancelled' });
 };
 
-module.exports = api;
+module.exports = api;
+
+}

package/package.json

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