nodebb-plugin-onekite-calendar 2.0.57 → 2.0.59

package/lib/api.js

@@ -996,6 +996,29 @@ api.joinSpecialEvent = async function (req, res) {
   });
 };
 
+api.leaveSpecialEvent = async function (req, res) {
+  const settings = await getSettings();
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+  const ok = await canCreateSpecial(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 list = normalizeUidList(ev.participants);
+  const sUid = String(uid);
+  const next = list.filter((x) => String(x) !== sUid);
+  ev.participants = JSON.stringify(next);
+  await dbLayer.saveSpecialEvent(ev);
+
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'participants', eid });
+  return res.json({ ok: true, participants: next, participantsUsernames: await usernamesByUids(next) });
+};
+
 api.getCapabilities = async function (req, res) {
   const settings = await getSettings();
   const uid = req.uid || 0;
@@ -1163,6 +1186,30 @@ api.joinOuting = async function (req, res) {
   return res.json({ ok: true, participants: list, participantsUsernames: await usernamesByUids(list) });
 };
 
+api.leaveOuting = async function (req, res) {
+  const settings = await getSettings();
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+  // Outings share the same rights as reservations/locations.
+  const ok = await canRequest(uid, settings, Date.now());
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
+
+  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 list = normalizeUidList(o.participants);
+  const sUid = String(uid);
+  const next = list.filter((x) => String(x) !== sUid);
+  o.participants = JSON.stringify(next);
+  await dbLayer.saveOuting(o);
+
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'participants', oid });
+  return res.json({ ok: true, participants: next, participantsUsernames: await usernamesByUids(next) });
+};
+
 api.createOuting = async function (req, res) {
   const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });

package/library.js

@@ -84,6 +84,7 @@ Plugin.init = async function (params) {
   router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
   // Participants (self-join) for special events
   router.post('/api/v3/plugins/calendar-onekite/special-events/:eid/participants', ...publicExpose, api.joinSpecialEvent);
+  router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid/participants', ...publicExpose, api.leaveSpecialEvent);
 
   // Outings (prévisions de sortie)
   router.post('/api/v3/plugins/calendar-onekite/outings', ...publicExpose, api.createOuting);
@@ -91,6 +92,7 @@ Plugin.init = async function (params) {
   router.delete('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.deleteOuting);
   // Participants (self-join) for outings
   router.post('/api/v3/plugins/calendar-onekite/outings/:oid/participants', ...publicExpose, api.joinOuting);
+  router.delete('/api/v3/plugins/calendar-onekite/outings/:oid/participants', ...publicExpose, api.leaveOuting);
 
   // Calendar export (ICS)
   // Note: reservations are protected by a signature in the querystring.

package/package.json

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

package/public/client.js

@@ -1675,10 +1675,15 @@ function toDatetimeLocalValue(date) {
             const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
             const notes = String(p.notes || '').trim();
             const participants = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
+            const eidPlain = escapeHtml(String(p.eid || '').replace(/^special:/, ''));
+            // Use real buttons with visible + / - text to avoid relying on icon fonts.
             const joinBtn = (p.canJoin && !p.isParticipant)
-              ? `<a href="#" class="onekite-join-special ms-2" data-eid="${escapeHtml(String(p.eid || '').replace(/^special:/, ''))}" title="S'ajouter"><i class="fa fa-plus"></i></a>`
+              ? `<button type="button" class="btn btn-sm btn-success ms-2 onekite-join-special" data-eid="${eidPlain}" title="S'ajouter" aria-label="S'ajouter">+</button>`
               : '';
-            const participantsHtml = `<div class="mb-2" id="onekite-participants-special"><strong>Participants</strong>${joinBtn}<br>` +
+            const leaveBtn = (p.canJoin && p.isParticipant)
+              ? `<button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-special" data-eid="${eidPlain}" title="Se retirer" aria-label="Se retirer">−</button>`
+              : '';
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-special"><strong>Participants</strong>${joinBtn}${leaveBtn}<br>` +
               (participants.length
                 ? participants.map((name) => {
                     const u = String(name || '').trim();
@@ -1755,12 +1760,38 @@ function toDatetimeLocalValue(date) {
                             return `<a class="onekite-user-link me-2" href="${window.location.origin}/user/${encodeURIComponent(u)}">${escapeHtml(u)}</a>`;
                           }).filter(Boolean).join('')
                         : `<span class="text-muted">Aucun</span>`;
-                      box.html(`<strong>Participants</strong><br>${links}`);
+                      box.html(`<strong>Participants</strong><button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-special" data-eid="${escapeHtml(eid)}" title="Se retirer" aria-label="Se retirer">−</button><br>${links}`);
                     }
                   } catch (e3) {
                     showAlert('error', "Impossible de s'ajouter.");
                   }
                 });
+
+                dlg.find('.onekite-leave-special').off('click').on('click', async (e2) => {
+                  e2.preventDefault();
+                  const btn = e2.currentTarget;
+                  if (!btn) return;
+                  try {
+                    btn.classList.add('disabled');
+                    const eid = String(btn.getAttribute('data-eid') || '').trim();
+                    if (!eid) return;
+                    const r = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}/participants`, { method: 'DELETE' });
+                    const names = Array.isArray(r && r.participantsUsernames) ? r.participantsUsernames : [];
+                    const box = dlg.find('#onekite-participants-special');
+                    if (box && box.length) {
+                      const links = names.length
+                        ? names.map((name) => {
+                            const u = String(name || '').trim();
+                            if (!u) return '';
+                            return `<a class="onekite-user-link me-2" href="${window.location.origin}/user/${encodeURIComponent(u)}">${escapeHtml(u)}</a>`;
+                          }).filter(Boolean).join('')
+                        : `<span class="text-muted">Aucun</span>`;
+                      box.html(`<strong>Participants</strong><button type="button" class="btn btn-sm btn-success ms-2 onekite-join-special" data-eid="${escapeHtml(eid)}" title="S'ajouter" aria-label="S'ajouter">+</button><br>${links}`);
+                    }
+                  } catch (e3) {
+                    showAlert('error', "Impossible de se retirer.");
+                  }
+                });
               });
             } catch (e) {}
             try {
@@ -1783,10 +1814,15 @@ function toDatetimeLocalValue(date) {
             const hasCoords = Number.isFinite(lat) && Number.isFinite(lon);
             const notes = String(p.notes || '').trim();
             const participants = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
+            const oidPlain = escapeHtml(String(p.oid || '').replace(/^outing:/, ''));
+            // Use real buttons with visible + / - text to avoid relying on icon fonts.
             const joinBtn = (p.canJoin && !p.isParticipant)
-              ? `<a href="#" class="onekite-join-outing ms-2" data-oid="${escapeHtml(String(p.oid || '').replace(/^outing:/, ''))}" title="S'ajouter"><i class="fa fa-plus"></i></a>`
+              ? `<button type="button" class="btn btn-sm btn-success ms-2 onekite-join-outing" data-oid="${oidPlain}" title="S'ajouter" aria-label="S'ajouter">+</button>`
               : '';
-            const participantsHtml = `<div class="mb-2" id="onekite-participants-outing"><strong>Participants</strong>${joinBtn}<br>` +
+            const leaveBtn = (p.canJoin && p.isParticipant)
+              ? `<button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-outing" data-oid="${oidPlain}" title="Se retirer" aria-label="Se retirer">−</button>`
+              : '';
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-outing"><strong>Participants</strong>${joinBtn}${leaveBtn}<br>` +
               (participants.length
                 ? participants.map((name) => {
                     const u = String(name || '').trim();
@@ -1863,12 +1899,38 @@ function toDatetimeLocalValue(date) {
                             return `<a class="onekite-user-link me-2" href="${window.location.origin}/user/${encodeURIComponent(u)}">${escapeHtml(u)}</a>`;
                           }).filter(Boolean).join('')
                         : `<span class="text-muted">Aucun</span>`;
-                      box.html(`<strong>Participants</strong><br>${links}`);
+                      box.html(`<strong>Participants</strong><button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-outing" data-oid="${escapeHtml(oid)}" title="Se retirer" aria-label="Se retirer">−</button><br>${links}`);
                     }
                   } catch (e3) {
                     showAlert('error', "Impossible de s'ajouter.");
                   }
                 });
+
+                dlg.find('.onekite-leave-outing').off('click').on('click', async (e2) => {
+                  e2.preventDefault();
+                  const btn = e2.currentTarget;
+                  if (!btn) return;
+                  try {
+                    btn.classList.add('disabled');
+                    const oid = String(btn.getAttribute('data-oid') || '').trim();
+                    if (!oid) return;
+                    const r = await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oid)}/participants`, { method: 'DELETE' });
+                    const names = Array.isArray(r && r.participantsUsernames) ? r.participantsUsernames : [];
+                    const box = dlg.find('#onekite-participants-outing');
+                    if (box && box.length) {
+                      const links = names.length
+                        ? names.map((name) => {
+                            const u = String(name || '').trim();
+                            if (!u) return '';
+                            return `<a class="onekite-user-link me-2" href="${window.location.origin}/user/${encodeURIComponent(u)}">${escapeHtml(u)}</a>`;
+                          }).filter(Boolean).join('')
+                        : `<span class="text-muted">Aucun</span>`;
+                      box.html(`<strong>Participants</strong><button type="button" class="btn btn-sm btn-success ms-2 onekite-join-outing" data-oid="${escapeHtml(oid)}" title="S'ajouter" aria-label="S'ajouter">+</button><br>${links}`);
+                    }
+                  } catch (e3) {
+                    showAlert('error', "Impossible de se retirer.");
+                  }
+                });
               });
             } catch (e) {}
             try {