nodebb-plugin-onekite-calendar 2.0.41 → 2.0.43

package/lib/admin.js

@@ -305,6 +305,24 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
   return res.json({ ok: true, removed: count });
 };
 
+admin.purgeOutingsByYear = async function (req, res) {
+  const year = (req.body && req.body.year ? String(req.body.year) : '').trim();
+  if (!/^\d{4}$/.test(year)) {
+    return res.status(400).json({ error: 'invalid-year' });
+  }
+  const y = parseInt(year, 10);
+  const startTs = new Date(Date.UTC(y, 0, 1)).getTime();
+  const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
+
+  const ids = await dbLayer.listOutingIdsByStartRange(startTs, endTs, 200000);
+  let count = 0;
+  for (const oid of ids) {
+    await dbLayer.removeOuting(oid);
+    count++;
+  }
+  return res.json({ ok: true, removed: count });
+};
+
 // Debug endpoint to validate HelloAsso connectivity and item loading
 
 

package/lib/api.js

@@ -359,17 +359,30 @@ async function auditLog(action, actorUid, payload) {
   }
 }
 
-async function canCreateSpecial(uid, settings, startTs) {
-  // Special events ("Évènements" / "Sorties") use the same rights as creating a reservation.
-  // startTs is used to resolve the auto yearly group (onekite-ffvl-YYYY).
-  const ts = Number(startTs) || Date.now();
-  return await canRequest(uid, settings, ts);
+async function canCreateSpecial(uid, settings) {
+  if (!uid) return false;
+  try {
+    const isAdmin = await groups.isMember(uid, 'administrators');
+    if (isAdmin) return true;
+  } catch (e) {}
+  const allowed = normalizeAllowedGroups(settings.specialCreatorGroups || '');
+  if (!allowed.length) return false;
+  if (await userInAnyGroup(uid, allowed)) return true;
+
+  return false;
 }
 
-async function canDeleteSpecial(uid, settings, startTs) {
-  // Deletion rights are the same as creation rights (creatorGroups).
-  const ts = Number(startTs) || Date.now();
-  return await canRequest(uid, settings, ts);
+async function canDeleteSpecial(uid, settings) {
+  if (!uid) return false;
+  try {
+    const isAdmin = await groups.isMember(uid, 'administrators');
+    if (isAdmin) return true;
+  } catch (e) {}
+  const allowed = normalizeAllowedGroups(settings.specialDeleterGroups || settings.specialCreatorGroups || '');
+  if (!allowed.length) return false;
+  if (await userInAnyGroup(uid, allowed)) return true;
+
+  return false;
 }
 
 function eventsFor(resv) {
@@ -429,36 +442,23 @@ function eventsFor(resv) {
 }
 
 function eventsForSpecial(ev) {
-  const kind = String(ev.kind || 'event');
   const start = new Date(parseInt(ev.start, 10));
   const end = new Date(parseInt(ev.end, 10));
   const startIso = start.toISOString();
   const endIso = end.toISOString();
-
-  // Color coding:
-  // - event: purple
-  // - outing: blue
-  const palette = (kind === 'outing')
-    ? { bg: '#0d6efd', border: '#0d6efd' }
-    : { bg: '#8e44ad', border: '#8e44ad' };
-
-  const defaultTitle = (kind === 'outing') ? 'Sortie' : 'Évènement';
-
   return {
     id: `special:${ev.eid}`,
-    title: `${ev.title || defaultTitle}`.trim(),
+    title: `${ev.title || 'Évènement'}`.trim(),
     allDay: false,
     start: startIso,
     end: endIso,
-    backgroundColor: palette.bg,
-    borderColor: palette.border,
+    backgroundColor: '#8e44ad',
+    borderColor: '#8e44ad',
     textColor: '#ffffff',
     extendedProps: {
       type: 'special',
-      kind,
       eid: ev.eid,
-      kind: String(ev.kind || 'event'),
-    title: ev.title || '',
+      title: ev.title || '',
       notes: ev.notes || '',
       pickupAddress: ev.address || '',
       pickupLat: ev.lat || '',
@@ -469,6 +469,35 @@ function eventsForSpecial(ev) {
   };
 }
 
+
+function eventsForOuting(o) {
+  const start = new Date(parseInt(o.start, 10));
+  const end = new Date(parseInt(o.end, 10));
+  const startIso = start.toISOString();
+  const endIso = end.toISOString();
+  return {
+    id: `outing:${o.oid}`,
+    title: `${o.title || 'Prévision de sortie'}`.trim(),
+    allDay: false,
+    start: startIso,
+    end: endIso,
+    backgroundColor: '#2980b9',
+    borderColor: '#2980b9',
+    textColor: '#ffffff',
+    extendedProps: {
+      type: 'outing',
+      oid: o.oid,
+      title: o.title || '',
+      notes: o.notes || '',
+      pickupAddress: o.address || '',
+      pickupLat: o.lat || '',
+      pickupLon: o.lon || '',
+      createdBy: o.uid || 0,
+      username: o.username || '',
+    },
+  };
+}
+
 const api = {};
 
 function computeEtag(payload) {
@@ -493,8 +522,8 @@ api.getEvents = async function (req, res) {
   const settings = await meta.settings.get('calendar-onekite');
   const canMod = req.uid ? await canValidate(req.uid, settings) : false;
   const widgetMode = String((req.query && req.query.widget) || '') === '1';
-  const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings, Date.now()) : false;
-  const canSpecialDelete = req.uid ? await canDeleteSpecial(req.uid, settings, Date.now()) : false;
+  const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings) : false;
+  const canSpecialDelete = req.uid ? await canDeleteSpecial(req.uid, settings) : false;
 
   // Fetch a wider window because an event can start before the query range
   // and still overlap.
@@ -611,7 +640,7 @@ api.getEvents = async function (req, res) {
           type: 'special',
           eid: sev.eid,
           canCreateSpecial: canSpecialCreate,
-          canDeleteSpecial: canSpecialDeleteResolved,
+          canDeleteSpecial: canSpecialDelete,
         },
       };
       if (sev.username && (canMod || canSpecialDelete || (req.uid && String(req.uid) === String(sev.uid)))) {
@@ -623,6 +652,41 @@ api.getEvents = async function (req, res) {
     // ignore
   }
 
+
+  // Outings (prévisions de sortie)
+  try {
+    const outingIds = await dbLayer.listOutingIdsByStartRange(wideStart, endTs, 8000);
+    const outings = await dbLayer.getOutings(outingIds);
+    for (const o of (outings || [])) {
+      if (!o) continue;
+      const oStart = parseInt(o.start, 10);
+      const oEnd = parseInt(o.end, 10);
+      if (!(oStart < endTs && startTs < oEnd)) continue;
+      const full = eventsForOuting(o);
+      const minimal = {
+        id: full.id,
+        title: full.title,
+        allDay: full.allDay,
+        start: full.start,
+        end: full.end,
+        backgroundColor: full.backgroundColor,
+        borderColor: full.borderColor,
+        textColor: full.textColor,
+        extendedProps: {
+          type: 'outing',
+          oid: o.oid,
+          canDeleteOuting: canMod || (req.uid && String(req.uid) === String(o.uid)),
+        },
+      };
+      if (o.username && (canMod || (req.uid && String(req.uid) === String(o.uid)))) {
+        minimal.extendedProps.username = String(o.username);
+      }
+      out.push(minimal);
+    }
+  } catch (e) {
+    // ignore
+  }
+
   // Stable ordering -> stable ETag
   out.sort((a, b) => {
     const as = String(a.start || '');
@@ -696,19 +760,17 @@ api.getSpecialEventDetails = async function (req, res) {
 
   const settings = await meta.settings.get('calendar-onekite');
   const canMod = await canValidate(uid, settings);
+  const canSpecialDelete = await canDeleteSpecial(uid, settings);
 
   const eid = String(req.params.eid || '').trim();
   if (!eid) return res.status(400).json({ error: 'missing-eid' });
   const ev = await dbLayer.getSpecialEvent(eid);
   if (!ev) return res.status(404).json({ error: 'not-found' });
 
-  const canSpecialDeleteResolved = await canDeleteSpecial(uid, settings, ev && ev.start ? Number(ev.start) : Date.now());
-
   // Anyone who can see the calendar can view special events, but creator username
   // is only visible to moderators/allowed users or the creator.
   const out = {
     eid: ev.eid,
-    kind: String(ev.kind || 'event'),
     title: ev.title || '',
     start: ev.start,
     end: ev.end,
@@ -716,9 +778,9 @@ api.getSpecialEventDetails = async function (req, res) {
     lat: ev.lat || '',
     lon: ev.lon || '',
     notes: ev.notes || '',
-    canDeleteSpecial: canSpecialDeleteResolved,
+    canDeleteSpecial: canSpecialDelete,
   };
-  if (ev.username && (canMod || canSpecialDeleteResolved || (uid && String(uid) === String(ev.uid)))) {
+  if (ev.username && (canMod || canSpecialDelete || (uid && String(uid) === String(ev.uid)))) {
     out.username = String(ev.username);
   }
   return res.json(out);
@@ -730,28 +792,37 @@ api.getCapabilities = async function (req, res) {
   const canMod = uid ? await canValidate(uid, settings) : false;
   res.json({
     canModerate: canMod,
-    canCreateSpecial: uid ? await canCreateSpecial(uid, settings, Date.now()) : false,
-    canDeleteSpecial: uid ? await canDeleteSpecial(uid, settings, Date.now()) : false,
+    canCreateSpecial: uid ? await canCreateSpecial(uid, settings) : false,
+    canDeleteSpecial: uid ? await canDeleteSpecial(uid, settings) : false,
+    canCreateOuting: uid ? await canRequest(uid, settings, Date.now()) : false,
   });
 };
 
 api.createSpecialEvent = async function (req, res) {
   const settings = await meta.settings.get('calendar-onekite');
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+  const ok = await canCreateSpecial(req.uid, settings);
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
-  const kind = String((req.body && req.body.kind) || 'event').trim().toLowerCase();
-  const safeKind = (kind === 'outing') ? 'outing' : 'event';
-
+  const title = String((req.body && req.body.title) || '').trim() || 'Évènement';
   const startTs = toTs(req.body && req.body.start);
   const endTs = toTs(req.body && req.body.end);
   if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
     return res.status(400).json({ error: 'bad-dates' });
   }
 
-  const ok = await canCreateSpecial(req.uid, settings, startTs);
-  if (!ok) return res.status(403).json({ error: 'not-allowed' });
-
-  const title = String((req.body && req.body.title) || '').trim() || (safeKind === 'outing' ? 'Sortie' : 'Évènement');
+  // Business rule: nothing can be created in the past.
+  try {
+    const today0 = new Date();
+    today0.setHours(0, 0, 0, 0);
+    const today0ts = today0.getTime();
+    if (startTs < today0ts) {
+      return res.status(400).json({
+        error: 'date-too-soon',
+        message: "Impossible de créer pour une date passée.",
+      });
+    }
+  } catch (e) {}
   const address = String((req.body && req.body.address) || '').trim();
   const notes = String((req.body && req.body.notes) || '').trim();
   const lat = String((req.body && req.body.lat) || '').trim();
@@ -761,7 +832,6 @@ api.createSpecialEvent = async function (req, res) {
   const eid = crypto.randomUUID();
   const ev = {
     eid,
-    kind: safeKind,
     title,
     start: String(startTs),
     end: String(endTs),
@@ -773,42 +843,142 @@ api.createSpecialEvent = async function (req, res) {
     username: u && u.username ? String(u.username) : '',
     createdAt: String(Date.now()),
   };
-
   await dbLayer.saveSpecialEvent(ev);
 
-  // Discord notifications (separate webhooks per kind)
   try {
-    await discord.notifySpecialEvent(settings, 'created', ev);
+    await discord.notifySpecialEventCreated(settings, ev);
   } catch (e) {}
 
   // Real-time refresh for all viewers
-  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'created', eid: ev.eid, specialKind: ev.kind });
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'created', eid: ev.eid });
   res.json({ ok: true, eid });
 };
 
 api.deleteSpecialEvent = async function (req, res) {
   const settings = await meta.settings.get('calendar-onekite');
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
-
+  const ok = await canDeleteSpecial(req.uid, settings);
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
   const eid = String(req.params.eid || '').replace(/^special:/, '').trim();
   if (!eid) return res.status(400).json({ error: 'bad-id' });
+  await dbLayer.removeSpecialEvent(eid);
 
-  const ev = await dbLayer.getSpecialEvent(eid);
-  if (!ev) return res.status(404).json({ error: 'not-found' });
+  try {
+    await discord.notifySpecialEventDeleted(settings, Object.assign({}, { eid }, { deletedBy: String(req.uid || '') }));
+  } catch (e) {}
+
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid });
+  res.json({ ok: true });
+};
+
+api.getOutingDetails = async function (req, res) {
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const settings = await meta.settings.get('calendar-onekite');
+  const canMod = await canValidate(uid, settings);
+
+  const oid = String(req.params.oid || '').trim();
+  if (!oid) return res.status(400).json({ error: 'missing-oid' });
+  const o = await dbLayer.getOuting(oid);
+  if (!o) return res.status(404).json({ error: 'not-found' });
+
+  const out = {
+    oid: o.oid,
+    title: o.title || '',
+    start: o.start,
+    end: o.end,
+    address: o.address || '',
+    lat: o.lat || '',
+    lon: o.lon || '',
+    notes: o.notes || '',
+    canDeleteOuting: canMod || (uid && String(uid) === String(o.uid)),
+  };
+  if (o.username && (canMod || (uid && String(uid) === String(o.uid)))) {
+    out.username = String(o.username);
+  }
+  return res.json(out);
+};
 
-  const canSpecialDeleteResolved = await canDeleteSpecial(uid, settings, ev && ev.start ? Number(ev.start) : Date.now());
+api.createOuting = async function (req, res) {
+  const settings = await meta.settings.get('calendar-onekite');
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const ok = await canDeleteSpecial(req.uid, settings, ev && ev.start ? Number(ev.start) : Date.now());
+  const startTs = toTs(req.body && req.body.start);
+  const ok = await canRequest(req.uid, settings, startTs);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
-  await dbLayer.removeSpecialEvent(eid);
+  const title = String((req.body && req.body.title) || '').trim() || 'Prévision de sortie';
+  const endTs = toTs(req.body && req.body.end);
+  if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
+    return res.status(400).json({ error: 'bad-dates' });
+  }
+
+  // Business rule: nothing can be created in the past.
+  try {
+    const today0 = new Date();
+    today0.setHours(0, 0, 0, 0);
+    const today0ts = today0.getTime();
+    if (startTs < today0ts) {
+      return res.status(400).json({
+        error: 'date-too-soon',
+        message: "Impossible de créer pour une date passée.",
+      });
+    }
+  } catch (e) {}
+
+  const address = String((req.body && req.body.address) || '').trim();
+  const notes = String((req.body && req.body.notes) || '').trim();
+  const lat = String((req.body && req.body.lat) || '').trim();
+  const lon = String((req.body && req.body.lon) || '').trim();
+
+  const u = await user.getUserFields(req.uid, ['username']);
+  const oid = crypto.randomUUID();
+  const o = {
+    oid,
+    title,
+    start: String(startTs),
+    end: String(endTs),
+    address,
+    notes,
+    lat,
+    lon,
+    uid: String(req.uid),
+    username: u && u.username ? String(u.username) : '',
+    createdAt: String(Date.now()),
+  };
+  await dbLayer.saveOuting(o);
 
   try {
-    await discord.notifySpecialEvent(settings, 'deleted', Object.assign({ eid }, ev || {}));
+    await discord.notifyOutingCreated(settings, o);
   } catch (e) {}
 
-  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid, specialKind: ev && ev.kind ? String(ev.kind) : 'event' });
-  res.json({ ok: true });
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'created', oid: o.oid });
+  return res.json({ ok: true, oid });
+};
+
+api.deleteOuting = async function (req, res) {
+  const settings = await meta.settings.get('calendar-onekite');
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
+  if (!oid) return res.status(400).json({ error: 'bad-id' });
+
+  const o = await dbLayer.getOuting(oid);
+  if (!o) return res.status(404).json({ error: 'not-found' });
+
+  const canMod = await canValidate(req.uid, settings);
+  const isOwner = String(o.uid) === String(req.uid);
+  if (!canMod && !isOwner) return res.status(403).json({ error: 'not-allowed' });
+
+  await dbLayer.removeOuting(oid);
+
+  try {
+    await discord.notifyOutingDeleted(settings, Object.assign({}, o, { deletedBy: String(req.uid || '') }));
+  } catch (e) {}
+
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'deleted', oid });
+  return res.json({ ok: true });
 };
 
 api.getItems = async function (req, res) {

package/lib/db.js

@@ -10,6 +10,10 @@ const KEY_CHECKOUT_INTENT_TO_RID = 'calendar-onekite:helloasso:checkoutIntentToR
 const KEY_SPECIAL_ZSET = 'calendar-onekite:special';
 const KEY_SPECIAL_OBJ = (eid) => `calendar-onekite:special:${eid}`;
 
+// Outings (previsions de sortie)
+const KEY_OUTING_ZSET = 'calendar-onekite:outings';
+const KEY_OUTING_OBJ = (oid) => `calendar-onekite:outings:${oid}`;
+
 // Maintenance (simple ON/OFF per item, no dates)
 const KEY_MAINTENANCE_ZSET = 'calendar-onekite:maintenance:itemIds';
 
@@ -26,6 +30,10 @@ function specialKey(eid) {
   return KEY_SPECIAL_OBJ(eid);
 }
 
+function outingKey(oid) {
+  return KEY_OUTING_OBJ(oid);
+}
+
 async function getReservation(rid) {
   return await db.getObject(KEY_OBJ(rid));
 }
@@ -208,6 +216,34 @@ module.exports = {
     const stop = Math.max(0, (parseInt(limit, 10) || 2000) - 1);
     return await db.getSortedSetRangeByScore(KEY_SPECIAL_ZSET, start, stop, startTs, endTs);
   },
+
+  // Outings
+  getOuting: async (oid) => await db.getObject(KEY_OUTING_OBJ(oid)),
+  getOutings: async (oids) => {
+    const ids = Array.isArray(oids) ? oids.filter(Boolean) : [];
+    if (!ids.length) return [];
+    const keys = ids.map(outingKey);
+    const rows = await db.getObjects(keys);
+    return (rows || []).map((row, idx) => {
+      if (!row) return null;
+      if (!row.oid) row.oid = String(ids[idx]);
+      return row;
+    });
+  },
+  saveOuting: async (o) => {
+    await db.setObject(KEY_OUTING_OBJ(o.oid), o);
+    await db.sortedSetAdd(KEY_OUTING_ZSET, o.start, o.oid);
+  },
+  removeOuting: async (oid) => {
+    await db.sortedSetRemove(KEY_OUTING_ZSET, oid);
+    await db.delete(KEY_OUTING_OBJ(oid));
+  },
+  listOutingIdsByStartRange: async (startTs, endTs, limit = 5000) => {
+    const start = 0;
+    const stop = Math.max(0, (parseInt(limit, 10) || 5000) - 1);
+    return await db.getSortedSetRangeByScore(KEY_OUTING_ZSET, start, stop, startTs, endTs);
+  },
+
   listReservationIdsByStartRange,
   listAllReservationIds,
 

package/lib/discord.js

@@ -184,39 +184,39 @@ async function notifyReservationCancelled(settings, reservation) {
 }
 
 
-function buildSpecialWebhookPayload(action, ev) {
-  const kind = String((ev && ev.kind) || 'event');
-  const webhookUsername = kind === 'outing'
-    ? (action === 'deleted' ? 'Onekite • Sortie • Annulation' : 'Onekite • Sortie')
-    : (action === 'deleted' ? 'Onekite • Évènement • Annulation' : 'Onekite • Évènement');
 
-  const calUrl = 'https://www.onekite.com/calendar';
-  const title = kind === 'outing'
-    ? (action === 'deleted' ? '❌ Sortie annulée' : '🗓️ Nouvelle sortie')
-    : (action === 'deleted' ? '❌ Évènement annulé' : '📣 Nouvel évènement');
+// --------------------------
+// Special events & outings
+// --------------------------
+
+function buildSimpleCalendarPayload(kind, label, entity, opts) {
+  const options = opts || {};
+  const calUrl = options.calUrl || 'https://www.onekite.com/calendar';
+  const webhookUsername = options.webhookUsername || `Onekite • ${label}`;
 
-  const username = ev && ev.username ? String(ev.username) : '';
-  const start = ev && ev.start ? Number(ev.start) : NaN;
-  const end = ev && ev.end ? Number(ev.end) : NaN;
-  const address = ev && ev.address ? String(ev.address) : '';
-  const notes = ev && ev.notes ? String(ev.notes) : '';
+  const title = kind === 'deleted' ? '❌ ' + label + ' annulé(e)' : label + ' créé(e)';
+  const showIcon = kind === 'deleted';
+  const embedTitle = showIcon ? title : title.replace(/^❌\s*/, '');
 
+  const start = entity && entity.start ? Number(entity.start) : NaN;
+  const end = entity && entity.end ? Number(entity.end) : NaN;
   const fields = [];
-  if (username) fields.push({ name: 'Créé par', value: username, inline: true });
+  const name = entity && entity.title ? String(entity.title) : '';
+  if (name) fields.push({ name: 'Titre', value: name, inline: false });
   if (Number.isFinite(start) && Number.isFinite(end)) {
     fields.push({ name: 'Période', value: `Du ${formatFRShort(start)} au ${formatFRShort(end)}`, inline: false });
   }
-  if (address) fields.push({ name: 'Adresse', value: address, inline: false });
-  if (notes) fields.push({ name: 'Notes', value: notes.length > 900 ? (notes.slice(0, 897) + '...') : notes, inline: false });
+  const username = entity && entity.username ? String(entity.username) : '';
+  if (username) fields.push({ name: 'Membre', value: username, inline: true });
 
   return {
     username: webhookUsername,
     content: '',
     embeds: [
       {
-        title,
+        title: embedTitle,
         url: calUrl,
-        description: (ev && ev.title) ? String(ev.title) : '',
+        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(),
@@ -225,23 +225,51 @@ function buildSpecialWebhookPayload(action, ev) {
   };
 }
 
-async function notifySpecialEvent(settings, action, ev) {
-  const kind = String((ev && ev.kind) || 'event');
-  const url = kind === 'outing'
-    ? String((settings && settings.discordWebhookUrlOutings) || '').trim()
-    : String((settings && settings.discordWebhookUrlEvents) || '').trim();
+async function notifySpecialEventCreated(settings, ev) {
+  const url = settings && settings.discordWebhookUrlEvents ? String(settings.discordWebhookUrlEvents).trim() : '';
   if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('created', 'Évènement', ev, { webhookUsername: 'Onekite • Évènement' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (event created)', e && e.message ? e.message : String(e));
+  }
+}
 
+async function notifySpecialEventDeleted(settings, ev) {
+  const url = settings && settings.discordWebhookUrlEvents ? String(settings.discordWebhookUrlEvents).trim() : '';
+  if (!url) return;
   try {
-    await postWebhook(url, buildSpecialWebhookPayload(action, ev));
+    await postWebhook(url, buildSimpleCalendarPayload('deleted', 'Évènement', ev, { webhookUsername: 'Onekite • Annulation' }));
   } catch (e) {
-    console.warn('[calendar-onekite] Discord webhook failed (special)', e && e.message ? e.message : String(e));
+    console.warn('[calendar-onekite] Discord webhook failed (event deleted)', e && e.message ? e.message : String(e));
   }
 }
 
+async function notifyOutingCreated(settings, o) {
+  const url = settings && settings.discordWebhookUrlOutings ? String(settings.discordWebhookUrlOutings).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('created', 'Sortie', o, { webhookUsername: 'Onekite • Sortie' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (outing created)', e && e.message ? e.message : String(e));
+  }
+}
+
+async function notifyOutingDeleted(settings, o) {
+  const url = settings && settings.discordWebhookUrlOutings ? String(settings.discordWebhookUrlOutings).trim() : '';
+  if (!url) return;
+  try {
+    await postWebhook(url, buildSimpleCalendarPayload('deleted', 'Sortie', o, { webhookUsername: 'Onekite • Annulation' }));
+  } catch (e) {
+    console.warn('[calendar-onekite] Discord webhook failed (outing deleted)', e && e.message ? e.message : String(e));
+  }
+}
 module.exports = {
   notifyReservationRequested,
   notifyPaymentReceived,
   notifyReservationCancelled,
-  notifySpecialEvent,
+  notifySpecialEventCreated,
+  notifySpecialEventDeleted,
+  notifyOutingCreated,
+  notifyOutingDeleted,
 };

package/library.js

@@ -83,6 +83,11 @@ Plugin.init = async function (params) {
   router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.getSpecialEventDetails);
   router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
 
+  // Outings (prévisions de sortie)
+  router.post('/api/v3/plugins/calendar-onekite/outings', ...publicExpose, api.createOuting);
+  router.get('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.getOutingDetails);
+  router.delete('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.deleteOuting);
+
   // Admin API (JSON)
   const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 
@@ -103,6 +108,8 @@ Plugin.init = async function (params) {
 
     // Purge special events by year
     router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+    // Purge outings by year
+    router.post(`${base}/outings/purge`, ...adminMws, admin.purgeOutingsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

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