nodebb-plugin-onekite-calendar 1.0.4 → 1.0.6

package/CHANGELOG.md

@@ -1,19 +1,8 @@
-# Changelog
-
-## 1.1.0
-- Ultra perf clean : JS chargé uniquement sur les pages/plugin concernées (plus de scripts globaux)
-- Suppression legacy supplémentaire : clés DB renommées en onekite-calendar:* (aucune donnée conservée)
-- Nettoyages internes (variables globales JS, routes/paramètres uniformisés)
-
-
-## 1.0.8
-- Suppression du legacy (namespace unique onekite-calendar, ACP/API/widgets)
-- Suppression des fallbacks inutiles
-
+# Changelog – nodebb-plugin-onekite-calendar
 
 ## 1.0.6
 - Refactor interne : centralisation de l’envoi d’emails et du logging (opt-in)
-- Nettoyage : suppression des alias legacy (API + ACP)
+- Compatibilité : ajout d’alias de routes "onekite-calendar" en plus de "calendar-onekite" (API + ACP)
 
 ## 1.0.5
 - Widget : points colorés selon le type (mêmes couleurs que le calendrier)
@@ -43,7 +32,7 @@
 - Correctifs divers de stabilité/performance (dont crash au démarrage)
 
 ## 1.0.0
-- Première version stable du plugin onekite-calendar
+- Première version stable du plugin calendar-onekite
 - Gestion des réservations de matériel avec contrôle de disponibilité
 - Calendrier FullCalendar via CDN
 - Validation / refus des demandes depuis l’ACP

package/lib/admin.js

@@ -50,18 +50,18 @@ const ADMIN_PRIV = 'admin:settings';
 const admin = {};
 
 admin.renderAdmin = async function (req, res) {
-  res.render('admin/plugins/onekite-calendar', {
+  res.render('admin/plugins/calendar-onekite', {
     title: 'Calendar Onekite',
   });
 };
 
 admin.getSettings = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   res.json(settings || {});
 };
 
 admin.saveSettings = async function (req, res) {
-  await meta.settings.set('onekite-calendar', req.body || {});
+  await meta.settings.set('calendar-onekite', req.body || {});
   res.json({ ok: true });
 };
 
@@ -97,7 +97,7 @@ admin.approveReservation = async function (req, res) {
   }
 
   // Create HelloAsso payment link if configured
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
     env,
@@ -111,7 +111,7 @@ admin.approveReservation = async function (req, res) {
     const totalAmount = Math.max(0, Math.round((Number(r.total) || 0) * 100));
     const base = forumBaseUrl();
     const returnUrl = base ? `${base}/calendar` : '';
-    const webhookUrl = base ? `${base}/plugins/onekite-calendar/helloasso` : '';
+    const webhookUrl = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
     const year = new Date(Number(r.start)).getFullYear();
     const intent = await helloasso.createCheckoutIntent({
       env,
@@ -154,7 +154,7 @@ admin.approveReservation = async function (req, res) {
       const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
         ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
         : '';
-      await sendEmail('onekite-calendar_approved', requester.email, 'Location matériel - Réservation validée', {
+      await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
         uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
@@ -189,7 +189,7 @@ admin.refuseReservation = async function (req, res) {
   try {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
-      await sendEmail('onekite-calendar_refused', requester.email, 'Location matériel - Réservation refusée', {
+      await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
         uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
@@ -360,7 +360,7 @@ admin.exportAccountingCsv = async function (req, res) {
   }
   const csv = lines.join('\n');
   res.setHeader('Content-Type', 'text/csv; charset=utf-8');
-  res.setHeader('Content-Disposition', 'attachment; filename="onekite-calendar-accounting.csv"');
+  res.setHeader('Content-Disposition', 'attachment; filename="calendar-onekite-accounting.csv"');
   return res.send(csv);
 };
 

package/lib/api.js

@@ -13,41 +13,6 @@ const dbLayer = require('./db');
 const { sendEmail } = require('./email');
 const log = require('./log');
 
-// Ultra-perf: short-lived in-memory cache for the events feed.
-// We cache a "base" event list without per-user privileges, then decorate
-// it per request. This reduces DB load when many users/widgets refresh.
-const EVENTS_CACHE = new Map();
-const EVENTS_CACHE_TTL_MS = 30 * 1000;
-const EVENTS_CACHE_MAX = 50;
-
-function eventsCacheKey(startTs, endTs) {
-  // Keep the key stable and short.
-  return `${Math.max(0, Number(startTs) || 0)}:${Math.max(0, Number(endTs) || 0)}`;
-}
-
-function getEventsCache(key) {
-  const hit = EVENTS_CACHE.get(key);
-  if (!hit) return null;
-  if ((Date.now() - hit.ts) > EVENTS_CACHE_TTL_MS) {
-    EVENTS_CACHE.delete(key);
-    return null;
-  }
-  return hit.data;
-}
-
-function setEventsCache(key, data) {
-  EVENTS_CACHE.set(key, { ts: Date.now(), data });
-  if (EVENTS_CACHE.size > EVENTS_CACHE_MAX) {
-    // Drop oldest entries.
-    const entries = Array.from(EVENTS_CACHE.entries());
-    entries.sort((a, b) => (a[1]?.ts || 0) - (b[1]?.ts || 0));
-    const toDrop = Math.max(1, EVENTS_CACHE.size - EVENTS_CACHE_MAX);
-    for (let i = 0; i < toDrop; i++) {
-      EVENTS_CACHE.delete(entries[i][0]);
-    }
-  }
-}
-
 // Fast membership check without N calls to groups.isMember.
 // NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
 // We compare against both group slugs and names to be tolerant with older settings.
@@ -336,7 +301,7 @@ api.getEvents = async function (req, res) {
   const startTs = toTs(req.query.start) || 0;
   const endTs = toTs(req.query.end) || (Date.now() + 365 * 24 * 3600 * 1000);
 
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const canMod = req.uid ? await canValidate(req.uid, settings) : false;
   const canSpecialCreate = req.uid ? await canCreateSpecial(req.uid, settings) : false;
   const canSpecialDelete = req.uid ? await canDeleteSpecial(req.uid, settings) : false;
@@ -344,89 +309,20 @@ api.getEvents = async function (req, res) {
   // Fetch a wider window because an event can start before the query range
   // and still overlap.
   const wideStart = Math.max(0, startTs - 366 * 24 * 3600 * 1000);
-
-  const cacheKey = eventsCacheKey(startTs, endTs);
-  let base = getEventsCache(cacheKey);
-  if (!base) {
-    const baseOut = [];
-
-    const ids = await dbLayer.listReservationIdsByStartRange(wideStart, endTs, 5000);
-    // Batch fetch = major perf win when there are many reservations.
-    const reservations = await dbLayer.getReservations(ids);
-    for (const r of (reservations || [])) {
-      if (!r) continue;
-      if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
-      const rStart = parseInt(r.start, 10);
-      const rEnd = parseInt(r.end, 10);
-      if (!(rStart < endTs && startTs < rEnd)) continue;
-
-      const evs = eventsFor(r);
-      const hasPay = (r.status === 'awaiting_payment' && r.paymentUrl && (/^https?:\/\//i).test(String(r.paymentUrl)));
-      for (const ev of (evs || [])) {
-        const p = ev.extendedProps || {};
-        baseOut.push({
-          id: ev.id,
-          title: ev.title,
-          backgroundColor: ev.backgroundColor,
-          borderColor: ev.borderColor,
-          textColor: ev.textColor,
-          allDay: ev.allDay,
-          start: ev.start,
-          end: ev.end,
-          extendedProps: {
-            type: 'reservation',
-            rid: p.rid,
-            status: p.status,
-            uid: p.uid,
-            _username: r.username ? String(r.username) : '',
-            _hasPayment: !!hasPay,
-          },
-        });
-      }
-    }
-
-    // Special events
-    try {
-      const specialIds = await dbLayer.listSpecialIdsByStartRange(wideStart, endTs, 5000);
-      const specials = await dbLayer.getSpecialEvents(specialIds);
-      for (const sev of (specials || [])) {
-        if (!sev) continue;
-        const sStart = parseInt(sev.start, 10);
-        const sEnd = parseInt(sev.end, 10);
-        if (!(sStart < endTs && startTs < sEnd)) continue;
-        const full = eventsForSpecial(sev);
-        baseOut.push({
-          id: full.id,
-          title: full.title,
-          allDay: full.allDay,
-          start: full.start,
-          end: full.end,
-          backgroundColor: full.backgroundColor,
-          borderColor: full.borderColor,
-          textColor: full.textColor,
-          extendedProps: {
-            type: 'special',
-            eid: sev.eid,
-            uid: sev.uid,
-            _username: sev.username ? String(sev.username) : '',
-          },
-        });
-      }
-    } catch (e) {
-      // ignore
-    }
-
-    base = baseOut;
-    setEventsCache(cacheKey, baseOut);
-  }
-
+  const ids = await dbLayer.listReservationIdsByStartRange(wideStart, endTs, 5000);
   const out = [];
-  const uidStr = (req.uid || req.uid === 0) ? String(req.uid) : '';
-  for (const ev of (base || [])) {
-    if (!ev) continue;
-    const p = ev.extendedProps || {};
-    if (p.type === 'reservation') {
-      const ownerOrMod = !!(p.uid && uidStr && String(p.uid) === uidStr) || canMod;
+  // Batch fetch = major perf win when there are many reservations.
+  const reservations = await dbLayer.getReservations(ids);
+  for (const r of (reservations || [])) {
+    if (!r) continue;
+    // Only show active statuses
+    if (!['pending', 'awaiting_payment', 'paid'].includes(r.status)) continue;
+    const rStart = parseInt(r.start, 10);
+    const rEnd = parseInt(r.end, 10);
+    if (!(rStart < endTs && startTs < rEnd)) continue; // overlap check
+    const evs = eventsFor(r);
+    for (const ev of evs) {
+      const p = ev.extendedProps || {};
       const minimal = {
         id: ev.id,
         title: ev.title,
@@ -444,30 +340,53 @@ api.getEvents = async function (req, res) {
           canModerate: canMod,
         },
       };
-      if (p._username && ownerOrMod) minimal.extendedProps.username = String(p._username);
-      if (p._hasPayment && ownerOrMod) minimal.extendedProps.hasPayment = true;
+      // Only expose username on the event list to owner/moderators.
+      if (r.username && ((req.uid && String(req.uid) === String(r.uid)) || canMod)) {
+        minimal.extendedProps.username = String(r.username);
+      }
+      // Let the UI decide if a "Payer" button might exist, without exposing the URL in list.
+      if (r.status === 'awaiting_payment' && r.paymentUrl && (/^https?:\/\//i).test(String(r.paymentUrl))) {
+        if ((req.uid && String(req.uid) === String(r.uid)) || canMod) {
+          minimal.extendedProps.hasPayment = true;
+        }
+      }
       out.push(minimal);
-    } else if (p.type === 'special') {
-      const ownerOrPriv = canMod || canSpecialDelete || (p.uid && uidStr && String(p.uid) === uidStr);
+    }
+  }
+
+  // Special events
+  try {
+    const specialIds = await dbLayer.listSpecialIdsByStartRange(wideStart, endTs, 5000);
+    const specials = await dbLayer.getSpecialEvents(specialIds);
+    for (const sev of (specials || [])) {
+      if (!sev) continue;
+      const sStart = parseInt(sev.start, 10);
+      const sEnd = parseInt(sev.end, 10);
+      if (!(sStart < endTs && startTs < sEnd)) continue;
+      const full = eventsForSpecial(sev);
       const minimal = {
-        id: ev.id,
-        title: ev.title,
-        allDay: ev.allDay,
-        start: ev.start,
-        end: ev.end,
-        backgroundColor: ev.backgroundColor,
-        borderColor: ev.borderColor,
-        textColor: ev.textColor,
+        id: full.id,
+        title: full.title,
+        allDay: full.allDay,
+        start: full.start,
+        end: full.end,
+        backgroundColor: full.backgroundColor,
+        borderColor: full.borderColor,
+        textColor: full.textColor,
         extendedProps: {
           type: 'special',
-          eid: p.eid,
+          eid: sev.eid,
           canCreateSpecial: canSpecialCreate,
           canDeleteSpecial: canSpecialDelete,
         },
       };
-      if (p._username && ownerOrPriv) minimal.extendedProps.username = String(p._username);
+      if (sev.username && (canMod || canSpecialDelete || (req.uid && String(req.uid) === String(sev.uid)))) {
+        minimal.extendedProps.username = String(sev.username);
+      }
       out.push(minimal);
     }
+  } catch (e) {
+    // ignore
   }
 
   // Stable ordering -> stable ETag
@@ -482,8 +401,7 @@ api.getEvents = async function (req, res) {
 
   const etag = computeEtag(out);
   res.setHeader('ETag', etag);
-  // Short caching + ETag revalidation keeps the feed snappy and reduces bandwidth.
-  res.setHeader('Cache-Control', 'private, max-age=15, must-revalidate');
+  res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
   if (String(req.headers['if-none-match'] || '') === etag) {
     return res.status(304).end();
   }
@@ -495,7 +413,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const canMod = await canValidate(uid, settings);
 
   const rid = String(req.params.rid || '').trim();
@@ -537,7 +455,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const canMod = await canValidate(uid, settings);
   const canSpecialDelete = await canDeleteSpecial(uid, settings);
 
@@ -566,7 +484,7 @@ api.getSpecialEventDetails = async function (req, res) {
 };
 
 api.getCapabilities = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const uid = req.uid || 0;
   const canMod = uid ? await canValidate(uid, settings) : false;
   res.json({
@@ -577,7 +495,7 @@ api.getCapabilities = async function (req, res) {
 };
 
 api.createSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   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' });
@@ -613,7 +531,7 @@ api.createSpecialEvent = async function (req, res) {
 };
 
 api.deleteSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   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' });
@@ -624,7 +542,7 @@ api.deleteSpecialEvent = async function (req, res) {
 };
 
 api.getItems = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
 
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
@@ -665,7 +583,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const startPreview = toTs(req.body.start);
   const ok = await canRequest(uid, settings, startPreview);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
@@ -762,7 +680,7 @@ api.createReservation = async function (req, res) {
 
         for (const md of (usersData || [])) {
           if (md && md.email) {
-            await sendEmail('onekite-calendar_pending', md.email, 'Location matériel - Demande de réservation', {
+            await sendEmail('calendar-onekite_pending', md.email, 'Location matériel - Demande de réservation', {
               username: md.username,
               requester: requester.username,
               itemName: itemsLabel,
@@ -801,7 +719,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -828,7 +746,7 @@ api.approveReservation = async function (req, res) {
   }
   // Create HelloAsso payment link on validation
   try {
-    const settings2 = await meta.settings.get('onekite-calendar');
+    const settings2 = await meta.settings.get('calendar-onekite');
     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);
@@ -880,7 +798,7 @@ api.approveReservation = async function (req, res) {
     const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
       ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
       : '';
-    await sendEmail('onekite-calendar_approved', requester.email, 'Location matériel - Réservation validée', {
+    await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -904,7 +822,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -919,7 +837,7 @@ api.refuseReservation = async function (req, res) {
 
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
   if (requester && requester.email) {
-    await sendEmail('onekite-calendar_refused', requester.email, 'Location matériel - Demande de réservation', {
+    await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Demande de réservation', {
       username: requester.username,
       itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -939,7 +857,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const rid = String(req.params.rid || '').trim();
   if (!rid) return res.status(400).json({ error: 'missing-rid' });
 

package/lib/constants.js

@@ -1,7 +1,10 @@
 'use strict';
 
-// Primary namespace for this plugin (NodeBB 4.x)
+// Keep backward compatibility with historical route namespaces.
+// New plugin name: nodebb-plugin-onekite-calendar
+
 module.exports = {
+  LEGACY_NAMESPACE: 'calendar-onekite',
   NAMESPACE: 'onekite-calendar',
-  WIDGET_ID: 'onekite-calendar-twoweeks',
+  WIDGET_ID: 'calendar-onekite-twoweeks',
 };

package/lib/controllers.js

@@ -3,8 +3,8 @@
 const controllers = {};
 
 controllers.renderCalendar = async function (req, res) {
-  res.render('onekite-calendar', {
-    title: 'Calendrier',
+  res.render('calendar-onekite', {
+    title: 'Calendar',
   });
 };
 

package/lib/db.js

@@ -2,13 +2,13 @@
 
 const db = require.main.require('./src/database');
 
-const KEY_ZSET = 'onekite-calendar:reservations';
-const KEY_OBJ = (rid) => `onekite-calendar:reservation:${rid}`;
-const KEY_CHECKOUT_INTENT_TO_RID = 'onekite-calendar:helloasso:checkoutIntentToRid';
+const KEY_ZSET = 'calendar-onekite:reservations';
+const KEY_OBJ = (rid) => `calendar-onekite:reservation:${rid}`;
+const KEY_CHECKOUT_INTENT_TO_RID = 'calendar-onekite:helloasso:checkoutIntentToRid';
 
 // Special events (non-reservation events shown in a different colour)
-const KEY_SPECIAL_ZSET = 'onekite-calendar:special';
-const KEY_SPECIAL_OBJ = (eid) => `onekite-calendar:special:${eid}`;
+const KEY_SPECIAL_ZSET = 'calendar-onekite:special';
+const KEY_SPECIAL_OBJ = (eid) => `calendar-onekite:special:${eid}`;
 
 // Helpers
 function reservationKey(rid) {

package/lib/discord.js

@@ -37,7 +37,7 @@ function postWebhook(webhookUrl, payload) {
         headers: {
           'Content-Type': 'application/json',
           'Content-Length': body.length,
-          'User-Agent': 'nodebb-plugin-onekite-calendar',
+          'User-Agent': 'nodebb-plugin-calendar-onekite',
         },
       }, (res) => {
         const ok = res.statusCode && res.statusCode >= 200 && res.statusCode < 300;

package/lib/email.js

@@ -8,17 +8,30 @@ function defaultLanguage() {
 }
 
 /**
- * Send a transactional email using NodeBB's emailer (NodeBB 4.x).
+ * Send a transactional email using NodeBB's emailer.
+ *
+ * We intentionally do not log here (per project preferences).
  */
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
-  if (!emailer || typeof emailer.sendToEmail !== 'function') {
-    throw new Error('Emailer not available (sendToEmail missing)');
-  }
 
   const language = defaultLanguage();
   const params = Object.assign({}, data || {}, subject ? { subject } : {});
-  await emailer.sendToEmail(template, toEmail, language, params);
+
+  // Common signature: sendToEmail(template, email, language, params)
+  if (emailer && typeof emailer.sendToEmail === 'function') {
+    await emailer.sendToEmail(template, toEmail, language, params);
+    return;
+  }
+
+  // Fallbacks for older builds
+  if (emailer && typeof emailer.send === 'function') {
+    if (emailer.send.length >= 4) {
+      await emailer.send(template, toEmail, language, params);
+      return;
+    }
+    await emailer.send(template, toEmail, params);
+  }
 }
 
 module.exports = {

package/lib/helloassoWebhook.js

@@ -20,10 +20,10 @@ const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 
-const SETTINGS_KEY = 'onekite-calendar';
+const SETTINGS_KEY = 'calendar-onekite';
 
 // Replay protection: store processed payment ids.
-const PROCESSED_KEY = 'onekite-calendar:helloasso:processedPayments';
+const PROCESSED_KEY = 'calendar-onekite:helloasso:processedPayments';
 
 async function sendEmail(template, toEmail, subject, data) {
   const uidFromData = data && Number.isInteger(data.uid) ? data.uid : null;
@@ -348,14 +348,14 @@ async function handler(req, res, next) {
     // 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:onekite-calendar.reservationUpdated', { rid: r.rid, status: r.status });
+        io.sockets.emit('event:calendar-onekite.reservationUpdated', { rid: r.rid, status: r.status });
       }
     } catch (e) {}
 
     // Notify requester
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
-      await sendEmail('onekite-calendar_paid', requester.email, 'Location matériel - Paiement reçu', {
+      await sendEmail('calendar-onekite_paid', requester.email, 'Location matériel - Paiement reçu', {
         uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),

package/lib/scheduler.js

@@ -16,7 +16,7 @@ function getSetting(settings, key, fallback) {
 
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
 async function expirePending() {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
   const now = Date.now();
 
@@ -44,7 +44,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('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const holdMins = parseInt(
     getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')),
     10
@@ -108,7 +108,7 @@ async function processAwaitingPayment() {
 
     if (!r.reminderSent && now >= reminderAt && now < expireAt) {
       // Send reminder once (guarded across clustered NodeBB processes)
-      const reminderKey = 'onekite-calendar:email:reminderSent';
+      const reminderKey = 'calendar-onekite:email:reminderSent';
       const first = await db.setAdd(reminderKey, rid);
       if (!first) {
         // another process already sent it
@@ -119,7 +119,7 @@ async function processAwaitingPayment() {
       }
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (u && u.email) {
-        await sendEmail('onekite-calendar_reminder', u.email, 'Location matériel - Rappel', {
+        await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -138,12 +138,12 @@ async function processAwaitingPayment() {
     if (now >= expireAt) {
       // Expire: remove reservation so it disappears from calendar and frees items
       // Guard email send across clustered NodeBB processes
-      const expiredKey = 'onekite-calendar:email:expiredSent';
+      const expiredKey = 'calendar-onekite:email:expiredSent';
       const firstExpired = await db.setAdd(expiredKey, rid);
       const shouldEmail = !!firstExpired;
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (shouldEmail && u && u.email) {
-        await sendEmail('onekite-calendar_expired', u.email, 'Location matériel - Rappel', {
+        await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),

package/lib/widgets.js

@@ -40,7 +40,7 @@ widgets.defineWidgets = async function (widgetData) {
   }
 
   list.push({
-    widget: 'onekite-calendar-twoweeks',
+    widget: 'calendar-onekite-twoweeks',
     name: 'Calendrier Onekite',
     description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
     content: '',
@@ -54,11 +54,14 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const id = makeDomId();
   const calUrl = widgetCalendarUrl();
   const apiBase = forumBaseUrl();
+  // Prefer the new namespace, but keep a transparent fallback to the legacy one.
   const eventsEndpoint = `${apiBase}/api/v3/plugins/onekite-calendar/events`;
+  const legacyEventsEndpoint = `${apiBase}/api/v3/plugins/calendar-onekite/events`;
 
   const idJson = JSON.stringify(id);
   const calUrlJson = JSON.stringify(calUrl);
   const eventsEndpointJson = JSON.stringify(eventsEndpoint);
+  const legacyEventsEndpointJson = JSON.stringify(legacyEventsEndpoint);
 
   const html = `
 <div class="onekite-twoweeks">
@@ -75,6 +78,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const containerId = ${idJson};
   const calUrl = ${calUrlJson};
   const eventsEndpoint = ${eventsEndpointJson};
+  const legacyEventsEndpoint = ${legacyEventsEndpointJson};
 
   function loadOnce(tag, attrs) {
     return new Promise((resolve, reject) => {
@@ -150,6 +154,13 @@ widgets.renderTwoWeeksWidget = async function (data) {
         const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
         const url1 = eventsEndpoint + '?' + qs.toString();
         fetch(url1, { credentials: 'same-origin' })
+          .then((r) => {
+            if (r && r.status === 404) {
+              const url2 = legacyEventsEndpoint + '?' + qs.toString();
+              return fetch(url2, { credentials: 'same-origin' });
+            }
+            return r;
+          })
           .then((r) => r.json())
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));

package/library.js

@@ -1,5 +1,10 @@
 'use strict';
 
+// We use NodeBB's route helpers for page routes so the rendered page includes
+// the normal client bundle (ajaxify/requirejs). The helper signatures differ
+// across NodeBB versions, but for NodeBB v4.x the order is:
+//   setupPageRoute(router, path, middlewaresArray, handler)
+//   setupAdminPageRoute(router, path, middlewaresArray, handler)
 const routeHelpers = require.main.require('./src/routes/helpers');
 
 const controllers = require('./lib/controllers.js');
@@ -8,7 +13,7 @@ const admin = require('./lib/admin');
 const scheduler = require('./lib/scheduler');
 const helloassoWebhook = require('./lib/helloassoWebhook');
 const widgets = require('./lib/widgets');
-const { NAMESPACE } = require('./lib/constants');
+const { LEGACY_NAMESPACE, NAMESPACE } = require('./lib/constants');
 const bodyParser = require('body-parser');
 
 const Plugin = {};
@@ -19,8 +24,16 @@ const mw = (...fns) => fns.filter(isFn);
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
-  const publicExpose = mw(middleware && (middleware.authenticate || middleware.exposeUid));
+  // Build middleware arrays safely and always spread them into Express route methods.
+  // Express will throw if any callback is undefined, so we filter strictly.
+  // Auth middlewares differ slightly depending on NodeBB configuration.
+  // In v4, some installs rely on middleware.authenticate rather than exposeUid.
+  const baseExpose = mw(middleware && (middleware.authenticate || middleware.exposeUid));
+  const publicExpose = baseExpose;
+  const publicAuth = mw(middleware && (middleware.authenticate || middleware.exposeUid), middleware && middleware.ensureLoggedIn);
 
+  // Robust admin guard: avoid middleware.admin.checkPrivileges() signature differences
+  // across NodeBB versions. We treat membership in the 'administrators' group as admin.
   const Groups = require.main.require('./src/groups');
   async function adminOnly(req, res, next) {
     try {
@@ -37,7 +50,6 @@ Plugin.init = async function (params) {
       return next(err);
     }
   }
-
   const adminMws = mw(
     middleware && (middleware.authenticate || middleware.exposeUid),
     middleware && middleware.ensureLoggedIn,
@@ -45,57 +57,72 @@ Plugin.init = async function (params) {
   );
 
   // Page routes (HTML)
+  // IMPORTANT: pass an ARRAY for middlewares (even if empty), otherwise
+  // setupPageRoute will throw "middlewares is not iterable".
   routeHelpers.setupPageRoute(router, '/calendar', mw(), controllers.renderCalendar);
-
-  // Admin page route
+  // Admin page route (keep legacy + add new)
+  routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${LEGACY_NAMESPACE}`, mw(), admin.renderAdmin);
   routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${NAMESPACE}`, mw(), admin.renderAdmin);
 
-  // Public API (JSON) — NodeBB 4.x (v3 API)
-  router.get(`/api/v3/plugins/${NAMESPACE}/events`, ...publicExpose, api.getEvents);
-  router.get(`/api/v3/plugins/${NAMESPACE}/items`, ...publicExpose, api.getItems);
-  router.get(`/api/v3/plugins/${NAMESPACE}/capabilities`, ...publicExpose, api.getCapabilities);
-
-  router.post(`/api/v3/plugins/${NAMESPACE}/reservations`, ...publicExpose, api.createReservation);
-  router.get(`/api/v3/plugins/${NAMESPACE}/reservations/:rid`, ...publicExpose, api.getReservationDetails);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/approve`, ...publicExpose, api.approveReservation);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/refuse`, ...publicExpose, api.refuseReservation);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/cancel`, ...publicExpose, api.cancelReservation);
-
-  router.post(`/api/v3/plugins/${NAMESPACE}/special-events`, ...publicExpose, api.createSpecialEvent);
-  router.get(`/api/v3/plugins/${NAMESPACE}/special-events/:eid`, ...publicExpose, api.getSpecialEventDetails);
-  router.delete(`/api/v3/plugins/${NAMESPACE}/special-events/:eid`, ...publicExpose, api.deleteSpecialEvent);
+  // Public API (JSON) — NodeBB 4.x only (v3 API)
+  const pluginBases = [LEGACY_NAMESPACE, NAMESPACE];
+  pluginBases.forEach((ns) => {
+    router.get(`/api/v3/plugins/${ns}/events`, ...publicExpose, api.getEvents);
+    router.get(`/api/v3/plugins/${ns}/items`, ...publicExpose, api.getItems);
+    router.get(`/api/v3/plugins/${ns}/capabilities`, ...publicExpose, api.getCapabilities);
+
+    router.post(`/api/v3/plugins/${ns}/reservations`, ...publicExpose, api.createReservation);
+    router.get(`/api/v3/plugins/${ns}/reservations/:rid`, ...publicExpose, api.getReservationDetails);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/approve`, ...publicExpose, api.approveReservation);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/refuse`, ...publicExpose, api.refuseReservation);
+    router.put(`/api/v3/plugins/${ns}/reservations/:rid/cancel`, ...publicExpose, api.cancelReservation);
+
+    router.post(`/api/v3/plugins/${ns}/special-events`, ...publicExpose, api.createSpecialEvent);
+    router.get(`/api/v3/plugins/${ns}/special-events/:eid`, ...publicExpose, api.getSpecialEventDetails);
+    router.delete(`/api/v3/plugins/${ns}/special-events/:eid`, ...publicExpose, api.deleteSpecialEvent);
+  });
 
   // Admin API (JSON)
-  const base = `/api/v3/admin/plugins/${NAMESPACE}`;
+  const adminBases = [`/api/v3/admin/plugins/${LEGACY_NAMESPACE}`, `/api/v3/admin/plugins/${NAMESPACE}`];
 
-  router.get(`${base}/settings`, ...adminMws, admin.getSettings);
-  router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
+  adminBases.forEach((base) => {
+    router.get(`${base}/settings`, ...adminMws, admin.getSettings);
+    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
 
-  router.get(`${base}/pending`, ...adminMws, admin.listPending);
-  router.put(`${base}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
-  router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
+    router.get(`${base}/pending`, ...adminMws, admin.listPending);
+    router.put(`${base}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
+    router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
 
-  router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
+    router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
+    // Accounting / exports
+    router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
+    router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
+    router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
 
-  router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
-  router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
-  router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
-
-  router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+    // Purge special events by year
+    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+  });
 
-  // HelloAsso webhook endpoint (signature verified)
+  // HelloAsso callback endpoint (hardened)
+  // - Only accepts POST
+  // - Verifies x-ha-signature (HMAC SHA-256) using the configured client secret
+  // - Basic replay protection
+  // NOTE: we capture the raw body for signature verification.
   const helloassoJson = bodyParser.json({
     verify: (req, _res, buf) => {
       req.rawBody = buf;
     },
     type: ['application/json', 'application/*+json'],
   });
-
+  // Accept webhook on both legacy root path and namespaced plugin path.
+  // Some reverse proxies block unknown root paths, so /plugins/... is recommended.
   router.post('/helloasso', helloassoJson, helloassoWebhook.handler);
+  router.post(`/plugins/${LEGACY_NAMESPACE}/helloasso`, helloassoJson, helloassoWebhook.handler);
   router.post(`/plugins/${NAMESPACE}/helloasso`, helloassoJson, helloassoWebhook.handler);
 
-  // Optional health checks
+  // Optional: health checks
   router.get('/helloasso', (req, res) => res.json({ ok: true }));
+  router.get(`/plugins/${LEGACY_NAMESPACE}/helloasso`, (req, res) => res.json({ ok: true }));
   router.get(`/plugins/${NAMESPACE}/helloasso`, (req, res) => res.json({ ok: true }));
 
   scheduler.start();
@@ -104,20 +131,24 @@ Plugin.init = async function (params) {
 Plugin.addAdminNavigation = async function (header) {
   header.plugins = header.plugins || [];
   header.plugins.push({
-    route: `/plugins/${NAMESPACE}`,
+    route: `/plugins/${LEGACY_NAMESPACE}`,
     icon: 'fa-calendar',
-    name: 'Onekite Calendar',
+    name: 'Calendar Onekite',
   });
   return header;
 };
 
+
 // Ensure our transactional emails always get a subject.
+// NodeBB's Emailer.sendToEmail signature expects (template, email, language, params),
+// so plugins typically inject/modify the subject via this hook.
 Plugin.emailModify = async function (data) {
   try {
     if (!data || !data.template) return data;
     const tpl = String(data.template);
-    if (!tpl.startsWith('onekite-calendar_')) return data;
+    if (!tpl.startsWith('calendar-onekite_')) return data;
 
+    // If the caller provided a subject (we pass it in params.subject), copy it to data.subject.
     const provided = data.params && data.params.subject ? String(data.params.subject) : '';
     if (provided && (!data.subject || !String(data.subject).trim())) {
       data.subject = provided;
@@ -130,4 +161,4 @@ Plugin.emailModify = async function (data) {
 Plugin.defineWidgets = widgets.defineWidgets;
 Plugin.renderTwoWeeksWidget = widgets.renderTwoWeeksWidget;
 
-module.exports = Plugin;
+module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -21,7 +21,7 @@
       "method": "defineWidgets"
     },
     {
-      "hook": "filter:widget.render:onekite-calendar-twoweeks",
+      "hook": "filter:widget.render:calendar-onekite-twoweeks",
       "method": "renderTwoWeeksWidget"
     }
   ],
@@ -30,8 +30,14 @@
   },
   "templates": "./templates",
   "modules": {
-    "admin/plugins/onekite-calendar": "./public/admin.js",
-    "forum/onekite-calendar": "./public/client.js"
+    "../admin/plugins/calendar-onekite.js": "./public/admin.js",
+    "admin/plugins/calendar-onekite": "./public/admin.js"
   },
-  "version": "1.1.0"
+  "scripts": [
+    "public/client.js"
+  ],
+  "acpScripts": [
+    "public/admin.js"
+  ],
+  "version": "1.0.7"
 }

package/public/admin.js

@@ -1,5 +1,5 @@
 
-define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts, bootbox) {
+define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbox) {
   'use strict';
 
   // Cache of pending reservations keyed by rid so delegated click handlers
@@ -11,11 +11,11 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
     // by NodeBB ACP save buttons/hooks across ajaxify navigations.
     try {
       const now = Date.now();
-      const last = window.onekiteCalendarLastAlert;
+      const last = window.oneKiteCalendarLastAlert;
       if (last && last.type === type && last.msg === msg && (now - last.ts) < 1200) {
         return;
       }
-      window.onekiteCalendarLastAlert = { type, msg, ts: now };
+      window.oneKiteCalendarLastAlert = { type, msg, ts: now };
     } catch (e) {}
     try {
       if (alerts && typeof alerts[type] === 'function') {
@@ -46,7 +46,30 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
 
     if (!res.ok) {
-            const text = await res.text().catch(() => '');
+      // NodeBB versions differ: some expose admin APIs under /api/admin instead of /api/v3/admin
+      if (res.status === 404 && typeof url === 'string' && url.includes('/api/v3/admin/')) {
+        const altUrl = url.replace('/api/v3/admin/', '/api/admin/');
+        const res2 = await fetch(altUrl, {
+          credentials: 'same-origin',
+          headers: (() => {
+            const headers = { 'Content-Type': 'application/json' };
+            const token =
+              (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
+              (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
+              (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
+              (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
+              (typeof app !== 'undefined' && app && app.csrfToken) ||
+              null;
+            if (token) headers['x-csrf-token'] = token;
+            return headers;
+          })(),
+          ...opts,
+        });
+        if (res2.ok) {
+          return await res2.json();
+        }
+      }
+      const text = await res.text().catch(() => '');
       throw new Error(`${res.status} ${text}`);
     }
     return await res.json();
@@ -244,36 +267,36 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
   }
 
   async function loadSettings() {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/settings');
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/settings');
   }
 
   async function saveSettings(payload) {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/settings', {
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/settings', {
       method: 'PUT',
       body: JSON.stringify(payload),
     });
   }
 
   async function loadPending() {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/pending');
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/pending');
   }
 
   async function approve(rid, payload) {
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/reservations/${rid}/approve`, {
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/approve`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function refuse(rid, payload) {
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/reservations/${rid}/refuse`, {
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function purge(year) {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/purge', {
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/purge', {
       method: 'POST',
       body: JSON.stringify({ year }),
     });
@@ -281,12 +304,12 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
   async function purgeSpecialEvents(year) {
     try {
-      return await fetchJson('/api/v3/admin/plugins/onekite-calendar/special-events/purge', {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
         method: 'POST',
         body: JSON.stringify({ year }),
       });
     } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/onekite-calendar/special-events/purge', {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
         method: 'POST',
         body: JSON.stringify({ year }),
       });
@@ -298,7 +321,7 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
     if (from) params.set('from', from);
     if (to) params.set('to', to);
     const qs = params.toString();
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/accounting${qs ? `?${qs}` : ''}`);
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/accounting${qs ? `?${qs}` : ''}`);
   }
 
   async function init() {
@@ -361,19 +384,19 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
     // Expose the latest save handler so the global delegated listener (bound once)
     // can always call the current instance tied to the current form.
-    window.onekiteCalendarAdminDoSave = doSave;
+    window.oneKiteCalendarAdminDoSave = doSave;
 
     // Save buttons (NodeBB header/footer "Enregistrer" + floppy icon)
     // Bind a SINGLE delegated listener for the entire admin session.
     const SAVE_SELECTOR = '#save, .save, [data-action="save"], .settings-save, .floating-save, .btn[data-action="save"]';
-    if (!window.onekiteCalendarAdminBound) {
-      window.onekiteCalendarAdminBound = true;
+    if (!window.oneKiteCalendarAdminBound) {
+      window.oneKiteCalendarAdminBound = true;
       document.addEventListener('click', (ev) => {
         const btn = ev.target && ev.target.closest && ev.target.closest(SAVE_SELECTOR);
         if (!btn) return;
         // Only handle clicks while we're on this plugin page
         if (!document.getElementById('onekite-settings-form')) return;
-        const fn = window.onekiteCalendarAdminDoSave;
+        const fn = window.oneKiteCalendarAdminDoSave;
         if (typeof fn === 'function') fn(ev);
       });
     }
@@ -697,7 +720,7 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
         if (accFrom && accFrom.value) params.set('from', accFrom.value);
         if (accTo && accTo.value) params.set('to', accTo.value);
         const qs = params.toString();
-        const url = `/api/v3/admin/plugins/onekite-calendar/accounting.csv${qs ? `?${qs}` : ''}`;
+        const url = `/api/v3/admin/plugins/calendar-onekite/accounting.csv${qs ? `?${qs}` : ''}`;
         window.open(url, '_blank');
       });
 
@@ -710,7 +733,7 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
             if (accFrom && accFrom.value) params.set('from', accFrom.value);
             if (accTo && accTo.value) params.set('to', accTo.value);
             const qs = params.toString();
-            const url = `/api/v3/admin/plugins/onekite-calendar/accounting/purge${qs ? `?${qs}` : ''}`;
+            const url = `/api/v3/admin/plugins/calendar-onekite/accounting/purge${qs ? `?${qs}` : ''}`;
             const res = await fetchJson(url, { method: 'POST' });
             if (res && res.ok) {
               showAlert('success', `Compta purgée : ${res.purged || 0} réservation(s).`);

package/public/client.js

@@ -1,6 +1,6 @@
 /* global FullCalendar, ajaxify */
 
-define('forum/onekite-calendar', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
+define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
   // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
@@ -498,7 +498,7 @@ define('forum/onekite-calendar', ['alerts', 'bootbox', 'hooks'], function (alert
   }
 
   async function loadCapabilities() {
-    return await fetchJson('/api/v3/plugins/onekite-calendar/capabilities');
+    return await fetchJson('/api/v3/plugins/calendar-onekite/capabilities');
   }
 
   // Leaflet (OpenStreetMap) helpers - loaded lazily only when needed.
@@ -706,34 +706,34 @@ function attachAddressAutocomplete(inputEl, onPick) {
 
   async function loadItems() {
     try {
-      return await fetchJson('/api/v3/plugins/onekite-calendar/items');
+      return await fetchJson('/api/v3/plugins/calendar-onekite/items');
     } catch (e) {
       return [];
     }
   }
 
   async function requestReservation(payload) {
-    return await fetchJson('/api/v3/plugins/onekite-calendar/reservations', {
+    return await fetchJson('/api/v3/plugins/calendar-onekite/reservations', {
       method: 'POST',
       body: JSON.stringify(payload),
     });
   }
 
   async function approveReservation(rid, payload) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/approve`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/approve`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function cancelReservation(rid) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/cancel`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/cancel`, {
       method: 'PUT',
     });
   }
 
   async function refuseReservation(rid, payload) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/refuse`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
@@ -783,7 +783,7 @@ function toDatetimeLocalValue(date) {
     let blocked = new Set();
     try {
       const qs = new URLSearchParams({ start: selectionInfo.startStr, end: selectionInfo.endStr });
-      const evs = await fetchJson(`/api/v3/plugins/onekite-calendar/events?${qs.toString()}`);
+      const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
         if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
@@ -1094,7 +1094,7 @@ function toDatetimeLocalValue(date) {
           window.__onekiteEventsAbort = abort;
 
           const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
-          const url = `/api/v3/plugins/onekite-calendar/events?${qs.toString()}`;
+          const url = `/api/v3/plugins/calendar-onekite/events?${qs.toString()}`;
           const data = await fetchJsonCached(url, { signal: abort.signal });
 
           // Prefetch adjacent range (previous/next) for snappier navigation.
@@ -1108,8 +1108,8 @@ function toDatetimeLocalValue(date) {
               const toStr = (d) => new Date(d.getTime()).toISOString();
               const qPrev = new URLSearchParams({ start: toStr(prevStart), end: toStr(prevEnd) });
               const qNext = new URLSearchParams({ start: toStr(nextStart), end: toStr(nextEnd) });
-              fetchJsonCached(`/api/v3/plugins/onekite-calendar/events?${qPrev.toString()}`).catch(() => {});
-              fetchJsonCached(`/api/v3/plugins/onekite-calendar/events?${qNext.toString()}`).catch(() => {});
+              fetchJsonCached(`/api/v3/plugins/calendar-onekite/events?${qPrev.toString()}`).catch(() => {});
+              fetchJsonCached(`/api/v3/plugins/calendar-onekite/events?${qNext.toString()}`).catch(() => {});
             }
           } catch (e) {}
 
@@ -1171,11 +1171,11 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
               return;
             }
-            await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -1265,11 +1265,11 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
               return;
             }
-            await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -1296,10 +1296,10 @@ function toDatetimeLocalValue(date) {
         let p = p0;
         try {
           if (p0.type === 'reservation' && p0.rid) {
-            const details = await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${encodeURIComponent(String(p0.rid))}`);
+            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${encodeURIComponent(String(p0.rid))}`);
             p = Object.assign({}, p0, details);
           } else if (p0.type === 'special' && p0.eid) {
-            const details = await fetchJson(`/api/v3/plugins/onekite-calendar/special-events/${encodeURIComponent(String(p0.eid))}`);
+            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(String(p0.eid))}`);
             p = Object.assign({}, p0, details, {
               // keep backward compat with older field names used by templates below
               pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
@@ -1348,7 +1348,7 @@ function toDatetimeLocalValue(date) {
                   callback: async () => {
                     try {
                       const eid = String(p.eid || ev.id).replace(/^special:/, '');
-                      await fetchJson(`/api/v3/plugins/onekite-calendar/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
+                      await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
                       showAlert('success', 'Évènement supprimé.');
                       calendar.refetchEvents();
                     } catch (e) {
@@ -1667,7 +1667,7 @@ function toDatetimeLocalValue(date) {
     });
 
     // Expose for live updates
-    try { window.onekiteCalendar = calendar; } catch (e) {}
+    try { window.oneKiteCalendar = calendar; } catch (e) {}
 
     calendar.render();
 
@@ -1766,7 +1766,7 @@ function toDatetimeLocalValue(date) {
   function autoInit(data) {
     try {
       const tpl = data && data.template ? data.template.name : (ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
-      if (tpl === 'onekite-calendar') {
+      if (tpl === 'calendar-onekite') {
         init('#onekite-calendar');
       }
     } catch (e) {}
@@ -1786,9 +1786,9 @@ function toDatetimeLocalValue(date) {
 try {
   if (!window.__oneKiteSocketBound && typeof socket !== 'undefined' && socket && typeof socket.on === 'function') {
     window.__oneKiteSocketBound = true;
-    socket.on('event:onekite-calendar.reservationUpdated', function () {
+    socket.on('event:calendar-onekite.reservationUpdated', function () {
       try {
-        const cal = window.onekiteCalendar;
+        const cal = window.oneKiteCalendar;
         scheduleRefetch(cal);
       } catch (e) {}
     });

package/templates/admin/plugins/{onekite-calendar.tpl → calendar-onekite.tpl}

@@ -186,7 +186,7 @@
 </div>
 
 <script>
-  require(['admin/plugins/onekite-calendar'], function (mod) {
+  require(['admin/plugins/calendar-onekite'], function (mod) {
     if (mod && mod.init) {
       mod.init();
     }

package/templates/{onekite-calendar.tpl → calendar-onekite.tpl}

@@ -21,17 +21,6 @@
   The plugin's forum script auto-initialises on the calendar page via ajaxify.
 -->
 
-<script>
-  // Ultra-perf: load the forum JS only on the calendar page.
-  require(['forum/onekite-calendar'], function (mod) {
-    try {
-      if (mod && typeof mod.init === 'function') {
-        mod.init('#onekite-calendar');
-      }
-    } catch (e) {}
-  });
-</script>
-
 
 <style>
   /* Make the custom "Évènement" button distinct from view buttons */