nodebb-plugin-onekite-calendar 2.0.63 → 2.0.65

package/lib/api.js

@@ -2,12 +2,9 @@
 
 const crypto = require('crypto');
 
-const meta = require.main.require('./src/meta');
 const nconf = require.main.require('nconf');
 const user = require.main.require('./src/user');
 const groups = require.main.require('./src/groups');
-const db = require.main.require('./src/database');
-const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
 const { getSettings } = require('./settings');
@@ -251,25 +248,26 @@ async function canCreateSpecial(uid, settings) {
 }
 
 
+/**
+ * Determines if a user can join or leave special events as a participant.
+ * 
+ * This permission is intentionally permissive: any authenticated user can participate
+ * in special events, regardless of group membership. This differs from creation/deletion
+ * permissions which remain restricted to specific groups.
+ * 
+ * @param {number|string} uid - The user ID. Falsy values (0, null, undefined, '') indicate guest/unauthenticated users.
+ * @param {Object} settings - Plugin settings (unused but kept for API consistency with other permission functions).
+ * @returns {boolean} True if the user can join/leave special events (i.e., is authenticated).
+ * 
+ * @since 1.0.0 Modified to allow all authenticated users (previously restricted to specific groups)
+ */
 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);
+  // Any authenticated user (non-zero uid) can participate in special events.
+  // The !! coercion converts truthy values to true, falsy to false.
+  return !!uid;
 }
 
 
-
 async function canDeleteSpecial(uid, settings) {
   if (!uid) return false;
   try {
@@ -838,11 +836,19 @@ api.joinSpecialEvent = async function (req, res) {
   ev.participants = JSON.stringify(list);
   await dbLayer.saveSpecialEvent(ev);
 
+  const names = await usernamesByUids(list);
+
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'participants', eid });
+  realtime.emitParticipantsUpdated({
+    type: 'special',
+    id: eid,
+    participants: list,
+    participantsUsernames: names,
+  });
   return res.json({
     ok: true,
     participants: list,
-    participantsUsernames: await usernamesByUids(list),
+    participantsUsernames: names,
   });
 };
 
@@ -865,8 +871,16 @@ api.leaveSpecialEvent = async function (req, res) {
   ev.participants = JSON.stringify(next);
   await dbLayer.saveSpecialEvent(ev);
 
+  const names = await usernamesByUids(next);
+
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'participants', eid });
-  return res.json({ ok: true, participants: next, participantsUsernames: await usernamesByUids(next) });
+  realtime.emitParticipantsUpdated({
+    type: 'special',
+    id: eid,
+    participants: next,
+    participantsUsernames: names,
+  });
+  return res.json({ ok: true, participants: next, participantsUsernames: names });
 };
 
 api.getCapabilities = async function (req, res) {
@@ -1032,8 +1046,16 @@ api.joinOuting = async function (req, res) {
   o.participants = JSON.stringify(list);
   await dbLayer.saveOuting(o);
 
+  const names = await usernamesByUids(list);
+
   realtime.emitCalendarUpdated({ kind: 'outing', action: 'participants', oid });
-  return res.json({ ok: true, participants: list, participantsUsernames: await usernamesByUids(list) });
+  realtime.emitParticipantsUpdated({
+    type: 'outing',
+    id: oid,
+    participants: list,
+    participantsUsernames: names,
+  });
+  return res.json({ ok: true, participants: list, participantsUsernames: names });
 };
 
 api.leaveOuting = async function (req, res) {
@@ -1056,8 +1078,16 @@ api.leaveOuting = async function (req, res) {
   o.participants = JSON.stringify(next);
   await dbLayer.saveOuting(o);
 
+  const names = await usernamesByUids(next);
+
   realtime.emitCalendarUpdated({ kind: 'outing', action: 'participants', oid });
-  return res.json({ ok: true, participants: next, participantsUsernames: await usernamesByUids(next) });
+  realtime.emitParticipantsUpdated({
+    type: 'outing',
+    id: oid,
+    participants: next,
+    participantsUsernames: names,
+  });
+  return res.json({ ok: true, participants: next, participantsUsernames: names });
 };
 
 api.createOuting = async function (req, res) {

package/lib/realtime.js

@@ -27,6 +27,16 @@ function emitCalendarUpdated(payload) {
   } catch (e) {}
 }
 
+function emitParticipantsUpdated(payload) {
+  try {
+    const server = getIO();
+    if (!server || !server.sockets || typeof server.sockets.emit !== 'function') return;
+
+    server.sockets.emit('event:calendar-onekite.participantsUpdated', payload || {});
+  } catch (e) {}
+}
+
 module.exports = {
   emitCalendarUpdated,
+  emitParticipantsUpdated,
 };

package/package.json

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

package/public/client.js

@@ -1705,7 +1705,7 @@ function toDatetimeLocalValue(date) {
             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>` +
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-special" data-eid="${eidPlain}"><strong>Participants</strong>${joinBtn}${leaveBtn}<br>` +
               (participants.length
                 ? participants.map((name) => {
                     const u = String(name || '').trim();
@@ -1855,7 +1855,7 @@ function toDatetimeLocalValue(date) {
             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>` +
+            const participantsHtml = `<div class="mb-2" id="onekite-participants-outing" data-oid="${oidPlain}"><strong>Participants</strong>${joinBtn}${leaveBtn}<br>` +
               (participants.length
                 ? participants.map((name) => {
                     const u = String(name || '').trim();
@@ -2846,6 +2846,63 @@ try {
         scheduleRefetch(cal);
       } catch (e) {}
     });
+
+    // Live update of participants list in open modals (special events & outings)
+    socket.on('event:calendar-onekite.participantsUpdated', function (payload) {
+      try {
+        const p = payload || {};
+        const type = String(p.type || '').trim();
+        const id = String(p.id || '').trim();
+        if (!type || !id) return;
+
+        const names = Array.isArray(p.participantsUsernames) ? p.participantsUsernames : [];
+        const uids = Array.isArray(p.participants) ? p.participants.map(String) : [];
+
+        const uidNow = String(
+          (window.config && window.config.uid) ||
+          (typeof app !== 'undefined' && app && app.user && app.user.uid) ||
+          (typeof ajaxify !== 'undefined' && ajaxify && ajaxify.data && ajaxify.data.uid) ||
+          ''
+        );
+        const isParticipant = uidNow && uids.includes(String(uidNow));
+
+        const sel = (type === 'special') ? '#onekite-participants-special' : (type === 'outing') ? '#onekite-participants-outing' : '';
+        if (!sel) return;
+        const candidates = document.querySelectorAll(sel);
+        if (!candidates || !candidates.length) return;
+        let box = null;
+        for (const el of candidates) {
+          if (!el) continue;
+          const matchId = type === 'special' ? String(el.getAttribute('data-eid') || '') : String(el.getAttribute('data-oid') || '');
+          if (matchId === id) { box = el; break; }
+        }
+        if (!box) return;
+
+        const hasControls = !!box.querySelector('.onekite-join-special, .onekite-leave-special, .onekite-join-outing, .onekite-leave-outing');
+        let controlsHtml = '';
+        if (hasControls && uidNow) {
+          if (type === 'special') {
+            controlsHtml = isParticipant
+              ? `<button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-special" data-eid="${escapeHtml(id)}" title="Se retirer" aria-label="Se retirer">−</button>`
+              : `<button type="button" class="btn btn-sm btn-success ms-2 onekite-join-special" data-eid="${escapeHtml(id)}" title="S'ajouter" aria-label="S'ajouter">+</button>`;
+          } else if (type === 'outing') {
+            controlsHtml = isParticipant
+              ? `<button type="button" class="btn btn-sm btn-danger ms-2 onekite-leave-outing" data-oid="${escapeHtml(id)}" title="Se retirer" aria-label="Se retirer">−</button>`
+              : `<button type="button" class="btn btn-sm btn-success ms-2 onekite-join-outing" data-oid="${escapeHtml(id)}" title="S'ajouter" aria-label="S'ajouter">+</button>`;
+          }
+        }
+
+        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.innerHTML = `<strong>Participants</strong>${controlsHtml}<br>${links}`;
+      } catch (e) {}
+    });
   }
 } catch (e) {}