nodebb-plugin-onekite-calendar 2.0.60 → 2.0.62

package/lib/api.js

@@ -420,6 +420,26 @@ async function canCreateSpecial(uid, settings) {
   return false;
 }
 
+
+async function canJoinSpecial(uid, settings) {
+  if (!uid) return false;
+  // Admins always allowed
+  try {
+    const isAdmin = await groups.isMember(uid, 'administrators');
+    if (isAdmin) return true;
+  } catch (e) {}
+
+  // Special-event creators can join/leave
+  if (await canCreateSpecial(uid, settings)) return true;
+
+  // Location creator groups can also participate (even if they can't create events)
+  const allowed = normalizeAllowedGroups(settings.creatorGroups || '');
+  if (!allowed.length) return false;
+  return userInAnyGroup(uid, allowed);
+}
+
+
+
 async function canDeleteSpecial(uid, settings) {
   if (!uid) return false;
   try {
@@ -958,7 +978,7 @@ api.getSpecialEventDetails = async function (req, res) {
     participants,
     participantsUsernames: await usernamesByUids(participants),
     canDeleteSpecial: canSpecialDelete,
-    canJoin: uid ? await canCreateSpecial(uid, settings) : false,
+    canJoin: uid ? await canJoinSpecial(uid, settings) : false,
     isParticipant: uid ? participants.includes(String(uid)) : false,
     icsUrl: links.icsUrl,
     googleCalUrl: links.googleCalUrl,
@@ -973,7 +993,7 @@ 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);
+  const ok = await canJoinSpecial(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const eid = String(req.params.eid || '').replace(/^special:/, '').trim();
@@ -1000,7 +1020,7 @@ 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);
+  const ok = await canJoinSpecial(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
   const eid = String(req.params.eid || '').replace(/^special:/, '').trim();

package/package.json

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

package/public/client.js

@@ -1676,11 +1676,14 @@ function toDatetimeLocalValue(date) {
             const notes = String(p.notes || '').trim();
             const participants = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
             const eidPlain = escapeHtml(String(p.eid || '').replace(/^special:/, ''));
+            // Participants can self-join/leave if they belong to the allowed group.
+            // Use page capabilities as a fallback (details may be minimal in some edge cases).
+            const canJoinHere = !!(p.canJoin || canCreateSpecial);
             // Use real buttons with visible + / - text to avoid relying on icon fonts.
-            const joinBtn = (p.canJoin && !p.isParticipant)
+            const joinBtn = (canJoinHere && !p.isParticipant)
               ? `<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 leaveBtn = (p.canJoin && p.isParticipant)
+            const leaveBtn = (canJoinHere && 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>` +
@@ -1819,10 +1822,11 @@ function toDatetimeLocalValue(date) {
             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)
+            const canJoinHere = !!(p.canJoin || canCreateOuting);
+            const joinBtn = (canJoinHere && !p.isParticipant)
               ? `<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 leaveBtn = (p.canJoin && p.isParticipant)
+            const leaveBtn = (canJoinHere && 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>` +