nodebb-plugin-onekite-calendar 2.0.55 → 2.0.56

package/lib/api.js

@@ -108,6 +108,54 @@ function normalizeAllowedGroups(raw) {
   return s.split(',').map(v => String(v).trim().replace(/^"+|"+$/g, '')).filter(Boolean);
 }
 
+function parseJsonArrayField(v) {
+  if (!v) return [];
+  if (Array.isArray(v)) return v;
+  const s = String(v).trim();
+  if (!s) return [];
+  try {
+    const parsed = JSON.parse(s);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (e) {
+    // legacy fallback: comma-separated
+    return s.split(',').map((x) => String(x).trim()).filter(Boolean);
+  }
+}
+
+function normalizeUidList(uids) {
+  const out = [];
+  const arr = Array.isArray(uids) ? uids : parseJsonArrayField(uids);
+  for (const u of arr) {
+    const n = Number.isInteger(u) ? u : parseInt(String(u || '').trim(), 10);
+    if (Number.isFinite(n) && n > 0) out.push(String(n));
+  }
+  return Array.from(new Set(out));
+}
+
+async function usernamesByUids(uids) {
+  const ids = normalizeUidList(uids);
+  if (!ids.length) return [];
+  try {
+    if (typeof user.getUsersFields === 'function') {
+      let rows = await user.getUsersFields(ids, ['username']);
+      if (Array.isArray(rows)) {
+        rows = rows.map((row, idx) => (row ? Object.assign({ uid: ids[idx] }, row) : null));
+      }
+      return (rows || []).map((r) => r && r.username ? String(r.username) : '').filter(Boolean);
+    }
+  } catch (e) {}
+  // Fallback (slower)
+  const rows = await Promise.all(ids.map(async (uid) => {
+    try {
+      const r = await user.getUserFields(uid, ['username']);
+      return r && r.username ? String(r.username) : '';
+    } catch (e) {
+      return '';
+    }
+  }));
+  return rows.filter(Boolean);
+}
+
 // NOTE: Avoid per-group async checks (groups.isMember) when possible.
 
 
@@ -897,6 +945,7 @@ api.getSpecialEventDetails = async function (req, res) {
 
   // Anyone who can see the calendar can view special events, but creator username
   // is only visible to moderators/allowed users or the creator.
+  const participants = normalizeUidList(ev.participants);
   const out = {
     eid: ev.eid,
     title: ev.title || '',
@@ -906,7 +955,11 @@ api.getSpecialEventDetails = async function (req, res) {
     lat: ev.lat || '',
     lon: ev.lon || '',
     notes: ev.notes || '',
+    participants,
+    participantsUsernames: await usernamesByUids(participants),
     canDeleteSpecial: canSpecialDelete,
+    canJoin: uid ? await canCreateSpecial(uid, settings) : false,
+    isParticipant: uid ? participants.includes(String(uid)) : false,
     icsUrl: links.icsUrl,
     googleCalUrl: links.googleCalUrl,
   };
@@ -916,6 +969,33 @@ api.getSpecialEventDetails = async function (req, res) {
   return res.json(out);
 };
 
+api.joinSpecialEvent = 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);
+  if (!list.includes(sUid)) list.push(sUid);
+  ev.participants = JSON.stringify(list);
+  await dbLayer.saveSpecialEvent(ev);
+
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'participants', eid });
+  return res.json({
+    ok: true,
+    participants: list,
+    participantsUsernames: await usernamesByUids(list),
+  });
+};
+
 api.getCapabilities = async function (req, res) {
   const settings = await getSettings();
   const uid = req.uid || 0;
@@ -974,6 +1054,8 @@ api.createSpecialEvent = async function (req, res) {
     uid: String(req.uid),
     username: u && u.username ? String(u.username) : '',
     createdAt: String(Date.now()),
+    // Self-join by default (creator is a participant)
+    participants: JSON.stringify([String(req.uid)]),
   };
   await dbLayer.saveSpecialEvent(ev);
 
@@ -993,10 +1075,15 @@ api.deleteSpecialEvent = async function (req, res) {
   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' });
+  // Fetch the full event before deletion so Discord (and logs) can include
+  // the same information as on creation (title, dates, creator, etc.).
+  const ev = await dbLayer.getSpecialEvent(eid);
+  if (!ev) return res.status(404).json({ error: 'not-found' });
+
   await dbLayer.removeSpecialEvent(eid);
 
   try {
-    await discord.notifySpecialEventDeleted(settings, Object.assign({}, { eid }, { deletedBy: String(req.uid || '') }));
+    await discord.notifySpecialEventDeleted(settings, Object.assign({}, ev, { deletedBy: String(req.uid || '') }));
   } catch (e) {}
 
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid });
@@ -1028,6 +1115,7 @@ api.getOutingDetails = async function (req, res) {
     end: new Date(parseInt(o.end, 10)),
   });
 
+  const participants = normalizeUidList(o.participants);
   const out = {
     oid: o.oid,
     title: o.title || '',
@@ -1037,6 +1125,10 @@ api.getOutingDetails = async function (req, res) {
     lat: o.lat || '',
     lon: o.lon || '',
     notes: o.notes || '',
+    participants,
+    participantsUsernames: await usernamesByUids(participants),
+    canJoin: uid ? await canRequest(uid, settings, Date.now()) : false,
+    isParticipant: uid ? participants.includes(String(uid)) : false,
     canDeleteOuting: canMod || (uid && String(uid) === String(o.uid)),
     icsUrl: links.icsUrl,
     googleCalUrl: links.googleCalUrl,
@@ -1047,6 +1139,30 @@ api.getOutingDetails = async function (req, res) {
   return res.json(out);
 };
 
+api.joinOuting = 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);
+  if (!list.includes(sUid)) list.push(sUid);
+  o.participants = JSON.stringify(list);
+  await dbLayer.saveOuting(o);
+
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'participants', oid });
+  return res.json({ ok: true, participants: list, participantsUsernames: await usernamesByUids(list) });
+};
+
 api.createOuting = async function (req, res) {
   const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
@@ -1103,6 +1219,7 @@ api.createOuting = async function (req, res) {
     uid: String(req.uid),
     username: u && u.username ? String(u.username) : '',
     createdAt: String(Date.now()),
+    participants: JSON.stringify([String(req.uid)]),
   };
   await dbLayer.saveOuting(o);
 

package/library.js

@@ -82,11 +82,15 @@ Plugin.init = async function (params) {
   router.post('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, api.createSpecialEvent);
   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);
+  // Participants (self-join) for special events
+  router.post('/api/v3/plugins/calendar-onekite/special-events/:eid/participants', ...publicExpose, api.joinSpecialEvent);
 
   // 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);
+  // Participants (self-join) for outings
+  router.post('/api/v3/plugins/calendar-onekite/outings/:oid/participants', ...publicExpose, api.joinOuting);
 
   // 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.55",
+  "version": "2.0.56",
   "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.55"
+  "version": "2.0.56"
 }

package/public/client.js

@@ -1674,6 +1674,19 @@ 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 participants = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
+            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>`
+              : '';
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-special"><strong>Participants</strong>${joinBtn}<br>` +
+              (participants.length
+                ? participants.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>`) +
+              `</div>`;
             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)
@@ -1692,6 +1705,7 @@ function toDatetimeLocalValue(date) {
               ${userLine}
               <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
               ${calHtml}
+              ${participantsHtml}
               ${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>` : ''}
             `;
@@ -1719,6 +1733,36 @@ function toDatetimeLocalValue(date) {
                 } : {}),
               },
             });
+            // Self-join handler
+            try {
+              dlg.on('shown.bs.modal', () => {
+                dlg.find('.onekite-join-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: 'POST' });
+                    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><br>${links}`);
+                    }
+                  } catch (e3) {
+                    showAlert('error', "Impossible de s'ajouter.");
+                  }
+                });
+              });
+            } catch (e) {}
             try {
               dlg.on('hidden.bs.modal', function () { isDialogOpen = false; });
             } catch (e) {
@@ -1738,6 +1782,19 @@ 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 participants = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
+            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>`
+              : '';
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-outing"><strong>Participants</strong>${joinBtn}<br>` +
+              (participants.length
+                ? participants.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>`) +
+              `</div>`;
             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)
@@ -1756,6 +1813,7 @@ function toDatetimeLocalValue(date) {
               ${userLine}
               <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
               ${calHtml}
+              ${participantsHtml}
               ${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>` : ''}
             `;
@@ -1783,6 +1841,36 @@ function toDatetimeLocalValue(date) {
                 } : {}),
               },
             });
+            // Self-join handler
+            try {
+              dlg.on('shown.bs.modal', () => {
+                dlg.find('.onekite-join-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: 'POST' });
+                    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><br>${links}`);
+                    }
+                  } catch (e3) {
+                    showAlert('error', "Impossible de s'ajouter.");
+                  }
+                });
+              });
+            } catch (e) {}
             try {
               dlg.on('hidden.bs.modal', function () { isDialogOpen = false; });
             } catch (e) {