nodebb-plugin-onekite-calendar 2.0.41 → 2.0.42

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 || '',
@@ -493,8 +493,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 +611,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)))) {
@@ -696,19 +696,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 +714,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 +728,23 @@ 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,
   });
 };
 
 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');
   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 +754,6 @@ api.createSpecialEvent = async function (req, res) {
   const eid = crypto.randomUUID();
   const ev = {
     eid,
-    kind: safeKind,
     title,
     start: String(startTs),
     end: String(endTs),
@@ -773,41 +765,21 @@ 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);
-  } 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' });
-
-  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());
-
-  const ok = await canDeleteSpecial(req.uid, settings, ev && ev.start ? Number(ev.start) : Date.now());
-  if (!ok) return res.status(403).json({ error: 'not-allowed' });
-
   await dbLayer.removeSpecialEvent(eid);
-
-  try {
-    await discord.notifySpecialEvent(settings, 'deleted', Object.assign({ eid }, ev || {}));
-  } catch (e) {}
-
-  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid, specialKind: ev && ev.kind ? String(ev.kind) : 'event' });
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid });
   res.json({ ok: true });
 };
 

package/lib/discord.js

@@ -183,65 +183,8 @@ 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');
-
-  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 fields = [];
-  if (username) fields.push({ name: 'Créé par', value: username, inline: true });
-  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 });
-
-  return {
-    username: webhookUsername,
-    content: '',
-    embeds: [
-      {
-        title,
-        url: calUrl,
-        description: (ev && ev.title) ? String(ev.title) : '',
-        fields,
-        footer: { text: 'Onekite • Calendrier' },
-        timestamp: new Date().toISOString(),
-      },
-    ],
-  };
-}
-
-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();
-  if (!url) return;
-
-  try {
-    await postWebhook(url, buildSpecialWebhookPayload(action, ev));
-  } catch (e) {
-    console.warn('[calendar-onekite] Discord webhook failed (special)', e && e.message ? e.message : String(e));
-  }
-}
-
 module.exports = {
   notifyReservationRequested,
   notifyPaymentReceived,
   notifyReservationCancelled,
-  notifySpecialEvent,
 };

package/package.json

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

package/public/client.js

@@ -208,12 +208,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return opts.join('');
   }
 
-  async function openSpecialEventDialog(selectionInfo, opts) {
-    const options = opts || {};
-    const kind = (String(options.kind || 'event').trim().toLowerCase() === 'outing') ? 'outing' : 'event';
-    const dialogTitle = String(options.dialogTitle || (kind === 'outing' ? 'Créer une prévision de sortie' : 'Créer un évènement'));
-    const defaultTitle = String(options.defaultTitle || (kind === 'outing' ? 'Sortie' : 'Évènement'));
-
+  async function openSpecialEventDialog(selectionInfo) {
     const start = selectionInfo.start;
     // FullCalendar can omit `end` for certain interactions. Also, for all-day
     // selections, `end` is exclusive (next day at 00:00). We normalise below
@@ -267,7 +262,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     const html = `
       <div class="mb-3">
         <label class="form-label">Titre</label>
-        <input type="text" class="form-control" id="onekite-se-title" placeholder="Ex: ..." value="${escapeHtml(defaultTitle)}" />
+        <input type="text" class="form-control" id="onekite-se-title" placeholder="Ex: ..." />
       </div>
       <div class="row g-2">
         <div class="col-12 col-md-6">
@@ -312,7 +307,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return await new Promise((resolve) => {
       let resolved = false;
       const dialog = bootbox.dialog({
-        title: dialogTitle,
+        title: 'Créer un évènement',
         message: html,
         buttons: {
           cancel: {
@@ -361,7 +356,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
               const lon = (document.getElementById('onekite-se-lon')?.value || '').trim();
               resolved = true;
-              resolve({ kind, title, start: startVal, end: endVal, address, notes, lat, lon });
+              resolve({ title, start: startVal, end: endVal, address, notes, lat, lon });
               return true;
             },
           },
@@ -1363,55 +1358,6 @@ function toDatetimeLocalValue(date) {
           return;
         }
 
-
-
-        // On a day click / selection in reservation mode, propose the user to create either
-        // a Location (reservation) or a "Prévision de sortie" (special event).
-        try {
-          const choice = await new Promise((resolve) => {
-            bootbox.dialog({
-              title: 'Créer',
-              message: '<div>Que veux-tu créer ?</div>',
-              buttons: {
-                cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(null) },
-                outing: { label: 'Prévision de sortie', className: 'btn-info', callback: () => resolve('outing') },
-                reservation: { label: 'Location', className: 'btn-primary', callback: () => resolve('reservation') },
-              },
-            });
-          });
-
-          if (!choice) {
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-
-          if (choice === 'outing') {
-            const payload = await openSpecialEventDialog(info, { kind: 'outing', dialogTitle: 'Créer une prévision de sortie', defaultTitle: 'Sortie' });
-            if (!payload) {
-              calendar.unselect();
-              isDialogOpen = false;
-              return;
-            }
-            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-              method: 'POST',
-              body: JSON.stringify(payload),
-            }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-                method: 'POST',
-                body: JSON.stringify(payload),
-              });
-            });
-            showAlert('success', 'Sortie créée.');
-            invalidateEventsCache();
-            scheduleRefetch(calendar);
-            calendar.unselect();
-            isDialogOpen = false;
-            return;
-          }
-        } catch (e) {
-          // ignore
-        }
         // Business rule: reservations cannot start in the past.
         // (We validate again on the server, but this gives immediate feedback.)
         try {
@@ -1598,19 +1544,15 @@ function toDatetimeLocalValue(date) {
         }
       },
       eventDidMount: function (arg) {
-        // Keep special event colors consistent (kind-specific).
+        // Keep special event colors consistent.
         try {
           const ev = arg && arg.event;
           if (!ev) return;
           if (ev.extendedProps && ev.extendedProps.type === 'special') {
-            const kind = String((ev.extendedProps.kind || 'event'));
-            const palette = (kind === 'outing')
-              ? { bg: '#0d6efd', border: '#0d6efd' }
-              : { bg: '#8e44ad', border: '#8e44ad' };
             const el2 = arg.el;
             if (el2 && el2.style) {
-              el2.style.backgroundColor = palette.bg;
-              el2.style.borderColor = palette.border;
+              el2.style.backgroundColor = '#8e44ad';
+              el2.style.borderColor = '#8e44ad';
               el2.style.color = '#ffffff';
             }
           }
@@ -1656,8 +1598,6 @@ function toDatetimeLocalValue(date) {
 
         try {
           if (p.type === 'special') {
-          const specialKind = String((p.kind || p0.kind || 'event'));
-          const specialLabel = (specialKind === 'outing') ? 'Sortie' : 'Évènement';
           const username = String(p.username || '').trim();
           const userLine = username
             ? `<div class="mb-2"><strong>Créé par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
@@ -1681,7 +1621,7 @@ function toDatetimeLocalValue(date) {
           `;
           const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
           bootbox.dialog({
-            title: specialLabel,
+            title: 'Évènement',
             message: html,
             buttons: {
               close: { label: 'Fermer', className: 'btn-secondary' },
@@ -1693,7 +1633,7 @@ function toDatetimeLocalValue(date) {
                     try {
                       const eid = String(p.eid || ev.id).replace(/^special:/, '');
                       await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
-                      showAlert('success', `${specialLabel} supprimé.`);
+                      showAlert('success', 'Évènement supprimé.');
                       calendar.refetchEvents();
                     } catch (e) {
                       showAlert('error', 'Suppression impossible.');
@@ -2212,40 +2152,6 @@ async function openFabDatePicker() {
             try {
               if (isDialogOpen) return;
               isDialogOpen = true;
-
-              // Let the user pick between a Location or an Outing forecast.
-              const choice = await new Promise((resolve) => {
-                bootbox.dialog({
-                  title: 'Créer',
-                  message: '<div>Que veux-tu créer ?</div>',
-                  buttons: {
-                    cancel: { label: 'Annuler', className: 'btn-secondary', callback: () => resolve(null) },
-                    outing: { label: 'Prévision de sortie', className: 'btn-info', callback: () => resolve('outing') },
-                    reservation: { label: 'Location', className: 'btn-primary', callback: () => resolve('reservation') },
-                  },
-                });
-              });
-
-              if (!choice) return;
-
-              if (choice === 'outing') {
-                const payload = await openSpecialEventDialog({ start: s, end: endExcl, allDay: true }, { kind: 'outing', dialogTitle: 'Créer une prévision de sortie', defaultTitle: 'Sortie' });
-                if (!payload) return;
-                await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-                  method: 'POST',
-                  body: JSON.stringify(payload),
-                }).catch(async () => {
-                  return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
-                    method: 'POST',
-                    body: JSON.stringify(payload),
-                  });
-                });
-                showAlert('success', 'Sortie créée.');
-                invalidateEventsCache();
-                if (currentCalendar) scheduleRefetch(currentCalendar);
-                return;
-              }
-
               const items = cachedItems || (await loadItems());
               const chosen = await openReservationDialog({ start: s, end: endExcl }, items);
               if (chosen && chosen.itemIds && chosen.itemIds.length) {

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

@@ -80,19 +80,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">Notifications Discord pour les <strong>évènements</strong> (création & annulation). Si vide, aucune notification n'est envoyée.</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">Notifications Discord pour les <strong>sorties</strong> (création & annulation). Si vide, aucune notification n'est envoyée.</div>
-          </div>
-
-
           <div class="mb-3">
             <label class="form-label">Envoyer une notification à la demande</label>
             <select class="form-select" name="discordNotifyOnRequest">
@@ -170,6 +157,17 @@
       <div class="tab-pane fade" id="onekite-tab-events" role="tabpanel">
         <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>
+
+        <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">
+        </div>
+
+        <div class="mb-3">
+          <label class="form-label">Groupes autorisés à supprimer des évènements (csv)</label>
+          <input class="form-control" name="specialDeleterGroups" placeholder="Si vide: même liste que la création">
+        </div>
+
         <hr class="my-4" />
         <h4>Purge des évènements</h4>
         <div class="d-flex gap-2 align-items-center">