nodebb-plugin-onekite-calendar 1.0.13 → 1.0.15

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

@@ -935,6 +935,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;
 
@@ -144,6 +145,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 +161,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/lib/widgets.js

@@ -169,9 +169,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
       height: 'auto',
       headerToolbar: {
         left: 'prev,next',
-        // No range/title in the widget: it becomes redundant and, when the
-        // view crosses months, FullCalendar displays a start/end range.
-        center: '',
+        center: 'title',
         right: '',
       },
       navLinks: false,
@@ -188,6 +186,16 @@ widgets.renderTwoWeeksWidget = async function (data) {
           return { html: '<span class="fc-daygrid-day-number">' + String(arg.dayNumberText || '') + '</span>' };
         }
       },
+      // Ensure day numbers never include month text (e.g. '1 janvier')
+      dayCellDidMount: function(arg) {
+        try {
+          const el = arg && arg.el ? arg.el.querySelector('.fc-daygrid-day-number') : null;
+          if (!el) return;
+          const t = String(el.textContent || '');
+          const m = t.match(/^\s*(\d+)/);
+          if (m) el.textContent = m[1];
+        } catch (e) {}
+      },
       eventClassNames: function(arg) {
         try {
           const ev = arg && arg.event;
@@ -281,14 +289,8 @@ dateClick: function() { window.location.href = calUrl; },
             return map[k] || '';
           });
           const status = (String(ep.type || '') === 'reservation') ? statusLabel(ep.status) : '';
-          const start = ev.start ? new Date(ev.start) : null;
-          const end = ev.end ? new Date(ev.end) : null;
-          const pad2 = (n) => String(n).padStart(2, '0');
-          const fmt = (d) => d ? (pad2(d.getDate()) + '/' + pad2(d.getMonth() + 1) + '/' + String(d.getFullYear()).slice(-2)) : '';
-          const range = (start && end) ? ('Du ' + fmt(start) + ' au ' + fmt(end)) : '';
           const html = '' +
             '<div style="font-weight:600; margin-bottom:2px;">' + escapeHtml(title) + '</div>' +
-            (range ? ('<div style="opacity:.85">' + escapeHtml(range) + '</div>') : '') +
             (status ? ('<div style="opacity:.75; margin-top:2px; font-size:.85em;">' + escapeHtml(status) + '</div>') : '');
 
           // Hover (desktop)
@@ -422,4 +424,4 @@ dateClick: function() { window.location.href = calUrl; },
   return data;
 };
 
-module.exports = widgets;
+module.exports = widgets;

package/package.json

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

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">