nodebb-plugin-onekite-calendar 1.0.3 → 1.0.4

package/lib/api.js

@@ -3,14 +3,50 @@
 const crypto = require('crypto');
 
 const meta = require.main.require('./src/meta');
-const emailer = require.main.require('./src/emailer');
 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');
+// logger available if you want to debug locally; we avoid noisy logs in prod.
 
 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.
@@ -52,36 +88,7 @@ function normalizeAllowedGroups(raw) {
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 
-// Email helper: NodeBB's Emailer signature differs across versions.
-// We try the common forms. Any failure is logged for debugging.
-async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
-  try {
-    // NodeBB core signature (historically):
-    //   Emailer.sendToEmail(template, email, language, params[, callback])
-    // Subject is not a positional arg; it must be injected (either by NodeBB itself
-    // or via filter:email.modify). We always pass it in params.subject.
-    const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-    const params = Object.assign({}, data || {}, subject ? { subject } : {});
-    if (typeof emailer.sendToEmail === 'function') {
-      await emailer.sendToEmail(template, toEmail, language, params);
-      return;
-    }
-    // Fallback for older/unusual builds (rare)
-    if (typeof emailer.send === 'function') {
-      // Some builds accept (template, email, language, params)
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, language, params);
-        return;
-      }
-      // Some builds accept (template, email, params)
-      await emailer.send(template, toEmail, params);
-    }
-  } catch (err) {
-    // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
-  }
-}
+// Email helper is in lib/email.js (no logs here).
 
 function normalizeBaseUrl(meta) {
   // Prefer meta.config.url, fallback to nconf.get('url')
@@ -102,7 +109,8 @@ function normalizeCallbackUrl(configured, meta) {
   let url = (configured || '').trim();
   if (!url) {
     // Default webhook endpoint (recommended): namespaced under /plugins
-    url = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
+    // Prefer the new namespace; legacy endpoint remains available.
+    url = base ? `${base}/plugins/onekite-calendar/helloasso` : '';
   }
   if (url && url.startsWith('/') && base) {
     url = `${base}${url}`;
@@ -328,7 +336,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('calendar-onekite');
+  const settings = await meta.settings.get('onekite-calendar');
   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;
@@ -336,20 +344,89 @@ 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 ids = await dbLayer.listReservationIdsByStartRange(wideStart, endTs, 5000);
+
+  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 out = [];
-  // 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 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;
       const minimal = {
         id: ev.id,
         title: ev.title,
@@ -367,53 +444,30 @@ api.getEvents = async function (req, res) {
           canModerate: canMod,
         },
       };
-      // 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;
-        }
-      }
+      if (p._username && ownerOrMod) minimal.extendedProps.username = String(p._username);
+      if (p._hasPayment && ownerOrMod) minimal.extendedProps.hasPayment = true;
       out.push(minimal);
-    }
-  }
-
-  // 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);
+    } else if (p.type === 'special') {
+      const ownerOrPriv = canMod || canSpecialDelete || (p.uid && uidStr && String(p.uid) === uidStr);
       const minimal = {
-        id: full.id,
-        title: full.title,
-        allDay: full.allDay,
-        start: full.start,
-        end: full.end,
-        backgroundColor: full.backgroundColor,
-        borderColor: full.borderColor,
-        textColor: full.textColor,
+        id: ev.id,
+        title: ev.title,
+        allDay: ev.allDay,
+        start: ev.start,
+        end: ev.end,
+        backgroundColor: ev.backgroundColor,
+        borderColor: ev.borderColor,
+        textColor: ev.textColor,
         extendedProps: {
           type: 'special',
-          eid: sev.eid,
+          eid: p.eid,
           canCreateSpecial: canSpecialCreate,
           canDeleteSpecial: canSpecialDelete,
         },
       };
-      if (sev.username && (canMod || canSpecialDelete || (req.uid && String(req.uid) === String(sev.uid)))) {
-        minimal.extendedProps.username = String(sev.username);
-      }
+      if (p._username && ownerOrPriv) minimal.extendedProps.username = String(p._username);
       out.push(minimal);
     }
-  } catch (e) {
-    // ignore
   }
 
   // Stable ordering -> stable ETag
@@ -428,7 +482,8 @@ api.getEvents = async function (req, res) {
 
   const etag = computeEtag(out);
   res.setHeader('ETag', etag);
-  res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
+  // Short caching + ETag revalidation keeps the feed snappy and reduces bandwidth.
+  res.setHeader('Cache-Control', 'private, max-age=15, must-revalidate');
   if (String(req.headers['if-none-match'] || '') === etag) {
     return res.status(304).end();
   }
@@ -440,7 +495,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 meta.settings.get('onekite-calendar');
   const canMod = await canValidate(uid, settings);
 
   const rid = String(req.params.rid || '').trim();
@@ -482,7 +537,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 meta.settings.get('onekite-calendar');
   const canMod = await canValidate(uid, settings);
   const canSpecialDelete = await canDeleteSpecial(uid, settings);
 
@@ -511,7 +566,7 @@ api.getSpecialEventDetails = async function (req, res) {
 };
 
 api.getCapabilities = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await meta.settings.get('onekite-calendar');
   const uid = req.uid || 0;
   const canMod = uid ? await canValidate(uid, settings) : false;
   res.json({
@@ -522,7 +577,7 @@ api.getCapabilities = async function (req, res) {
 };
 
 api.createSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await meta.settings.get('onekite-calendar');
   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' });
@@ -558,7 +613,7 @@ api.createSpecialEvent = async function (req, res) {
 };
 
 api.deleteSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await meta.settings.get('onekite-calendar');
   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' });
@@ -569,7 +624,7 @@ api.deleteSpecialEvent = async function (req, res) {
 };
 
 api.getItems = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await meta.settings.get('onekite-calendar');
 
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
@@ -610,7 +665,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 meta.settings.get('onekite-calendar');
   const startPreview = toTs(req.body.start);
   const ok = await canRequest(uid, settings, startPreview);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
@@ -707,7 +762,7 @@ api.createReservation = async function (req, res) {
 
         for (const md of (usersData || [])) {
           if (md && md.email) {
-            await sendEmail('calendar-onekite_pending', md.email, 'Location matériel - Demande de réservation', {
+            await sendEmail('onekite-calendar_pending', md.email, 'Location matériel - Demande de réservation', {
               username: md.username,
               requester: requester.username,
               itemName: itemsLabel,
@@ -722,7 +777,7 @@ api.createReservation = async function (req, res) {
       }
     }
   } catch (e) {
-    console.warn('[calendar-onekite] Failed to send pending email', e && e.message ? e.message : e);
+    log.warn('Failed to send pending email', e && e.message ? e.message : e);
   }
 
   // Discord webhook (optional)
@@ -746,7 +801,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 meta.settings.get('onekite-calendar');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -773,7 +828,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 meta.settings.get('onekite-calendar');
     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);
@@ -788,7 +843,7 @@ api.approveReservation = async function (req, res) {
       totalAmount: (() => {
         const cents = Math.max(0, Math.round((Number(r.total) || 0) * 100));
         if (!cents) {
-          console.warn('[calendar-onekite] HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
+          log.warn('HelloAsso totalAmount is 0 (approve API)', { rid, total: r.total });
         }
         return cents;
       })(),
@@ -797,7 +852,7 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: 'Réservation matériel OneKite',
+      itemName: 'Réservation matériel Onekite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },
     });
@@ -809,7 +864,7 @@ api.approveReservation = async function (req, res) {
         r.checkoutIntentId = checkoutIntentId;
       }
     } else {
-      console.warn('[calendar-onekite] HelloAsso payment link not created (approve API)', { rid });
+      log.warn('HelloAsso payment link not created (approve API)', { rid });
     }
   } catch (e) {
     // ignore payment link errors, admin can retry
@@ -825,7 +880,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('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
+    await sendEmail('onekite-calendar_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] : [])),
@@ -849,7 +904,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 meta.settings.get('onekite-calendar');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -864,7 +919,7 @@ api.refuseReservation = async function (req, res) {
 
   const requester = await user.getUserFields(r.uid, ['username', 'email']);
   if (requester && requester.email) {
-    await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Demande de réservation', {
+    await sendEmail('onekite-calendar_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] : [])),
@@ -884,7 +939,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 meta.settings.get('onekite-calendar');
   const rid = String(req.params.rid || '').trim();
   if (!rid) return res.status(400).json({ error: 'missing-rid' });
 

package/lib/constants.js

@@ -0,0 +1,7 @@
+'use strict';
+
+// Primary namespace for this plugin (NodeBB 4.x)
+module.exports = {
+  NAMESPACE: 'onekite-calendar',
+  WIDGET_ID: 'onekite-calendar-twoweeks',
+};

package/lib/controllers.js

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

package/lib/db.js

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

package/lib/discord.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const https = require('https');
+const log = require('./log');
 const { URL } = require('url');
 
 function isEnabled(v, defaultValue) {
@@ -36,7 +37,7 @@ function postWebhook(webhookUrl, payload) {
         headers: {
           'Content-Type': 'application/json',
           'Content-Length': body.length,
-          'User-Agent': 'nodebb-plugin-calendar-onekite',
+          'User-Agent': 'nodebb-plugin-onekite-calendar',
         },
       }, (res) => {
         const ok = res.statusCode && res.statusCode >= 200 && res.statusCode < 300;
@@ -88,7 +89,7 @@ function buildReservationMessage(kind, reservation) {
 function buildWebhookPayload(kind, reservation) {
   // Discord "regroupe" visuellement les messages consécutifs d'un même auteur.
   // En utilisant un username différent par action, on obtient un message bien distinct.
-  const webhookUsername = kind === 'paid' ? 'OneKite • Paiement' : 'OneKite • Réservation';
+  const webhookUsername = kind === 'paid' ? 'Onekite • Paiement' : 'Onekite • Réservation';
 
   const calUrl = 'https://www.onekite.com/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
@@ -124,7 +125,7 @@ function buildWebhookPayload(kind, reservation) {
           ? 'Un paiement a été reçu pour une réservation.'
           : 'Une nouvelle demande de réservation a été créée.',
         fields,
-        footer: { text: 'OneKite • Calendrier' },
+        footer: { text: 'Onekite • Calendrier' },
         timestamp: new Date().toISOString(),
       },
     ],
@@ -140,7 +141,7 @@ async function notifyReservationRequested(settings, reservation) {
     await postWebhook(url, buildWebhookPayload('request', reservation));
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Discord webhook failed (request)', e && e.message ? e.message : String(e));
+    log.warn('Discord webhook failed (request)', e && e.message ? e.message : String(e));
   }
 }
 
@@ -153,7 +154,7 @@ async function notifyPaymentReceived(settings, reservation) {
     await postWebhook(url, buildWebhookPayload('paid', reservation));
   } catch (e) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Discord webhook failed (paid)', e && e.message ? e.message : String(e));
+    log.warn('Discord webhook failed (paid)', e && e.message ? e.message : String(e));
   }
 }
 

package/lib/email.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
+
+function defaultLanguage() {
+  return (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+}
+
+/**
+ * Send a transactional email using NodeBB's emailer (NodeBB 4.x).
+ */
+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);
+}
+
+module.exports = {
+  sendEmail,
+};

package/lib/helloasso.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const https = require('https');
+const log = require('./log');
 
 function requestJson(method, url, headers = {}, bodyObj = null) {
   return new Promise((resolve) => {
@@ -284,11 +285,11 @@ async function listCatalogItems({ env, token, organizationSlug, formType, formSl
 async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail, callbackUrl, webhookUrl, itemName, containsDonation, metadata }) {
   if (!token || !organizationSlug) return null;
   if (!callbackUrl || !/^https?:\/\//i.test(String(callbackUrl))) {
-    console.warn('[calendar-onekite] HelloAsso invalid return/back/error URL', { callbackUrl });
+    log.warn('HelloAsso invalid return/back/error URL', { callbackUrl });
     return null;
   }
   if (webhookUrl && !/^https?:\/\//i.test(String(webhookUrl))) {
-    console.warn('[calendar-onekite] HelloAsso invalid webhook URL', { webhookUrl });
+    log.warn('HelloAsso invalid webhook URL', { webhookUrl });
   }
   // Checkout intents are created at organization level.
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
@@ -311,7 +312,7 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
   // Log the error payload to help diagnose configuration issues (slug, env, urls, amount, etc.)
   try {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] HelloAsso checkout-intent failed', { status, json });
+    log.warn('HelloAsso checkout-intent failed', { status, json });
   } catch (e) { /* ignore */ }
   return null;
 }

package/lib/helloassoWebhook.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const crypto = require('crypto');
+const log = require('./log');
 
 const db = require.main.require('./src/database');
 const meta = require.main.require('./src/meta');
@@ -19,10 +20,10 @@ const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 const discord = require('./discord');
 
-const SETTINGS_KEY = 'calendar-onekite';
+const SETTINGS_KEY = 'onekite-calendar';
 
 // Replay protection: store processed payment ids.
-const PROCESSED_KEY = 'calendar-onekite:helloasso:processedPayments';
+const PROCESSED_KEY = 'onekite-calendar:helloasso:processedPayments';
 
 async function sendEmail(template, toEmail, subject, data) {
   const uidFromData = data && Number.isInteger(data.uid) ? data.uid : null;
@@ -67,7 +68,7 @@ async function sendEmail(template, toEmail, subject, data) {
     // fall back to sendToEmail only.
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
+    log.warn('Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
   }
 }
 
@@ -281,7 +282,7 @@ async function handler(req, res, next) {
 
     if (allowedIps.length && clientIp && !allowedIps.includes(clientIp)) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook blocked by IP allowlist', { ip: clientIp, allowed: allowedIps });
+      log.warn('HelloAsso webhook blocked by IP allowlist', { ip: clientIp, allowed: allowedIps });
       return res.status(403).json({ ok: false, error: 'ip-not-allowed' });
     }
 
@@ -324,7 +325,7 @@ async function handler(req, res, next) {
     }
     if (!resolvedRid) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook missing reservationId in metadata', { eventType: payload && payload.eventType, paymentId, checkoutIntentId });
+      log.warn('HelloAsso webhook missing reservationId in metadata', { eventType: payload && payload.eventType, paymentId, checkoutIntentId });
       // Do NOT mark as processed: if metadata/config is fixed later, a manual replay may be possible.
       return res.json({ ok: true, processed: false, missingReservationId: true });
     }
@@ -347,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:calendar-onekite.reservationUpdated', { rid: r.rid, status: r.status });
+        io.sockets.emit('event:onekite-calendar.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('calendar-onekite_paid', requester.email, 'Location matériel - Paiement reçu', {
+      await sendEmail('onekite-calendar_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 || '')),