nodebb-plugin-calendar-onekite 11.1.86 → 11.1.87

package/lib/scheduler.js

@@ -56,31 +56,92 @@ async function processAwaitingPayment() {
   const user = require.main.require('./src/user');
 
   async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
-  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);
-      return;
-    }
-    // Fallback for older/unusual builds (rare)
-    if (typeof emailer.send === 'function') {
-      // Some builds accept (template, email, language, params)
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, language, params);
+    if (!toEmail) return;
+    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 } : {});
+
+      if (typeof emailer.sendToEmail === 'function') {
+        await emailer.sendToEmail(template, toEmail, language, params);
         return;
       }
-      // Some builds accept (template, email, params)
-      await emailer.send(template, toEmail, params);
+
+      // Fallbacks for older/unusual builds
+      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;
+        }
+        // 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 (scheduler)', {
+        template,
+        toEmail,
+        err: String((err && err.message) || err),
+      });
+    }
+  }
+
+  function formatFR(ts) {
+    const d = new Date(ts);
+    const dd = String(d.getDate()).padStart(2, '0');
+    const mm = String(d.getMonth() + 1).padStart(2, '0');
+    const yyyy = d.getFullYear();
+    return `${dd}/${mm}/${yyyy}`;
+  }
+
+  for (const rid of ids) {
+    const r = await dbLayer.getReservation(rid);
+    if (!r || r.status !== 'awaiting_payment') continue;
+
+    const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
+    if (!approvedAt) continue;
+
+    const reminderAt = approvedAt + holdMins * 60 * 1000;
+    const expireAt = approvedAt + 2 * holdMins * 60 * 1000;
+
+    if (!r.reminderSent && now >= reminderAt && now < expireAt) {
+      // Send reminder once
+      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] : [])),
+          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);
+      continue;
+    }
+
+    if (now >= expireAt) {
+      // Expire: remove reservation so it disappears from calendar and frees items
+      const u = await user.getUserFields(r.uid, ['username', 'email']);
+      if (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] : [])),
+          dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+          delayMinutes: holdMins,
+        });
+      }
+      await dbLayer.removeReservation(rid);
     }
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
   }
 }
 

package/package.json

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