nodebb-plugin-onekite-calendar 2.0.21 → 2.0.23

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog – calendar-onekite
 
+## 1.3.18
+- Fix HelloAsso webhook : suppression d'une double déclaration `realtime` qui empêchait le plugin de se charger (SyntaxError).
+
+## 1.3.17
+- Temps réel : les **créations** (locations / évènements), **changements de statut** (validation, refus, annulation, paiement reçu) et **expirations** se répercutent automatiquement sur le calendrier pour **tous les utilisateurs connectés**, sans rechargement de page.
+
+## 1.3.16
+- Calendrier : le **jour actuel** n’est plus affiché comme indisponible (gris + panneau sens interdit). Seules les **dates passées** restent désactivées visuellement.
+
 ## 1.3.15
 - Permissions : les **modérateurs globaux / gestionnaires** (groupe NodeBB « Global Moderators », selon le slug) sont désormais considérés comme validateurs pour les actions de modération (dont l’**annulation**).
 

package/lib/admin.js

@@ -73,6 +73,7 @@ function normalizeReturnUrl(meta) {
 
 
 const dbLayer = require('./db');
+const realtime = require('./realtime');
 const helloasso = require('./helloasso');
 
 const ADMIN_PRIV = 'admin:settings';
@@ -207,6 +208,12 @@ admin.approveReservation = async function (req, res) {
 
   await dbLayer.saveReservation(r);
 
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'refused', rid: String(rid), status: r.status });
+
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'approved', rid: String(rid), status: r.status });
+
   // Email requester
   try {
     const requesterUid = parseInt(r.uid, 10);
@@ -249,6 +256,9 @@ admin.refuseReservation = async function (req, res) {
   r.refusedReason = String((req.body && (req.body.reason || req.body.refusedReason || req.body.refuseReason)) || '').trim();
   await dbLayer.saveReservation(r);
 
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'refused', rid: String(rid), status: r.status });
+
   try {
     const requesterUid = parseInt(r.uid, 10);
     const requester = await user.getUserFields(requesterUid, ['username']);

package/lib/api.js

@@ -112,6 +112,7 @@ function normalizeAllowedGroups(raw) {
 
 const helloasso = require('./helloasso');
 const discord = require('./discord');
+const realtime = require('./realtime');
 
 // Email helper (NodeBB 4.x): always send by uid.
 // Subject must be provided inside params.subject.
@@ -772,6 +773,8 @@ api.createSpecialEvent = async function (req, res) {
     createdAt: String(Date.now()),
   };
   await dbLayer.saveSpecialEvent(ev);
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'created', eid: ev.eid });
   res.json({ ok: true, eid });
 };
 
@@ -783,6 +786,7 @@ api.deleteSpecialEvent = async function (req, res) {
   const eid = String(req.params.eid || '').replace(/^special:/, '').trim();
   if (!eid) return res.status(400).json({ error: 'bad-id' });
   await dbLayer.removeSpecialEvent(eid);
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'deleted', eid });
   res.json({ ok: true });
 };
 
@@ -982,6 +986,9 @@ api.createReservation = async function (req, res) {
   // Save
   await dbLayer.saveReservation(resv);
 
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'created', rid: resv.rid, status: resv.status });
+
   // Audit
   await auditLog(isValidatorFree ? 'reservation_self_checked' : 'reservation_requested', uid, {
     targetType: 'reservation',
@@ -1184,6 +1191,9 @@ api.approveReservation = async function (req, res) {
 
   await dbLayer.saveReservation(r);
 
+  // Real-time refresh for all viewers
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'approved', rid: String(rid), status: r.status });
+
   await auditLog('reservation_approved', uid, {
     targetType: 'reservation',
     targetId: String(rid),
@@ -1251,6 +1261,8 @@ api.refuseReservation = async function (req, res) {
   }
   await dbLayer.saveReservation(r);
 
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'refused', rid: String(rid), status: r.status });
+
   await auditLog('reservation_refused', uid, {
     targetType: 'reservation',
     targetId: String(rid),
@@ -1320,6 +1332,8 @@ api.cancelReservation = async function (req, res) {
 
   await dbLayer.saveReservation(r);
 
+  realtime.emitCalendarUpdated({ kind: 'reservation', action: 'cancelled', rid: String(rid), status: r.status });
+
   await auditLog('reservation_cancelled', uid, {
     targetType: 'reservation',
     targetId: String(rid),
@@ -1395,6 +1409,8 @@ api.setMaintenance = async function (req, res) {
     targetType: 'item',
     targetId: itemId,
   });
+  // Maintenance impacts availability; ask clients to refetch.
+  realtime.emitCalendarUpdated({ kind: 'maintenance', action: enabled ? 'on' : 'off', itemId });
   return res.json({ ok: true, itemId, enabled });
 };
 
@@ -1437,6 +1453,7 @@ api.setMaintenanceAll = async function (req, res) {
     targetId: enabled ? 'all_on' : 'all_off',
     count: result && typeof result.count === 'number' ? result.count : (enabled ? catalogIds.length : 0),
   });
+  realtime.emitCalendarUpdated({ kind: 'maintenance', action: enabled ? 'all_on' : 'all_off' });
   return res.json(Object.assign({ ok: true, enabled }, result || {}));
 };
 

package/lib/helloassoWebhook.js

@@ -5,19 +5,11 @@ const crypto = require('crypto');
 const db = require.main.require('./src/database');
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
-// Real-time updates
-let io;
-try {
-  const socketIO = require.main.require('./src/socket.io');
-  io = socketIO.server || socketIO;
-} catch (e) {
-  io = null;
-}
-
 
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 const discord = require('./discord');
+const realtime = require('./realtime');
 
 async function auditLog(action, actorUid, payload) {
   try {
@@ -342,12 +334,8 @@ async function handler(req, res, next) {
       paymentId: r.paymentId || '',
     });
 
-    // Real-time notify: refresh calendars for all viewers (owner + validators/admins)
-    try {
-      if (io && io.sockets && typeof io.sockets.emit === 'function') {
-        io.sockets.emit('event:calendar-onekite.reservationUpdated', { rid: r.rid, status: r.status });
-      }
-    } catch (e) {}
+    // Real-time notify: refresh calendars for all viewers
+    realtime.emitCalendarUpdated({ kind: 'reservation', action: 'paid', rid: String(r.rid), status: r.status });
 
     // Notify requester
     const requesterUid = parseInt(r.uid, 10);

package/lib/realtime.js

@@ -0,0 +1,36 @@
+'use strict';
+
+// Broadcast real-time calendar updates to all connected clients.
+// NodeBB exposes socket.io via ./src/socket.io (either the server itself or an
+// object with a .server property depending on version).
+
+let io;
+
+function getIO() {
+  if (io) return io;
+  try {
+    const socketIO = require.main.require('./src/socket.io');
+    io = socketIO && socketIO.server ? socketIO.server : socketIO;
+  } catch (e) {
+    io = null;
+  }
+  return io;
+}
+
+function emitCalendarUpdated(payload) {
+  try {
+    const server = getIO();
+    if (!server || !server.sockets || typeof server.sockets.emit !== 'function') return;
+
+    // New event name (generic).
+    server.sockets.emit('event:calendar-onekite.calendarUpdated', payload || {});
+
+    // Backwards compatible event name (older clients only listened to this).
+    // Keep it emitted for *any* calendar mutation, not just reservation status.
+    server.sockets.emit('event:calendar-onekite.reservationUpdated', payload || {});
+  } catch (e) {}
+}
+
+module.exports = {
+  emitCalendarUpdated,
+};

package/lib/scheduler.js

@@ -4,6 +4,7 @@ const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
 const discord = require('./discord');
+const realtime = require('./realtime');
 const nconf = require.main.require('nconf');
 const groups = require.main.require('./src/groups');
 
@@ -219,6 +220,9 @@ async function expirePending() {
       }
 
       await dbLayer.removeReservation(rid);
+
+      // Real-time refresh for all viewers
+      realtime.emitCalendarUpdated({ kind: 'reservation', action: 'expired', rid: String(rid), status: 'expired' });
     }
   }
 }
@@ -380,6 +384,9 @@ async function processAwaitingPayment() {
       }
 
       await dbLayer.removeReservation(rid);
+
+      // Real-time refresh for all viewers
+      realtime.emitCalendarUpdated({ kind: 'reservation', action: 'expired', rid: String(rid), status: 'expired' });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/pkg/package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog – calendar-onekite
 
+## 1.3.16
+- Calendrier : le **jour actuel** n’est plus affiché comme indisponible (gris + panneau sens interdit). Seules les **dates passées** restent désactivées visuellement.
+
 ## 1.3.15
 - Permissions : les **modérateurs globaux / gestionnaires** (groupe NodeBB « Global Moderators », selon le slug) sont désormais considérés comme validateurs pour les actions de modération (dont l’**annulation**).
 

package/pkg/package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/pkg/package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.3.13"
+  "version": "1.3.16"
 }

package/pkg/package/public/client.js

@@ -31,7 +31,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           touch-action: manipulation;
         }
 
-        /* Show days that cannot be selected for new reservations (today & past) */
+        /* Show days that cannot be selected for new reservations (past only) */
         .fc .onekite-day-disabled {
           background: rgba(0, 0, 0, 0.03);
         }
@@ -1460,14 +1460,14 @@ function toDatetimeLocalValue(date) {
       longPressDelay: 300,
       selectLongPressDelay: 300,
       dayCellDidMount: function (arg) {
-        // Visually disable today and past days for reservation creation rules,
+        // Visually disable past days for reservation creation rules,
         // without breaking event clicks.
         try {
           const cellDate = arg && arg.date ? new Date(arg.date) : null;
           if (!cellDate) return;
           const ymd = toLocalYmd(cellDate);
           const today = toLocalYmd(new Date());
-          if (ymd <= today) {
+          if (ymd < today) {
             arg.el.classList.add('onekite-day-disabled');
           }
         } catch (e) {}

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "2.0.21"
+  "version": "2.0.23"
 }

package/public/client.js

@@ -31,7 +31,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           touch-action: manipulation;
         }
 
-        /* Show days that cannot be selected for new reservations (today & past) */
+        /* Show days that cannot be selected for new reservations (past only) */
         .fc .onekite-day-disabled {
           background: rgba(0, 0, 0, 0.03);
         }
@@ -1470,14 +1470,14 @@ function toDatetimeLocalValue(date) {
       longPressDelay: 300,
       selectLongPressDelay: 300,
       dayCellDidMount: function (arg) {
-        // Visually disable today and past days for reservation creation rules,
+        // Visually disable past days for reservation creation rules,
         // without breaking event clicks.
         try {
           const cellDate = arg && arg.date ? new Date(arg.date) : null;
           if (!cellDate) return;
           const ymd = toLocalYmd(cellDate);
           const today = toLocalYmd(new Date());
-          if (ymd <= today) {
+          if (ymd < today) {
             arg.el.classList.add('onekite-day-disabled');
           }
         } catch (e) {}
@@ -2369,10 +2369,17 @@ function autoInit(data) {
 
 
 
-// Live refresh when a reservation changes (e.g., payment confirmed by webhook)
+// Live refresh when the calendar changes (reservation status, new reservation,
+// new special event, maintenance toggles, webhook payment, etc.)
 try {
   if (!window.__oneKiteSocketBound && typeof socket !== 'undefined' && socket && typeof socket.on === 'function') {
     window.__oneKiteSocketBound = true;
+    socket.on('event:calendar-onekite.calendarUpdated', function () {
+      try {
+        const cal = window.oneKiteCalendar;
+        scheduleRefetch(cal);
+      } catch (e) {}
+    });
     socket.on('event:calendar-onekite.reservationUpdated', function () {
       try {
         const cal = window.oneKiteCalendar;