nodebb-plugin-onekite-calendar 2.0.52 → 2.0.53

package/lib/admin.js

@@ -4,6 +4,7 @@ const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
 const { forumBaseUrl, formatFR } = require('./utils');
+const { getSettings, invalidateSettings } = require('./settings');
 const realtime = require('./realtime');
 const crypto = require('crypto');
 const nconf = require.main.require('nconf');
@@ -108,12 +109,13 @@ admin.renderAdmin = async function (req, res) {
 };
 
 admin.getSettings = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   res.json(settings || {});
 };
 
 admin.saveSettings = async function (req, res) {
   await meta.settings.set('calendar-onekite', req.body || {});
+  invalidateSettings();
   res.json({ ok: true });
 };
 
@@ -173,7 +175,7 @@ admin.approveReservation = async function (req, res) {
   }
 
   // Create HelloAsso payment link if configured
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
     env,
@@ -378,7 +380,7 @@ admin.purgeOutingsByYear = async function (req, res) {
 
 
 admin.debugHelloAsso = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const env = (settings && settings.helloassoEnv) || 'prod';
 
   // Never expose secrets in debug output
@@ -531,7 +533,7 @@ admin.getAccounting = async function (req, res) {
     if (!Number.isFinite(y)) return null;
     if (catalogByYear.has(y)) return catalogByYear.get(y);
     try {
-      if (!settingsCache) settingsCache = await meta.settings.get('calendar-onekite');
+      if (!settingsCache) settingsCache = await getSettings();
       if (!settingsCache || !settingsCache.helloassoClientId || !settingsCache.helloassoClientSecret || !settingsCache.helloassoOrganizationSlug || !settingsCache.helloassoFormType) {
         catalogByYear.set(y, null);
         return null;

package/lib/api.js

@@ -11,7 +11,7 @@ const db = require.main.require('./src/database');
 const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
-const { formatFR } = require('./utils');
+const { getSettings } = require('./settings');
 
 // Resolve group identifiers from ACP.
 // Admins may enter a group *name* ("Test") or a *slug* ("onekite-ffvl-2026").
@@ -331,7 +331,7 @@ async function canValidate(uid, settings) {
 }
 
 async function canModerate(uid) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   return await canValidate(uid, settings);
 }
 
@@ -634,7 +634,7 @@ api.getEvents = async function (req, res) {
   const startTs = toTs(qStartRaw) || 0;
   const endTs = toTs(qEndRaw) || (Date.now() + 365 * 24 * 3600 * 1000);
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const canMod = req.uid ? await canValidate(req.uid, settings) : false;
   const widgetMode = String((req.query && req.query.widget) || '') === '1';
   const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings) : false;
@@ -826,7 +826,7 @@ api.getReservationDetails = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const canMod = await canValidate(uid, settings);
 
   const rid = String(req.params.rid || '').trim();
@@ -873,7 +873,7 @@ api.getSpecialEventDetails = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const canMod = await canValidate(uid, settings);
   const canSpecialDelete = await canDeleteSpecial(uid, settings);
 
@@ -917,7 +917,7 @@ api.getSpecialEventDetails = async function (req, res) {
 };
 
 api.getCapabilities = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const uid = req.uid || 0;
   const canMod = uid ? await canValidate(uid, settings) : false;
   res.json({
@@ -931,7 +931,7 @@ api.getCapabilities = async function (req, res) {
 };
 
 api.createSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
   const ok = await canCreateSpecial(req.uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
@@ -987,7 +987,7 @@ api.createSpecialEvent = async function (req, res) {
 };
 
 api.deleteSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
   const ok = await canDeleteSpecial(req.uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
@@ -1007,7 +1007,7 @@ api.getOutingDetails = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const canMod = await canValidate(uid, settings);
 
   const oid = String(req.params.oid || '').trim();
@@ -1048,7 +1048,7 @@ api.getOutingDetails = async function (req, res) {
 };
 
 api.createOuting = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
   const startTs = toTs(req.body && req.body.start);
@@ -1115,7 +1115,7 @@ api.createOuting = async function (req, res) {
 };
 
 api.deleteOuting = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
 
   const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
@@ -1139,7 +1139,7 @@ api.deleteOuting = async function (req, res) {
 };
 
 api.getItems = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
 
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
@@ -1191,7 +1191,7 @@ api.createReservation = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const startPreview = toTs(req.body.start);
   const ok = await canRequest(uid, settings, startPreview);
   if (!ok) {
@@ -1438,7 +1438,7 @@ api.createReservation = async function (req, res) {
 api.approveReservation = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -1471,7 +1471,7 @@ api.approveReservation = async function (req, res) {
   }
   // Create HelloAsso payment link on validation
   try {
-    const settings2 = await meta.settings.get('calendar-onekite');
+    const settings2 = await getSettings();
     const token = await helloasso.getAccessToken({ env: settings2.helloassoEnv || 'prod', clientId: settings2.helloassoClientId, clientSecret: settings2.helloassoClientSecret });
     const payer = await user.getUserFields(r.uid, ['email']);
     const year = yearFromTs(r.start);
@@ -1619,7 +1619,7 @@ api.approveReservation = async function (req, res) {
 api.refuseReservation = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -1679,7 +1679,7 @@ api.cancelReservation = async function (req, res) {
   const uid = req.uid;
   if (!uid) return res.status(401).json({ error: 'not-logged-in' });
 
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const rid = String(req.params.rid || '').trim();
   if (!rid) return res.status(400).json({ error: 'missing-rid' });
 
@@ -1806,7 +1806,7 @@ api.setMaintenanceAll = async function (req, res) {
   // When enabling, we need the current catalog IDs (HelloAsso shop)
   let catalogIds = [];
   if (enabled) {
-    const settings = await meta.settings.get('calendar-onekite');
+    const settings = await getSettings();
     const env = settings.helloassoEnv || 'prod';
     const token = await helloasso.getAccessToken({
       env,

package/lib/scheduler.js

@@ -8,6 +8,7 @@ const realtime = require('./realtime');
 const nconf = require.main.require('nconf');
 const groups = require.main.require('./src/groups');
 const utils = require('./utils');
+const { getSettings } = require('./settings');
 
 let timer = null;
 
@@ -138,7 +139,7 @@ async function getNotifiedValidatorUids(settings) {
 
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
 async function expirePending() {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
   const validatorReminderMins = parseInt(getSetting(settings, 'validatorReminderMinutesPending', '0'), 10) || 0;
   const now = Date.now();
@@ -257,7 +258,7 @@ async function expirePending() {
 // - We send a reminder after `paymentHoldMinutes` (default 60)
 // - We expire (and remove) after `2 * paymentHoldMinutes`
 async function processAwaitingPayment() {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettings();
   const holdMins = parseInt(
     getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')),
     10

package/lib/settings.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+
+const SETTINGS_KEY = 'calendar-onekite';
+
+// Simple in-memory cache to reduce repeated meta.settings.get calls.
+// Per-process only (NodeBB is often multi-process), but still beneficial.
+const CACHE_TTL_MS = 5000;
+let cachedSettings = null;
+let cachedAtMs = 0;
+
+async function getSettings(options) {
+  const opts = options || {};
+  const force = !!opts.force;
+  const now = Date.now();
+
+  if (!force && cachedSettings && (now - cachedAtMs) < CACHE_TTL_MS) {
+    return cachedSettings;
+  }
+
+  cachedSettings = await meta.settings.get(SETTINGS_KEY);
+  cachedAtMs = now;
+  return cachedSettings || {};
+}
+
+function invalidateSettings() {
+  cachedSettings = null;
+  cachedAtMs = 0;
+}
+
+module.exports = {
+  SETTINGS_KEY,
+  getSettings,
+  invalidateSettings,
+};

package/package.json

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

package/public/client.js

@@ -1045,10 +1045,6 @@ function toDatetimeLocalValue(date) {
     const endDisplay = endInclusiveForDisplay(start, end);
 
     const messageHtml = `
-      <div class="mb-2">
-        <label class="form-label">Titre (facultatif)</label>
-        <input type="text" class="form-control" id="onekite-res-title" placeholder="Ex: ..." />
-      </div>
       <div class="mb-2" id="onekite-period"><strong>Période</strong><br>${formatDt(start)} → ${formatDt(endDisplay)} <span class="text-muted" id="onekite-days">(${days} jour${days > 1 ? 's' : ''})</span></div>
       ${shortcutsHtml}
       <div class="mb-2"><strong>Matériel</strong></div>
@@ -1084,7 +1080,6 @@ function toDatetimeLocalValue(date) {
             label: 'Envoyer',
             className: 'btn-primary',
             callback: function () {
-              const title = (document.getElementById('onekite-res-title')?.value || '').trim();
               const cbs = Array.from(document.querySelectorAll('.onekite-item-cb')).filter(cb => cb.checked);
               if (!cbs.length) {
                 showAlert('error', 'Choisis au moins un matériel.');
@@ -1096,7 +1091,7 @@ function toDatetimeLocalValue(date) {
               const total = (sum / 100) * days;
               // Return the effective end date (exclusive) because duration shortcuts can
               // change the range without updating the original FullCalendar selection.
-              resolve({ title, itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
+              resolve({ itemIds, itemNames, total, days, endDate: toLocalYmd(end) });
             },
           },
         },
@@ -1561,8 +1556,8 @@ function toDatetimeLocalValue(date) {
 
           // IMPORTANT: align "special" events and "outings" display exactly like
           // reservation icons.
-          // We inject the clock + time range directly into the event title so FC
-          // doesn't reserve a separate time column (which creates a leading gap).
+          // We inject the time range directly into the event title so FC doesn't
+          // reserve a separate time column (which creates a leading gap).
           const mapped = (Array.isArray(data) ? data : []).map((ev) => {
             try {
               if (ev && ev.extendedProps && (ev.extendedProps.type === 'special' || ev.extendedProps.type === 'outing') && ev.start && ev.end) {
@@ -1575,10 +1570,18 @@ function toDatetimeLocalValue(date) {
                 const ts = `${pad2(s.getHours())}:${pad2(s.getMinutes())}`;
                 const te = `${pad2(e.getHours())}:${pad2(e.getMinutes())}`;
                 const baseTitle = (ev.title || '').trim();
-                // Avoid double prefix on rerenders
-                const prefix = `🕒 ${ts}-${te} `;
-                if (!baseTitle.startsWith('🕒 ')) {
-                  ev.title = `${prefix}${baseTitle}`.trim();
+                // Avoid double prefix on rerenders.
+                // UX request: no clock icon for "prévision de sortie" (outing).
+                const isOuting = ev.extendedProps.type === 'outing';
+                const prefix = isOuting ? `${ts}-${te} ` : `🕒 ${ts}-${te} `;
+                if (isOuting) {
+                  if (!/^\d{2}:\d{2}-\d{2}:\d{2}\s/.test(baseTitle)) {
+                    ev.title = `${prefix}${baseTitle}`.trim();
+                  }
+                } else {
+                  if (!baseTitle.startsWith('🕒 ')) {
+                    ev.title = `${prefix}${baseTitle}`.trim();
+                  }
                 }
               }
             } catch (e2) {}

package/templates/calendar-onekite.tpl

@@ -2,6 +2,13 @@
   <div class="row">
     <div class="col-12">
       <h1>Calendrier</h1>
+      <div class="onekite-calendar-legend" aria-label="Légende des couleurs" style="margin:.25rem 0 .75rem;">
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#f39c12"></span>En attente</span>
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#d35400"></span>Paiement en attente</span>
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#27ae60"></span>Payée</span>
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#8e44ad"></span>Évènement</span>
+        <span class="onekite-legend-item"><span class="onekite-legend-dot" style="background:#2980b9"></span>Prévision de sortie</span>
+      </div>
       <div id="onekite-calendar" style="margin-top: 1rem;"></div>
     </div>
   </div>
@@ -23,6 +30,29 @@
 
 
 <style>
+  .onekite-calendar-legend {
+    display: flex;
+    flex-wrap: wrap;
+    gap: .5rem .75rem;
+    align-items: center;
+    font-size: .9rem;
+  }
+  .onekite-legend-item {
+    display: inline-flex;
+    align-items: center;
+    gap: .35rem;
+    padding: .15rem .4rem;
+    border-radius: 999px;
+    background: rgba(0,0,0,.04);
+  }
+  .onekite-legend-dot {
+    width: .7rem;
+    height: .7rem;
+    border-radius: 999px;
+    display: inline-block;
+    border: 1px solid rgba(0,0,0,.15);
+  }
+
   /* Make the custom "Évènement" button distinct from view buttons */
   .fc .fc-newSpecial-button {
     background: #8e44ad;
@@ -36,6 +66,7 @@
   /* Mobile tweaks for FullCalendar */
   @media (max-width: 576px) {
     #onekite-calendar { margin-top: .5rem !important; }
+    .onekite-calendar-legend { font-size: .82rem; }
     .fc .fc-toolbar { flex-wrap: wrap; gap: .25rem; }
     .fc .fc-toolbar-title { font-size: 1.05rem; line-height: 1.2; }
     .fc .fc-button { padding: .25rem .45rem; font-size: .75rem; }