nodebb-plugin-onekite-calendar 2.0.44 → 2.0.45

package/lib/admin.js

@@ -4,6 +4,41 @@ const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
 const { forumBaseUrl, formatFR } = require('./utils');
+const realtime = require('./realtime');
+const crypto = require('crypto');
+const nconf = require.main.require('nconf');
+
+function baseUrl() {
+  try { return String(nconf.get('url') || '').replace(/\/$/, ''); } catch (e) { return forumBaseUrl || ''; }
+}
+function hmacSecret() {
+  try {
+    const s = String(nconf.get('secret') || '').trim();
+    if (s) return s;
+  } catch (e) {}
+  return 'calendar-onekite';
+}
+function signCalendarLink(type, id, uid) {
+  try {
+    return crypto.createHmac('sha256', hmacSecret()).update(`${String(type)}:${String(id)}:${String(uid || 0)}`).digest('hex');
+  } catch (e) { return ''; }
+}
+function ymdToCompact(ymd) { return String(ymd || '').replace(/-/g, ''); }
+function dtToGCalUtc(dt) {
+  const d = (dt instanceof Date) ? dt : new Date(dt);
+  return d.toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z');
+}
+function buildCalendarLinks({ rid, uid, itemNames, pickupAddress, startYmd, endYmd }) {
+  const sig = signCalendarLink('reservation', String(rid), Number(uid) || 0);
+  const icsUrl = `${baseUrl()}/plugins/calendar-onekite/ics/reservation/${encodeURIComponent(String(rid))}?uid=${encodeURIComponent(String(uid || 0))}&sig=${encodeURIComponent(sig)}`;
+  const title = (Array.isArray(itemNames) && itemNames.length) ? `Location - ${itemNames.join(', ')}` : 'Location';
+  const gcal = new URL('https://calendar.google.com/calendar/render');
+  gcal.searchParams.set('action', 'TEMPLATE');
+  gcal.searchParams.set('text', title);
+  gcal.searchParams.set('dates', `${ymdToCompact(startYmd)}/${ymdToCompact(endYmd)}`);
+  if (pickupAddress) gcal.searchParams.set('location', String(pickupAddress));
+  return { icsUrl, googleCalUrl: gcal.toString() };
+}
 
 function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
   const base = String(baseLabel || 'Réservation matériel Onekite').trim();
@@ -60,7 +95,6 @@ function normalizeReturnUrl(meta) {
 
 
 const dbLayer = require('./db');
-const realtime = require('./realtime');
 const helloasso = require('./helloasso');
 
 const ADMIN_PRIV = 'admin:settings';
@@ -224,6 +258,14 @@ admin.approveReservation = async function (req, res) {
         pickupLat: r.pickupLat || '',
         pickupLon: r.pickupLon || '',
         mapUrl,
+        ...(buildCalendarLinks({
+          rid: String(r.rid),
+          uid: requesterUid,
+          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
+          pickupAddress: r.pickupAddress || '',
+          startYmd: (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10),
+          endYmd: (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10),
+        })),
         validatedBy: r.approvedByUsername || '',
         validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
       });
@@ -284,6 +326,9 @@ admin.purgeByYear = async function (req, res) {
     await dbLayer.removeReservation(rid);
     removed++;
   }
+  try {
+    realtime.emitCalendarUpdated({ kind: 'reservation', action: 'purged', year: y, removed });
+  } catch (e) {}
   res.json({ ok: true, removed });
 };
 
@@ -302,6 +347,9 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
     await dbLayer.removeSpecialEvent(eid);
     count++;
   }
+  try {
+    realtime.emitCalendarUpdated({ kind: 'special', action: 'purged', year: y, removed: count });
+  } catch (e) {}
   return res.json({ ok: true, removed: count });
 };
 
@@ -320,6 +368,9 @@ admin.purgeOutingsByYear = async function (req, res) {
     await dbLayer.removeOuting(oid);
     count++;
   }
+  try {
+    realtime.emitCalendarUpdated({ kind: 'outing', action: 'purged', year: y, removed: count });
+  } catch (e) {}
   return res.json({ ok: true, removed: count });
 };
 

package/lib/api.js

@@ -409,6 +409,19 @@ function eventsFor(resv) {
   const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds : (resv.itemId ? [resv.itemId] : []);
   const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : []);
 
+  // Calendar export links (only really useful to the reservation creator, but
+  // harmless to include for everyone; access is protected by signature).
+  const links = buildCalendarLinks({
+    type: 'reservation',
+    id: String(resv.rid),
+    uid: Number(resv.uid) || 0,
+    title: (Array.isArray(itemNames) && itemNames.length) ? `Location - ${String(itemNames[0])}` : 'Location',
+    details: (Array.isArray(itemNames) && itemNames.length) ? `Matériel: ${itemNames.join(', ')}` : '',
+    allDay: true,
+    startYmd: startIsoDate,
+    endYmd: endIsoDate,
+  });
+
   // One line = one material: return one calendar event per item
   const out = [];
   const count = Math.max(itemIds.length, itemNames.length, 1);
@@ -435,6 +448,8 @@ function eventsFor(resv) {
         itemNames: itemNames.filter(Boolean),
         itemIdLine: itemId,
         itemNameLine: itemName,
+        icsUrl: links.icsUrl,
+        googleCalUrl: links.googleCalUrl,
       },
     });
   }
@@ -446,6 +461,17 @@ function eventsForSpecial(ev) {
   const end = new Date(parseInt(ev.end, 10));
   const startIso = start.toISOString();
   const endIso = end.toISOString();
+  const links = buildCalendarLinks({
+    type: 'special',
+    id: String(ev.eid),
+    uid: Number(ev.uid) || 0,
+    title: String(ev.title || 'Évènement'),
+    details: String(ev.notes || ''),
+    location: String(ev.address || ''),
+    allDay: false,
+    start,
+    end,
+  });
   return {
     id: `special:${ev.eid}`,
     title: `${ev.title || 'Évènement'}`.trim(),
@@ -465,6 +491,8 @@ function eventsForSpecial(ev) {
       pickupLon: ev.lon || '',
       createdBy: ev.uid || 0,
       username: ev.username || '',
+      icsUrl: links.icsUrl,
+      googleCalUrl: links.googleCalUrl,
     },
   };
 }
@@ -475,6 +503,17 @@ function eventsForOuting(o) {
   const end = new Date(parseInt(o.end, 10));
   const startIso = start.toISOString();
   const endIso = end.toISOString();
+  const links = buildCalendarLinks({
+    type: 'outing',
+    id: String(o.oid),
+    uid: Number(o.uid) || 0,
+    title: String(o.title || 'Prévision de sortie'),
+    details: String(o.notes || ''),
+    location: String(o.address || ''),
+    allDay: false,
+    start,
+    end,
+  });
   return {
     id: `outing:${o.oid}`,
     title: `${o.title || 'Prévision de sortie'}`.trim(),
@@ -494,12 +533,89 @@ function eventsForOuting(o) {
       pickupLon: o.lon || '',
       createdBy: o.uid || 0,
       username: o.username || '',
+      icsUrl: links.icsUrl,
+      googleCalUrl: links.googleCalUrl,
     },
   };
 }
 
 const api = {};
 
+// --------------------
+// Calendar export helpers (ICS / Google Calendar template link)
+// --------------------
+const nconf = require.main.require('nconf');
+function baseUrl() {
+  try {
+    return String(nconf.get('url') || '').replace(/\/$/, '');
+  } catch (e) {
+    return '';
+  }
+}
+
+function hmacSecret() {
+  // Prefer NodeBB's instance secret if present.
+  try {
+    const s = String(nconf.get('secret') || '').trim();
+    if (s) return s;
+  } catch (e) {}
+  // Fallback: still deterministic per instance.
+  return 'calendar-onekite';
+}
+
+function signCalendarLink(type, id, uid) {
+  try {
+    const msg = `${String(type)}:${String(id)}:${String(uid || 0)}`;
+    return crypto.createHmac('sha256', hmacSecret()).update(msg).digest('hex');
+  } catch (e) {
+    return '';
+  }
+}
+
+function ymdToCompact(ymd) {
+  return String(ymd || '').replace(/-/g, '');
+}
+
+function dtToGCalUtc(dt) {
+  const d = (dt instanceof Date) ? dt : new Date(dt);
+  const iso = d.toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z');
+  // 20260116T120000Z style
+  return iso;
+}
+
+function buildCalendarLinks(opts) {
+  const type = String(opts.type || '').trim();
+  const id = String(opts.id || '').trim();
+  const uid = Number(opts.uid) || 0;
+  const title = String(opts.title || '').trim() || 'Évènement';
+  const details = String(opts.details || '').trim();
+  const location = String(opts.location || '').trim();
+  const isAllDay = !!opts.allDay;
+
+  // Signed ICS URL (public, but protected by signature for reservations).
+  const sig = signCalendarLink(type, id, uid);
+  const icsPath = `/plugins/calendar-onekite/ics/${encodeURIComponent(type)}/${encodeURIComponent(id)}?uid=${encodeURIComponent(String(uid))}&sig=${encodeURIComponent(sig)}`;
+  const icsUrl = `${baseUrl()}${icsPath}`;
+
+  // Google Calendar template URL.
+  // docs: action=TEMPLATE&text=...&dates=...&details=...&location=...
+  let dates = '';
+  if (isAllDay) {
+    // Google expects exclusive end date for all-day ranges.
+    dates = `${ymdToCompact(opts.startYmd)}/${ymdToCompact(opts.endYmd)}`;
+  } else {
+    dates = `${dtToGCalUtc(opts.start)}/${dtToGCalUtc(opts.end)}`;
+  }
+  const gcal = new URL('https://calendar.google.com/calendar/render');
+  gcal.searchParams.set('action', 'TEMPLATE');
+  gcal.searchParams.set('text', title);
+  if (dates) gcal.searchParams.set('dates', dates);
+  if (details) gcal.searchParams.set('details', details);
+  if (location) gcal.searchParams.set('location', location);
+
+  return { icsUrl, googleCalUrl: gcal.toString() };
+}
+
 function computeEtag(payload) {
   // Weak ETag is fine here: it is only used to skip identical JSON payloads.
   const hash = crypto.createHash('sha1').update(JSON.stringify(payload)).digest('hex');
@@ -1424,6 +1540,28 @@ api.approveReservation = async function (req, res) {
       pickupLon: r.pickupLon || '',
       mapUrl,
       paymentUrl: r.paymentUrl || '',
+      icsUrl: (buildCalendarLinks({
+        type: 'reservation',
+        id: String(r.rid),
+        uid: requesterUid,
+        title: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Location - ${r.itemNames.join(', ')}` : 'Location',
+        details: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Matériel: ${r.itemNames.join(', ')}` : (r.itemName ? `Matériel: ${r.itemName}` : ''),
+        location: r.pickupAddress || '',
+        allDay: true,
+        startYmd: (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10),
+        endYmd: (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10),
+      })).icsUrl,
+      googleCalUrl: (buildCalendarLinks({
+        type: 'reservation',
+        id: String(r.rid),
+        uid: requesterUid,
+        title: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Location - ${r.itemNames.join(', ')}` : 'Location',
+        details: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Matériel: ${r.itemNames.join(', ')}` : (r.itemName ? `Matériel: ${r.itemName}` : ''),
+        location: r.pickupAddress || '',
+        allDay: true,
+        startYmd: (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10),
+        endYmd: (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10),
+      })).googleCalUrl,
       validatedBy: r.approvedByUsername || '',
       validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
     });
@@ -1677,4 +1815,144 @@ api.purgeAudit = async function (req, res) {
   return res.json(result || { ok: true });
 };
 
+// --------------------
+// ICS export (for Google/Apple/etc.)
+// --------------------
+
+function icsEscape(str) {
+  return String(str || '')
+    .replace(/\\/g, '\\\\')
+    .replace(/\n/g, '\\n')
+    .replace(/\r/g, '')
+    .replace(/;/g, '\\;')
+    .replace(/,/g, '\\,');
+}
+
+function dtstampUtc() {
+  return new Date().toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z');
+}
+
+function toIcsUtc(dt) {
+  return new Date(dt).toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z');
+}
+
+function buildIcs({ uid, summary, description, location, allDay, startYmd, endYmd, start, end, url }) {
+  const lines = [];
+  lines.push('BEGIN:VCALENDAR');
+  lines.push('VERSION:2.0');
+  lines.push('PRODID:-//Calendar Onekite//EN');
+  lines.push('CALSCALE:GREGORIAN');
+  lines.push('METHOD:PUBLISH');
+  lines.push('BEGIN:VEVENT');
+  lines.push(`UID:${icsEscape(uid)}`);
+  lines.push(`DTSTAMP:${dtstampUtc()}`);
+  if (allDay) {
+    lines.push(`DTSTART;VALUE=DATE:${ymdToCompact(startYmd)}`);
+    lines.push(`DTEND;VALUE=DATE:${ymdToCompact(endYmd)}`);
+  } else {
+    lines.push(`DTSTART:${toIcsUtc(start)}`);
+    lines.push(`DTEND:${toIcsUtc(end)}`);
+  }
+  lines.push(`SUMMARY:${icsEscape(summary)}`);
+  if (description) lines.push(`DESCRIPTION:${icsEscape(description)}`);
+  if (location) lines.push(`LOCATION:${icsEscape(location)}`);
+  if (url) lines.push(`URL:${icsEscape(url)}`);
+  lines.push('END:VEVENT');
+  lines.push('END:VCALENDAR');
+  return lines.join('\r\n') + '\r\n';
+}
+
+api.getIcs = async function (req, res) {
+  try {
+    const type = String((req.params && req.params.type) || '').trim();
+    const id = String((req.params && req.params.id) || '').trim();
+    const uidQ = Number((req.query && req.query.uid) || 0) || 0;
+    const sigQ = String((req.query && req.query.sig) || '').trim();
+
+    if (!type || !id) {
+      return res.status(400).send('missing');
+    }
+
+    // Validate signature when present. For reservations we require it.
+    const expected = signCalendarLink(type, id, uidQ);
+    const hasValidSig = !!(sigQ && expected && sigQ === expected);
+
+    let ics = '';
+    let filename = `onekite-${type}-${id}.ics`;
+
+    if (type === 'reservation') {
+      if (!hasValidSig) return res.status(403).send('not-authorized');
+      const r = await dbLayer.getReservation(id);
+      if (!r) return res.status(404).send('not-found');
+      // Extra guard: signature uid must match the actual owner uid.
+      if (Number(r.uid) !== Number(uidQ)) return res.status(403).send('not-authorized');
+
+      const startYmd = (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate)))
+        ? String(r.startDate)
+        : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10);
+      const endYmd = (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate)))
+        ? String(r.endDate)
+        : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10);
+
+      const itemNames = Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : []);
+      const summary = itemNames.length ? `Location - ${itemNames.join(', ')}` : 'Location matériel';
+      const description = [
+        itemNames.length ? `Matériel: ${itemNames.join(', ')}` : '',
+        r.pickupTime ? `Heure de récupération: ${r.pickupTime}` : '',
+        r.pickupAddress ? `Adresse: ${r.pickupAddress}` : '',
+        r.notes ? `Notes: ${r.notes}` : '',
+      ].filter(Boolean).join('\n');
+
+      ics = buildIcs({
+        uid: `reservation-${id}@onekite`,
+        summary,
+        description,
+        location: String(r.pickupAddress || ''),
+        allDay: true,
+        startYmd,
+        endYmd,
+        url: `${baseUrl()}/calendar`,
+      });
+    } else if (type === 'special') {
+      const ev = await dbLayer.getSpecialEvent(id);
+      if (!ev) return res.status(404).send('not-found');
+      const start = new Date(parseInt(ev.start, 10));
+      const end = new Date(parseInt(ev.end, 10));
+      ics = buildIcs({
+        uid: `special-${id}@onekite`,
+        summary: String(ev.title || 'Évènement'),
+        description: String(ev.notes || ''),
+        location: String(ev.address || ''),
+        allDay: false,
+        start,
+        end,
+        url: `${baseUrl()}/calendar`,
+      });
+    } else if (type === 'outing') {
+      const o = await dbLayer.getOuting(id);
+      if (!o) return res.status(404).send('not-found');
+      const start = new Date(parseInt(o.start, 10));
+      const end = new Date(parseInt(o.end, 10));
+      ics = buildIcs({
+        uid: `outing-${id}@onekite`,
+        summary: String(o.title || 'Prévision de sortie'),
+        description: String(o.notes || ''),
+        location: String(o.address || ''),
+        allDay: false,
+        start,
+        end,
+        url: `${baseUrl()}/calendar`,
+      });
+    } else {
+      return res.status(400).send('unknown-type');
+    }
+
+    res.set('Content-Type', 'text/calendar; charset=utf-8');
+    res.set('Content-Disposition', `attachment; filename="${filename.replace(/[^a-zA-Z0-9_.-]/g, '_')}"`);
+    return res.status(200).send(ics);
+  } catch (err) {
+    return res.status(500).send('error');
+  }
+};
+
 module.exports = api;

package/lib/discord.js

@@ -216,7 +216,6 @@ function buildSimpleCalendarPayload(kind, label, entity, opts) {
       {
         title: embedTitle,
         url: calUrl,
-        description: kind === 'deleted' ? 'Une entrée a été annulée.' : 'Une nouvelle entrée a été créée.',
         fields,
         footer: { text: 'Onekite • Calendrier' },
         timestamp: new Date().toISOString(),

package/lib/helloassoWebhook.js

@@ -5,6 +5,7 @@ const crypto = require('crypto');
 const db = require.main.require('./src/database');
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
+const nconf = require.main.require('nconf');
 
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
@@ -12,6 +13,44 @@ const discord = require('./discord');
 const realtime = require('./realtime');
 const { formatFR } = require('./utils');
 
+function baseUrl() {
+  try { return String(nconf.get('url') || '').replace(/\/$/, ''); } catch (e) { return ''; }
+}
+
+function hmacSecret() {
+  try {
+    const s = String(nconf.get('secret') || '').trim();
+    if (s) return s;
+  } catch (e) {}
+  return 'calendar-onekite';
+}
+
+function signCalendarLink(type, id, uid) {
+  try {
+    return crypto.createHmac('sha256', hmacSecret()).update(`${String(type)}:${String(id)}:${String(uid || 0)}`).digest('hex');
+  } catch (e) { return ''; }
+}
+
+function ymdToCompact(ymd) { return String(ymd || '').replace(/-/g, ''); }
+
+function buildReservationCalendarLinks(r) {
+  const rid = String(r && r.rid ? r.rid : '');
+  const uid = Number(r && r.uid) || 0;
+  const sig = signCalendarLink('reservation', rid, uid);
+  const icsUrl = `${baseUrl()}/plugins/calendar-onekite/ics/reservation/${encodeURIComponent(rid)}?uid=${encodeURIComponent(String(uid))}&sig=${encodeURIComponent(sig)}`;
+  const startYmd = (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10);
+  const endYmd = (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10);
+  const itemNames = Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : []);
+  const title = itemNames.length ? `Location - ${itemNames.join(', ')}` : 'Location';
+  const gcal = new URL('https://calendar.google.com/calendar/render');
+  gcal.searchParams.set('action', 'TEMPLATE');
+  gcal.searchParams.set('text', title);
+  gcal.searchParams.set('dates', `${ymdToCompact(startYmd)}/${ymdToCompact(endYmd)}`);
+  if (r.pickupAddress) gcal.searchParams.set('location', String(r.pickupAddress));
+  if (r.notes) gcal.searchParams.set('details', String(r.notes));
+  return { icsUrl, googleCalUrl: gcal.toString() };
+}
+
 async function auditLog(action, actorUid, payload) {
   try {
     const uid = actorUid ? parseInt(actorUid, 10) : 0;
@@ -329,6 +368,7 @@ async function handler(req, res, next) {
         pickupTime: r.pickupTime || '',
         pickupAddress: r.pickupAddress || '',
         mapUrl,
+        ...(buildReservationCalendarLinks(r)),
       });
     }
 

package/library.js

@@ -88,6 +88,10 @@ Plugin.init = async function (params) {
   router.get('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.getOutingDetails);
   router.delete('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.deleteOuting);
 
+  // Calendar export (ICS)
+  // Note: reservations are protected by a signature in the querystring.
+  router.get('/plugins/calendar-onekite/ics/:type/:id', api.getIcs);
+
   // Admin API (JSON)
   const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "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": "2.0.44"
+  "version": "2.0.45"
 }

package/public/client.js

@@ -62,6 +62,35 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           }
         }
 
+        /* Calendar item action buttons (match calendar colors) */
+        .btn-onekite-special {
+          background: #8e44ad;
+          border-color: #8e44ad;
+          color: #fff;
+        }
+        .btn-onekite-special:hover {
+          filter: brightness(0.95);
+          color: #fff;
+        }
+        .btn-onekite-outing {
+          background: #2980b9;
+          border-color: #2980b9;
+          color: #fff;
+        }
+        .btn-onekite-outing:hover {
+          filter: brightness(0.95);
+          color: #fff;
+        }
+        .btn-onekite-location {
+          background: #27ae60;
+          border-color: #27ae60;
+          color: #fff;
+        }
+        .btn-onekite-location:hover {
+          filter: brightness(0.95);
+          color: #fff;
+        }
+
 /* Mobile FAB date range picker (single calendar) */
 .onekite-range-picker { user-select: none; }
 .onekite-range-header { display:flex; align-items:center; justify-content:space-between; gap:8px; margin-bottom:8px; }
@@ -1019,6 +1048,10 @@ function toDatetimeLocalValue(date) {
     const endDisplay = endInclusiveForDisplay(start, end);
 
     const messageHtml = `
+      <div class="mb-2">
+        <label class="form-label">Titre (facultatif)</label>
+        <input type="text" class="form-control" id="onekite-res-title" placeholder="Ex: ..." />
+      </div>
       <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
       <div class="mb-2"><strong>Matériel</strong></div>
@@ -1054,6 +1087,7 @@ function toDatetimeLocalValue(date) {
             label: 'Envoyer',
             className: 'btn-primary',
             callback: function () {
+              const title = (document.getElementById('onekite-res-title')?.value || '').trim();
               const cbs = Array.from(document.querySelectorAll('.onekite-item-cb')).filter(cb => cb.checked);
               if (!cbs.length) {
                 showAlert('error', 'Choisis au moins un matériel.');
@@ -1065,7 +1099,7 @@ function toDatetimeLocalValue(date) {
               const total = (sum / 100) * days;
               // Return the effective end date (exclusive) because duration shortcuts can
               // change the range without updating the original FullCalendar selection.
-              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
+              resolve({ title, itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
             },
           },
         },
@@ -1297,12 +1331,13 @@ function toDatetimeLocalValue(date) {
         }
       }
 
-      const buttons = {
-        close: { label: 'Annuler', className: 'btn-secondary' },
-        location: {
-          label: 'Location',
-          className: 'btn-primary',
-          callback: async () => {
+      // Buttons order matters for UX: put "Annuler" at bottom-right (last).
+      const buttons = {};
+
+      buttons.location = {
+        label: 'Location',
+        className: 'btn-onekite-location',
+        callback: async () => {
             try {
               isDialogOpen = true;
               if (!items || !items.length) {
@@ -1314,6 +1349,7 @@ function toDatetimeLocalValue(date) {
               const startDate = toLocalYmd(info.start);
               const endDate = (chosen && chosen.endDate) ? String(chosen.endDate) : toLocalYmd(info.end);
               const resp = await requestReservation({
+                title: (chosen && chosen.title) ? String(chosen.title) : '',
                 start: startDate,
                 end: endDate,
                 itemIds: chosen.itemIds,
@@ -1334,12 +1370,13 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
             }
             return true;
-          },
         },
-        outing: {
-          label: 'Prévision de sortie',
-          className: 'btn-outline-primary',
-          callback: async () => {
+      };
+
+      buttons.outing = {
+        label: 'Prévision de sortie',
+        className: 'btn-onekite-outing',
+        callback: async () => {
             try {
               isDialogOpen = true;
               const payload = await openOutingDialog(info);
@@ -1358,14 +1395,13 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
             }
             return true;
-          },
         },
       };
 
       if (canCreateSpecial) {
         buttons.special = {
           label: 'Évènement',
-          className: 'btn-outline-secondary',
+          className: 'btn-onekite-special',
           callback: async () => {
             try {
               isDialogOpen = true;
@@ -1394,6 +1430,8 @@ function toDatetimeLocalValue(date) {
         };
       }
 
+      buttons.cancel = { label: 'Annuler', className: 'btn-danger' };
+
       bootbox.dialog({
         title: 'Créer',
         message: '<div class="text-muted">Que veux-tu créer sur ces dates ?</div>',
@@ -1541,13 +1579,19 @@ function toDatetimeLocalValue(date) {
               pickupLat: details.lat || details.pickupLat || p0.pickupLat,
               pickupLon: details.lon || details.pickupLon || p0.pickupLon,
             });
-          } else if (p0.type === 'outing' && p0.oid) {
-            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(String(p0.oid))}`);
-            p = Object.assign({}, p0, details, {
-              pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
-              pickupLat: details.lat || details.pickupLat || p0.pickupLat,
-              pickupLon: details.lon || details.pickupLon || p0.pickupLon,
-            });
+          } else if (p0.type === 'outing') {
+            // After a create+refetch cycle, FullCalendar can briefly provide an
+            // event object without the full extendedProps we expect. Always
+            // attempt to resolve the oid from either extendedProps or the event id.
+            const oidGuess = String(p0.oid || ev.id || '').replace(/^outing:/, '').trim();
+            if (oidGuess) {
+              const details = await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oidGuess)}`);
+              p = Object.assign({}, p0, details, {
+                pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
+                pickupLat: details.lat || details.pickupLat || p0.pickupLat,
+                pickupLon: details.lon || details.pickupLon || p0.pickupLon,
+              });
+            }
           }
         } catch (e) {
           // ignore detail fetch errors; fall back to minimal props
@@ -1565,6 +1609,14 @@ function toDatetimeLocalValue(date) {
             const lon = Number(p.pickupLon || p.lon);
             const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
             const notes = String(p.notes || '').trim();
+            const icsUrl = String(p.icsUrl || (p.extendedProps && p.extendedProps.icsUrl) || '').trim();
+            const googleCalUrl = String(p.googleCalUrl || (p.extendedProps && p.extendedProps.googleCalUrl) || '').trim();
+            const calHtml = (icsUrl || googleCalUrl)
+              ? `<div class="mb-2"><strong>Calendrier</strong><br>
+                  ${icsUrl ? `<a href="${escapeHtml(icsUrl)}" target="_blank" rel="noopener" class="me-3"><i class="fa fa-calendar-plus"></i> Ajouter (ICS)</a>` : ''}
+                  ${googleCalUrl ? `<a href="${escapeHtml(googleCalUrl)}" target="_blank" rel="noopener"><i class="fa fa-calendar"></i> Google Calendar</a>` : ''}
+                </div>`
+              : '';
             const addrHtml = addr
               ? (hasCoords
                 ? `<a href="#" class="onekite-map-link" data-address="${escapeHtml(addr)}" data-lat="${escapeHtml(String(lat))}" data-lon="${escapeHtml(String(lon))}">${escapeHtml(addr)}</a>`
@@ -1574,18 +1626,19 @@ function toDatetimeLocalValue(date) {
               <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
               ${userLine}
               <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
+              ${calHtml}
               ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
               ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
-            bootbox.dialog({
+            const dlg = bootbox.dialog({
               title: 'Évènement',
               message: html,
               buttons: {
                 close: { label: 'Fermer', className: 'btn-secondary' },
                 ...(canDel ? {
                   del: {
-                    label: 'Supprimer',
+                    label: 'Annuler',
                     className: 'btn-danger',
                     callback: async () => {
                       try {
@@ -1601,6 +1654,12 @@ function toDatetimeLocalValue(date) {
                 } : {}),
               },
             });
+            try {
+              dlg.on('hidden.bs.modal', function () { isDialogOpen = false; });
+            } catch (e) {
+              // Fallback: never leave the dialog lock stuck.
+              isDialogOpen = false;
+            }
             return;
           }
 
@@ -1614,6 +1673,14 @@ function toDatetimeLocalValue(date) {
             const lon = Number(p.lon || p.pickupLon);
             const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
             const notes = String(p.notes || '').trim();
+            const icsUrl = String(p.icsUrl || (p.extendedProps && p.extendedProps.icsUrl) || '').trim();
+            const googleCalUrl = String(p.googleCalUrl || (p.extendedProps && p.extendedProps.googleCalUrl) || '').trim();
+            const calHtml = (icsUrl || googleCalUrl)
+              ? `<div class="mb-2"><strong>Calendrier</strong><br>
+                  ${icsUrl ? `<a href="${escapeHtml(icsUrl)}" target="_blank" rel="noopener" class="me-3"><i class="fa fa-calendar-plus"></i> Ajouter (ICS)</a>` : ''}
+                  ${googleCalUrl ? `<a href="${escapeHtml(googleCalUrl)}" target="_blank" rel="noopener"><i class="fa fa-calendar"></i> Google Calendar</a>` : ''}
+                </div>`
+              : '';
             const addrHtml = addr
               ? (hasCoords
                 ? `<a href="#" class="onekite-map-link" data-address="${escapeHtml(addr)}" data-lat="${escapeHtml(String(lat))}" data-lon="${escapeHtml(String(lon))}">${escapeHtml(addr)}</a>`
@@ -1623,11 +1690,12 @@ function toDatetimeLocalValue(date) {
               <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
               ${userLine}
               <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
+              ${calHtml}
               ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
               ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteOuting);
-            bootbox.dialog({
+            const dlg = bootbox.dialog({
               title: 'Prévision de sortie',
               message: html,
               buttons: {
@@ -1650,6 +1718,11 @@ function toDatetimeLocalValue(date) {
                 } : {}),
               },
             });
+            try {
+              dlg.on('hidden.bs.modal', function () { isDialogOpen = false; });
+            } catch (e) {
+              isDialogOpen = false;
+            }
             return;
           }
         } catch (e) {
@@ -1673,6 +1746,9 @@ function toDatetimeLocalValue(date) {
       })();
         const period = `${formatDt(ev.start)} → ${formatDt(ev.end)}`;
 
+        const icsUrl = String(p.icsUrl || (ev.extendedProps && ev.extendedProps.icsUrl) || '').trim();
+        const googleCalUrl = String(p.googleCalUrl || (ev.extendedProps && ev.extendedProps.googleCalUrl) || '').trim();
+
         const approvedBy = String(p.approvedByUsername || '').trim();
         const validatedByHtml = approvedBy
           ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/user/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
@@ -1712,6 +1788,10 @@ function toDatetimeLocalValue(date) {
           ${userLine}
           <div class="mb-2"><strong>Matériel</strong><br>${itemsHtml}</div>
           <div class="mb-2"><strong>Période</strong><br>${period}</div>
+          ${ (icsUrl || googleCalUrl) ? `<div class="mb-2" id="onekite-cal-links" style="display:none;"><strong>Calendrier</strong><br>
+              ${icsUrl ? `<a href="${escapeHtml(icsUrl)}" target="_blank" rel="noopener" class="me-3"><i class="fa fa-calendar-plus"></i> Ajouter (ICS)</a>` : ''}
+              ${googleCalUrl ? `<a href="${escapeHtml(googleCalUrl)}" target="_blank" rel="noopener"><i class="fa fa-calendar"></i> Google Calendar</a>` : ''}
+            </div>` : '' }
           ${validatedByHtml}
           ${pickupHtml}
           ${refusedReasonHtml}
@@ -1734,6 +1814,22 @@ function toDatetimeLocalValue(date) {
         const buttons = {
           close: { label: 'Fermer', className: 'btn-secondary' },
         };
+
+        const cancelBtn = showCancel ? {
+          label: 'Annuler',
+          className: 'btn-danger',
+          callback: async () => {
+            try {
+              if (!lockAction(`cancel:${rid}`, 1200)) return false;
+              await cancelReservation(rid);
+              showAlert('success', 'Réservation annulée.');
+              invalidateEventsCache();
+              scheduleRefetch(calendar);
+            } catch (e) {
+              showAlert('error', 'Annulation impossible.');
+            }
+          },
+        } : null;
         if (showPay) {
           buttons.pay = {
             label: 'Payer maintenant',
@@ -1746,23 +1842,6 @@ function toDatetimeLocalValue(date) {
             },
           };
         }
-        if (showCancel) {
-          buttons.cancel = {
-            label: 'Annuler',
-            className: 'btn-outline-warning',
-            callback: async () => {
-              try {
-                if (!lockAction(`cancel:${rid}`, 1200)) return false;
-                await cancelReservation(rid);
-                showAlert('success', 'Réservation annulée.');
-                invalidateEventsCache();
-                scheduleRefetch(calendar);
-              } catch (e) {
-                showAlert('error', 'Annulation impossible.');
-              }
-            },
-          };
-        }
         if (showModeration) {
           buttons.refuse = {
             label: 'Refuser',
@@ -1962,11 +2041,32 @@ function toDatetimeLocalValue(date) {
           };
         }
 
-        bootbox.dialog({
+        // Put the cancellation action at the bottom-right (last button).
+        if (cancelBtn) {
+          buttons.cancel = cancelBtn;
+        }
+
+        const dlg = bootbox.dialog({
           title: 'Réservation',
           message: baseHtml,
           buttons,
         });
+
+        // Only the creator should see the "Ajouter à mon calendrier" links for reservations.
+        try {
+          dlg.on('shown.bs.modal', () => {
+            try {
+              const cal = document.getElementById('onekite-cal-links');
+              if (cal) {
+                cal.style.display = isOwner ? 'block' : 'none';
+              }
+            } catch (e) {}
+
+          });
+          dlg.on('hidden.bs.modal', () => { isDialogOpen = false; });
+        } catch (e) {
+          isDialogOpen = false;
+        }
       },
     });
 

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

@@ -83,18 +83,6 @@
             <div class="form-text">Si vide, aucune notification Discord n'est envoyée.</div>
           </div>
 
-          <div class="mb-3">
-            <label class="form-label">Webhook URL — Évènements</label>
-            <input class="form-control" name="discordWebhookUrlEvents" placeholder="https://discord.com/api/webhooks/...">
-            <div class="form-text">Canal Discord dédié aux notifications d'évènements (création / annulation).</div>
-          </div>
-
-          <div class="mb-3">
-            <label class="form-label">Webhook URL — Sorties</label>
-            <input class="form-control" name="discordWebhookUrlOutings" placeholder="https://discord.com/api/webhooks/...">
-            <div class="form-text">Canal Discord dédié aux notifications de sorties (création / annulation).</div>
-          </div>
-
           <div class="mb-3">
             <label class="form-label">Envoyer une notification à la demande</label>
             <select class="form-select" name="discordNotifyOnRequest">
@@ -173,6 +161,13 @@
         <h4>Évènements (autre couleur)</h4>
         <div class="form-text mb-3">Permet de créer des évènements horaires (début/fin) avec adresse (Leaflet) et notes.</div>
 
+        <h4 class="mt-3">Discord</h4>
+        <div class="mb-3">
+          <label class="form-label">Webhook URL — Évènements</label>
+          <input class="form-control" name="discordWebhookUrlEvents" placeholder="https://discord.com/api/webhooks/...">
+          <div class="form-text">Canal Discord dédié aux notifications d'évènements (création / annulation).</div>
+        </div>
+
         <div class="mb-3">
           <label class="form-label">Groupes autorisés à créer des évènements (csv)</label>
           <input class="form-control" name="specialCreatorGroups" placeholder="ex: staff,instructors">
@@ -183,6 +178,14 @@
           <input class="form-control" name="specialDeleterGroups" placeholder="Si vide: même liste que la création">
         </div>
 
+        <hr class="my-4" />
+        <h4>Discord</h4>
+        <div class="mb-3">
+          <label class="form-label">Webhook URL — Évènements</label>
+          <input class="form-control" name="discordWebhookUrlEvents" placeholder="https://discord.com/api/webhooks/...">
+          <div class="form-text">Canal Discord dédié aux notifications d'évènements (création / annulation).</div>
+        </div>
+
         <hr class="my-4" />
         <h4>Purge des évènements</h4>
         <div class="d-flex gap-2 align-items-center">
@@ -196,6 +199,13 @@
         <h4>Sorties (prévisions)</h4>
         <div class="form-text mb-3">Prévisions de sortie (autre couleur) créées par les utilisateurs autorisés à faire une demande de location. Les utilisateurs peuvent annuler leurs propres prévisions. Les droits sont ceux des locations.</div>
 
+        <h4 class="mt-3">Discord</h4>
+        <div class="mb-3">
+          <label class="form-label">Webhook URL — Sorties</label>
+          <input class="form-control" name="discordWebhookUrlOutings" placeholder="https://discord.com/api/webhooks/...">
+          <div class="form-text">Canal Discord dédié aux notifications de sorties (création / annulation).</div>
+        </div>
+
         <hr class="my-4" />
         <h4>Purge des sorties</h4>
         <div class="d-flex gap-2 align-items-center">

package/templates/emails/calendar-onekite_approved.tpl

@@ -14,6 +14,16 @@
 
 <p>{dateRange}</p>
 
+<!-- IF icsUrl -->
+<p>
+  📅 <strong>Ajouter à mon calendrier :</strong>
+  <a href="{icsUrl}">ICS</a>
+  <!-- IF googleCalUrl -->
+  | <a href="{googleCalUrl}">Google Calendar</a>
+  <!-- ENDIF googleCalUrl -->
+</p>
+<!-- ENDIF icsUrl -->
+
 <!-- IF pickupTime -->
 <p><strong>Heure de récupération :</strong> {pickupTime}</p>
 <!-- ENDIF pickupTime -->

package/templates/emails/calendar-onekite_paid.tpl

@@ -10,6 +10,16 @@
 
 <p>{dateRange}</p>
 
+<!-- IF icsUrl -->
+<p>
+  📅 <strong>Ajouter à mon calendrier :</strong>
+  <a href="{icsUrl}">ICS</a>
+  <!-- IF googleCalUrl -->
+  | <a href="{googleCalUrl}">Google Calendar</a>
+  <!-- ENDIF googleCalUrl -->
+</p>
+<!-- ENDIF icsUrl -->
+
 <!-- IF pickupTime -->
 <p><strong>Heure de récupération :</strong> {pickupTime}</p>
 <!-- ENDIF pickupTime -->