nodebb-plugin-onekite-calendar 1.0.14 → 1.0.20

package/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.0.3
 - 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
 
 ## 1.0.2
 - Purge calendrier : suppression réelle des réservations (aucune logique d’archivage)

package/lib/api.js

@@ -12,6 +12,51 @@ 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 [];
+
+  // First try direct.
+  let members = [];
+  try {
+    members = await groups.getMembers(id, 0, -1);
+  } catch (e) {
+    members = [];
+  }
+  if (Array.isArray(members) && members.length) return members;
+
+  // 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 = [];
+      }
+      if (Array.isArray(members) && members.length) return members;
+    }
+  }
+
+  return Array.isArray(members) ? members : [];
+}
+
 // 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.
@@ -56,30 +101,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 +775,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.
@@ -935,6 +1000,23 @@ api.cancelReservation = async function (req, res) {
   r.cancelledBy = uid;
 
   await dbLayer.saveReservation(r);
+
+  // Discord webhook (optional)
+  try {
+    await discord.notifyReservationCancelled(settings, {
+      rid: r.rid,
+      uid: r.uid,
+      username: r.username || '',
+      itemIds: r.itemIds || [],
+      itemNames: r.itemNames || [],
+      start: r.start,
+      end: r.end,
+      status: r.status,
+      cancelledAt: r.cancelledAt,
+      cancelledBy: r.cancelledBy,
+    });
+  } catch (e) {}
+
   return res.json({ ok: true, status: 'cancelled' });
 };
 

package/lib/discord.js

@@ -88,7 +88,9 @@ function buildReservationMessage(kind, reservation) {
 function buildWebhookPayload(kind, reservation) {
   // Discord "regroupe" visuellement les messages consécutifs d'un même auteur.
   // En utilisant un username différent par action, on obtient un message bien distinct.
-  const webhookUsername = kind === 'paid' ? 'Onekite • Paiement' : 'Onekite • Réservation';
+  const webhookUsername = kind === 'paid'
+    ? 'Onekite • Paiement'
+    : (kind === 'cancelled' ? 'Onekite • Annulation' : 'Onekite • Réservation');
 
   const calUrl = 'https://www.onekite.com/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
@@ -98,20 +100,29 @@ function buildWebhookPayload(kind, reservation) {
   const start = reservation && reservation.start ? Number(reservation.start) : NaN;
   const end = reservation && reservation.end ? Number(reservation.end) : NaN;
 
-  const title = kind === 'paid' ? '💳 Paiement reçu' : '⏳ Demande de réservation';
+  const title = kind === 'paid'
+    ? '💳 Paiement reçu'
+    : (kind === 'cancelled' ? '❌ Réservation annulée' : '⏳ Demande de réservation');
 
   const fields = [];
   if (username) {
     fields.push({ name: 'Membre', value: username, inline: true });
   }
   if (items.length) {
-    const label = kind === 'paid' ? 'Matériel' : 'Matériel demandé';
+    const label = kind === 'request' ? 'Matériel demandé' : 'Matériel';
     fields.push({ name: label, value: items.map((it) => `• ${it}`).join('\n'), inline: false });
   }
   if (Number.isFinite(start) && Number.isFinite(end)) {
     fields.push({ name: 'Période', value: `Du ${formatFRShort(start)} au ${formatFRShort(end)}`, inline: false });
   }
 
+  if (kind === 'cancelled') {
+    const cancelledAt = reservation && reservation.cancelledAt ? Number(reservation.cancelledAt) : NaN;
+    if (Number.isFinite(cancelledAt)) {
+      fields.push({ name: 'Annulée le', value: formatFRShort(cancelledAt), inline: true });
+    }
+  }
+
   return {
     username: webhookUsername,
     // On laisse "content" vide pour privilégier l'embed (plus lisible sur Discord)
@@ -122,7 +133,9 @@ function buildWebhookPayload(kind, reservation) {
         url: calUrl,
         description: kind === 'paid'
           ? 'Un paiement a été reçu pour une réservation.'
-          : 'Une nouvelle demande de réservation a été créée.',
+          : (kind === 'cancelled'
+            ? 'Une réservation a été annulée.'
+            : 'Une nouvelle demande de réservation a été créée.'),
         fields,
         footer: { text: 'Onekite • Calendrier' },
         timestamp: new Date().toISOString(),
@@ -157,7 +170,21 @@ async function notifyPaymentReceived(settings, reservation) {
   }
 }
 
+async function notifyReservationCancelled(settings, reservation) {
+  const url = settings && settings.discordWebhookUrl ? String(settings.discordWebhookUrl).trim() : '';
+  if (!url) return;
+  if (!isEnabled(settings.discordNotifyOnCancelled, true)) return;
+
+  try {
+    await postWebhook(url, buildWebhookPayload('cancelled', reservation));
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Discord webhook failed (cancelled)', e && e.message ? e.message : String(e));
+  }
+}
+
 module.exports = {
   notifyReservationRequested,
   notifyPaymentReceived,
+  notifyReservationCancelled,
 };

package/lib/scheduler.js

@@ -3,6 +3,7 @@
 const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
+const discord = require('./discord');
 
 let timer = null;
 
@@ -58,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
@@ -144,6 +164,12 @@ async function processAwaitingPayment() {
       const expiredKey = 'calendar-onekite:email:expiredSent';
       const firstExpired = await db.setAdd(expiredKey, rid);
       const shouldEmail = !!firstExpired;
+
+      // Guard Discord notification across clustered NodeBB processes
+      const discordKey = 'calendar-onekite:discord:cancelledSent';
+      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', {
@@ -154,6 +180,23 @@ async function processAwaitingPayment() {
           delayMinutes: holdMins,
         });
       }
+
+      if (shouldDiscord) {
+        try {
+          await discord.notifyReservationCancelled(settings, {
+            rid: r.rid || rid,
+            uid: r.uid,
+            username: (u && u.username) ? u.username : (r.username || ''),
+            itemIds: r.itemIds || [],
+            itemNames: r.itemNames || [],
+            start: r.start,
+            end: r.end,
+            status: 'cancelled',
+            cancelledAt: now,
+            cancelledBy: 'system',
+          });
+        } catch (e) {}
+      }
       await dbLayer.removeReservation(rid);
     }
   }

package/package.json

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

package/templates/admin/plugins/calendar-onekite.tpl

@@ -78,6 +78,15 @@
             </select>
           </div>
 
+          <div class="mb-3">
+            <label class="form-label">Envoyer une notification à l'annulation</label>
+            <select class="form-select" name="discordNotifyOnCancelled">
+              <option value="1">Oui</option>
+              <option value="0">Non</option>
+            </select>
+            <div class="form-text">Inclut les annulations manuelles et les annulations automatiques (paiement non reçu dans les délais).</div>
+          </div>
+
           <h4 class="mt-4">HelloAsso</h4>
 
           <div class="mb-3">