nodebb-plugin-onekite-calendar 2.0.35 → 2.0.37

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.37
+- Les rappels validateurs et notifications d’expiration ne sont envoyés qu’aux membres du/des groupe(s) "personnes notifiées" (notifyGroups).
+
 # Changelog – calendar-onekite
 
 ## 1.3.27

package/lib/scheduler.js

@@ -114,6 +114,28 @@ async function getValidatorUids(settings) {
   return Array.from(out);
 }
 
+
+async function getNotifyUids(settings) {
+  const out = new Set();
+  const groupsCsv = normalizeAllowedGroups(settings && settings.notifyGroups);
+  for (const g of groupsCsv) {
+    try {
+      const members = await getMembersByGroupIdentifier(g);
+      normalizeUids(members).forEach((u) => out.add(u));
+    } catch (e) {}
+  }
+  return Array.from(out);
+}
+
+async function getNotifiedValidatorUids(settings) {
+  const [validators, notified] = await Promise.all([
+    getValidatorUids(settings),
+    getNotifyUids(settings),
+  ]);
+  const notifiedSet = new Set((notified || []).map((u) => parseInt(u, 10)).filter(Number.isFinite));
+  return (validators || []).filter((u) => notifiedSet.has(parseInt(u, 10)));
+}
+
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
 async function expirePending() {
   const settings = await meta.settings.get('calendar-onekite');
@@ -146,7 +168,7 @@ async function expirePending() {
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
   })();
 
-  const validatorUids = validatorReminderMins > 0 ? await getValidatorUids(settings) : [];
+  const validatorUids = validatorReminderMins > 0 ? await getNotifiedValidatorUids(settings) : [];
 
   const ids = await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
@@ -209,7 +231,7 @@ async function expirePending() {
 
       // Validators info email (best-effort)
       if (firstExpired) {
-        const validators = await getValidatorUids(settings);
+        const validators = await getNotifiedValidatorUids(settings);
         for (const vuid of validators) {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid,
@@ -350,7 +372,7 @@ async function processAwaitingPayment() {
 
       // Validators info email (best-effort)
       if (shouldEmail) {
-        const validators = await getValidatorUids(settings);
+        const validators = await getNotifiedValidatorUids(settings);
         for (const vuid of validators) {
           await sendEmail('calendar-onekite_validator_expired', vuid, 'Location matériel - Demande expirée', {
             rid: r.rid || rid,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.35",
+  "version": "2.0.37",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -11,4 +11,4 @@
   "nbbpm": {
     "compatibility": "^4.0.0"
   }
-}
+}

package/plugin.json

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

package/templates/emails/calendar-onekite_approved.tpl

@@ -16,10 +16,6 @@
 
 <!-- IF pickupTime -->
 <p><strong>Heure de récupération :</strong> {pickupTime}</p>
-
-<!-- IF pickupAddress -->
-<p><strong>Adresse :</strong> {pickupAddress}</p>
-<!-- ENDIF pickupAddress -->
 <!-- ENDIF pickupTime -->
 
 <!-- IF pickupAddress -->

package/templates/emails/calendar-onekite_paid.tpl

@@ -10,14 +10,18 @@
 
 <p>{dateRange}</p>
 
+<!-- IF pickupTime -->
+<p><strong>Heure de récupération :</strong> {pickupTime}</p>
+<!-- ENDIF pickupTime -->
 
 <!-- IF pickupAddress -->
-<p><strong>Adresse :</strong> {pickupAddress}</p>
+<p><strong>Adresse de récupération :</strong><br>{pickupAddress}</p>
 <!-- ENDIF pickupAddress -->
 
 <!-- IF mapUrl -->
 <p style="font-size: 12px; color: #666;"><strong>Voir sur la carte :</strong> <a href="{mapUrl}">OpenStreetMap</a></p>
 <!-- ENDIF mapUrl -->
+
 <!-- IF paymentReceiptUrl -->
 <p><strong>Reçu :</strong> <a href="{paymentReceiptUrl}">{paymentReceiptUrl}</a></p>
 <!-- ENDIF paymentReceiptUrl -->