nodebb-plugin-calendar-onekite 12.0.21 → 12.0.22

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.3.0
+### Optimisations / robustesse
+- Scheduler : lecture des réservations en batch (suppression du N+1 DB) + envoi email factorisé.
+- Settings : cache mémoire court (TTL) pour réduire les `meta.settings.get` répétitifs.
+- API events : pagination interne (évite la troncature silencieuse > 5000) + ETag optimisé pour gros payloads.
+- Dates allDay : formatage en **Europe/Paris** pour éviter les décalages UTC.
+- Widget : titre simplifié (suppression de “2 semaines”).
+
 ## 1.1.0
 ### Perf / prod (NodeBB v4)
 - FullCalendar : passage au CDN **@latest** et utilisation de `main.min.css` (supprime l’erreur 404 `index.global.min.css`).

package/lib/admin.js

@@ -111,13 +111,9 @@ admin.saveSettings = async function (req, res) {
 
 admin.listPending = async function (req, res) {
   const ids = await dbLayer.listAllReservationIds(5000);
-  const pending = [];
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (r && r.status === 'pending') {
-      pending.push(r);
-    }
-  }
+  // Batch fetch to avoid N DB round-trips.
+  const rows = await dbLayer.getReservations(ids);
+  const pending = (rows || []).filter(r => r && r.status === 'pending');
   pending.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));
   res.json(pending);
 };

package/lib/api.js

@@ -3,7 +3,6 @@
 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');
@@ -11,6 +10,8 @@ const db = require.main.require('./src/database');
 const logger = require.main.require('./src/logger');
 
 const dbLayer = require('./db');
+const { getSettingsCached } = require('./settings');
+const { sendEmail } = require('./email');
 
 // Fast membership check without N calls to groups.isMember.
 // NodeBB's groups.getUserGroups([uid]) returns an array (per uid) of group objects.
@@ -52,37 +53,22 @@ 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) });
-  }
+// Format yyyy-mm-dd in Europe/Paris to avoid UTC day-shifts for allDay events.
+const PARIS_DATE_FMT = new Intl.DateTimeFormat('en-CA', {
+  timeZone: 'Europe/Paris',
+  year: 'numeric',
+  month: '2-digit',
+  day: '2-digit',
+});
+
+function toParisIsoDate(ts) {
+  const n = parseInt(ts, 10);
+  if (!n) return '';
+  return PARIS_DATE_FMT.format(new Date(n)); // en-CA => YYYY-MM-DD
 }
 
+// sendEmail is provided by ./email
+
 function normalizeBaseUrl(meta) {
   // Prefer meta.config.url, fallback to nconf.get('url')
   let base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
@@ -182,26 +168,27 @@ async function canRequest(uid, settings, startTs) {
   const defaultGroup = autoCreatorGroupForYear(year);
 
   // ACP may store group slugs as CSV string or array depending on NodeBB/admin UI.
+  // On some installs, the UI stores *names* rather than slugs; we accept both.
   const raw = settings.creatorGroups ?? settings.allowedGroups ?? [];
   const extraGroups = normalizeAllowedGroups(raw);
 
-  const allowedSlugs = [...new Set([defaultGroup, ...extraGroups].filter(Boolean))];
+  const allowed = [...new Set([defaultGroup, ...extraGroups].filter(Boolean))];
+  if (!allowed.length) return false;
 
-  // Use getUserGroups (returns group objects) and compare slugs.
+  // Fast path: compare against user's groups (slug + name).
   try {
-    const ug = await groups.getUserGroups([uid]);
-    const list = (ug && ug[0]) ? ug[0] : [];
-    const userSlugs = list.map(g => (g && g.slug) ? String(g.slug) : '').filter(Boolean);
-    return allowedSlugs.some(s => userSlugs.includes(s));
+    if (await userInAnyGroup(uid, allowed)) return true;
   } catch (e) {
-    // Fallback: try isMember on each allowed slug (some installs accept slug)
-    for (const g of allowedSlugs) {
-      try {
-        if (await groups.isMember(uid, g)) return true;
-      } catch (err) {}
-    }
-    return false;
+    // ignore
   }
+
+  // Fallback: try isMember on each allowed entry (slug on most installs)
+  for (const g of allowed) {
+    try {
+      if (await groups.isMember(uid, g)) return true;
+    } catch (err) {}
+  }
+  return false;
 }
 
 async function canValidate(uid, settings) {
@@ -209,7 +196,8 @@ async function canValidate(uid, settings) {
   // even if validatorGroups is empty.
   try {
     const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;} catch (e) {}
+    if (isAdmin) return true;
+  } catch (e) {}
 
   const allowed = normalizeAllowedGroups(settings.validatorGroups || '');
   if (!allowed.length) return false;
@@ -222,7 +210,8 @@ async function canCreateSpecial(uid, settings) {
   if (!uid) return false;
   try {
     const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;} catch (e) {}
+    if (isAdmin) return true;
+  } catch (e) {}
   const allowed = normalizeAllowedGroups(settings.specialCreatorGroups || '');
   if (!allowed.length) return false;
   if (await userInAnyGroup(uid, allowed)) return true;
@@ -234,7 +223,8 @@ async function canDeleteSpecial(uid, settings) {
   if (!uid) return false;
   try {
     const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;} catch (e) {}
+    if (isAdmin) return true;
+  } catch (e) {}
   const allowed = normalizeAllowedGroups(settings.specialDeleterGroups || settings.specialCreatorGroups || '');
   if (!allowed.length) return false;
   if (await userInAnyGroup(uid, allowed)) return true;
@@ -246,8 +236,8 @@ function eventsFor(resv) {
   const status = resv.status;
   const icons = { pending: '⏳', awaiting_payment: '💳', paid: '✅' };
   const colors = { pending: '#f39c12', awaiting_payment: '#d35400', paid: '#27ae60' };
-  const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
-  const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
+  const startIsoDate = toParisIsoDate(resv.start);
+  const endIsoDate = toParisIsoDate(resv.end);
 
   const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds : (resv.itemId ? [resv.itemId] : []);
   const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : []);
@@ -314,9 +304,11 @@ function eventsForSpecial(ev) {
 
 const api = {};
 
-function computeEtag(payload) {
+function computeEtag(payload, metaSig) {
   // Weak ETag is fine here: it is only used to skip identical JSON payloads.
-  const hash = crypto.createHash('sha1').update(JSON.stringify(payload)).digest('hex');
+  // For large payloads, hashing a short signature is cheaper than JSON.stringify(...).
+  const input = metaSig ? String(metaSig) : JSON.stringify(payload);
+  const hash = crypto.createHash('sha1').update(input).digest('hex');
   return `W/"${hash}"`;
 }
 
@@ -324,7 +316,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 getSettingsCached('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;
@@ -332,8 +324,27 @@ 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);
+  // Avoid silent truncation if there are >5000 matches.
+  const CHUNK = 5000;
+  let offset = 0;
+  const ids = [];
+  while (true) {
+    const part = await dbLayer.listReservationIdsByStartRangePaged(wideStart, endTs, offset, CHUNK);
+    if (!part || !part.length) break;
+    ids.push(...part);
+    if (part.length < CHUNK) break;
+    offset += CHUNK;
+    // Safety to avoid unbounded loops on pathological datasets.
+    if (offset > 200000) {
+      logger.warn('[calendar-onekite] getEvents exceeded 200k ids; truncating response', {
+        wideStart,
+        endTs,
+      });
+      break;
+    }
+  }
   const out = [];
+  let maxUpdated = 0;
   // Batch fetch = major perf win when there are many reservations.
   const reservations = await dbLayer.getReservations(ids);
   for (const r of (reservations || [])) {
@@ -345,6 +356,8 @@ api.getEvents = async function (req, res) {
     const rStart = parseInt(r.start, 10);
     const rEnd = parseInt(r.end, 10);
     if (!(rStart < endTs && startTs < rEnd)) continue; // overlap check
+    const upd = parseInt(r.updatedAt || r.modifiedAt || r.approvedAt || r.validatedAt || r.createdAt || 0, 10) || 0;
+    if (upd > maxUpdated) maxUpdated = upd;
     const evs = eventsFor(r);
     for (const ev of evs) {
       const p = ev.extendedProps || {};
@@ -382,13 +395,20 @@ api.getEvents = async function (req, res) {
   // Special events
   try {
     const specialIds = await dbLayer.listSpecialIdsByStartRange(wideStart, endTs, 5000);
+    if (Array.isArray(specialIds) && specialIds.length === 5000) {
+      logger.warn('[calendar-onekite] getEvents special list may be truncated at 5000', { wideStart, endTs });
+    }
     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 supd = parseInt(sev.updatedAt || sev.modifiedAt || sev.createdAt || 0, 10) || 0;
+      if (supd > maxUpdated) maxUpdated = supd;
       const full = eventsForSpecial(sev);
+      const supd = parseInt(sev.updatedAt || sev.modifiedAt || sev.createdAt || 0, 10) || 0;
+      if (supd > maxUpdated) maxUpdated = supd;
       const minimal = {
         id: full.id,
         title: full.title,
@@ -424,7 +444,11 @@ api.getEvents = async function (req, res) {
     return ai < bi ? -1 : ai > bi ? 1 : 0;
   });
 
-  const etag = computeEtag(out);
+  // For large payloads, avoid hashing the full JSON string.
+  const metaSig = out.length > 2000
+    ? `start:${startTs};end:${endTs};wide:${wideStart};len:${out.length};maxUpdated:${maxUpdated};mod:${canMod?1:0};sc:${canSpecialCreate?1:0};sd:${canSpecialDelete?1:0}`
+    : null;
+  const etag = computeEtag(out, metaSig);
   res.setHeader('ETag', etag);
   res.setHeader('Cache-Control', 'private, max-age=0, must-revalidate');
   if (String(req.headers['if-none-match'] || '') === etag) {
@@ -438,7 +462,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 getSettingsCached('calendar-onekite');
   const canMod = await canValidate(uid, settings);
 
   const rid = String(req.params.rid || '').trim();
@@ -480,7 +504,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 getSettingsCached('calendar-onekite');
   const canMod = await canValidate(uid, settings);
   const canSpecialDelete = await canDeleteSpecial(uid, settings);
 
@@ -509,7 +533,7 @@ api.getSpecialEventDetails = async function (req, res) {
 };
 
 api.getCapabilities = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettingsCached('calendar-onekite');
   const uid = req.uid || 0;
   const canMod = uid ? await canValidate(uid, settings) : false;
   res.json({
@@ -520,7 +544,7 @@ api.getCapabilities = async function (req, res) {
 };
 
 api.createSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettingsCached('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' });
@@ -556,7 +580,7 @@ api.createSpecialEvent = async function (req, res) {
 };
 
 api.deleteSpecialEvent = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettingsCached('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' });
@@ -567,7 +591,7 @@ api.deleteSpecialEvent = async function (req, res) {
 };
 
 api.getItems = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
+  const settings = await getSettingsCached('calendar-onekite');
 
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
@@ -608,7 +632,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 getSettingsCached('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' });
@@ -744,7 +768,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 getSettingsCached('calendar-onekite');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -771,7 +795,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 getSettingsCached('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);
@@ -847,7 +871,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 getSettingsCached('calendar-onekite');
   const ok = await canValidate(uid, settings);
   if (!ok) return res.status(403).json({ error: 'not-allowed' });
 
@@ -882,7 +906,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 getSettingsCached('calendar-onekite');
   const rid = String(req.params.rid || '').trim();
   if (!rid) return res.status(400).json({ error: 'missing-rid' });
 

package/lib/db.js

@@ -67,6 +67,12 @@ async function listReservationIdsByStartRange(startTs, endTs, limit = 1000) {
   return await db.getSortedSetRangeByScore(KEY_ZSET, start, stop, startTs, endTs);
 }
 
+async function listReservationIdsByStartRangePaged(startTs, endTs, offset = 0, limit = 1000) {
+  const start = Math.max(0, parseInt(offset, 10) || 0);
+  const stop = start + Math.max(0, (parseInt(limit, 10) || 1000) - 1);
+  return await db.getSortedSetRangeByScore(KEY_ZSET, start, stop, startTs, endTs);
+}
+
 async function listAllReservationIds(limit = 5000) {
   return await db.getSortedSetRange(KEY_ZSET, 0, limit - 1);
 }
@@ -106,5 +112,6 @@ module.exports = {
     return await db.getSortedSetRangeByScore(KEY_SPECIAL_ZSET, start, stop, startTs, endTs);
   },
   listReservationIdsByStartRange,
+  listReservationIdsByStartRangePaged,
   listAllReservationIds,
 };

package/lib/discord.js

@@ -88,7 +88,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 username = kind === 'paid' ? 'Onekite • Paiement' : 'Onekite • Réservation';
+  const username = kind === 'paid' ? 'OneKite • Paiement' : 'OneKite • Réservation';
   return {
     username,
     content: buildReservationMessage(kind, reservation),

package/lib/email.js

@@ -0,0 +1,51 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+
+/**
+ * Send an email using NodeBB's emailer, supporting common signatures.
+ *
+ * @param {string} template
+ * @param {string} toEmail
+ * @param {string} subject
+ * @param {object} data
+ */
+async function sendEmail(template, toEmail, subject, data) {
+  if (!toEmail) return;
+  const emailer = require.main.require('./src/emailer');
+
+  try {
+    // NodeBB core signature:
+    //   Emailer.sendToEmail(template, email, language, params[, callback])
+    // Subject is not positional; pass it in params so filters can use it.
+    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;
+    }
+
+    // Fallbacks for older/unusual builds
+    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 && err.message) || err),
+    });
+  }
+}
+
+module.exports = {
+  sendEmail,
+};

package/lib/scheduler.js

@@ -1,9 +1,11 @@
 'use strict';
 
-const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
 
+const { getSettingsCached } = require('./settings');
+const { sendEmail } = require('./email');
+
 let timer = null;
 
 function getSetting(settings, key, fallback) {
@@ -15,7 +17,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('calendar-onekite');
+  const settings = await getSettingsCached('calendar-onekite');
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
   const now = Date.now();
 
@@ -24,8 +26,10 @@ async function expirePending() {
     return;
   }
 
-  for (const rid of ids) {
-    const resv = await dbLayer.getReservation(rid);
+  const reservations = await dbLayer.getReservations(ids);
+  for (let i = 0; i < ids.length; i++) {
+    const rid = ids[i];
+    const resv = reservations[i];
     if (!resv || resv.status !== 'pending') {
       continue;
     }
@@ -43,7 +47,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 getSettingsCached('calendar-onekite');
   const holdMins = parseInt(
     getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')),
     10
@@ -53,44 +57,8 @@ async function processAwaitingPayment() {
   const ids = await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
 
-  const emailer = require.main.require('./src/emailer');
   const user = require.main.require('./src/user');
 
-  async function sendEmail(template, toEmail, subject, data) {
-    if (!toEmail) return;
-    try {
-      // NodeBB core signature:
-      //   Emailer.sendToEmail(template, email, language, params[, callback])
-      // Subject is NOT a positional argument; it must be provided in params.subject
-      // and optionally copied into the final email by filter:email.modify.
-      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;
-      }
-
-      // Fallbacks for older/unusual builds
-      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 (scheduler)', {
-        template,
-        toEmail,
-        err: String((err && err.message) || err),
-      });
-    }
-  }
-
   function formatFR(ts) {
     const d = new Date(ts);
     const dd = String(d.getDate()).padStart(2, '0');
@@ -99,8 +67,10 @@ async function processAwaitingPayment() {
     return `${dd}/${mm}/${yyyy}`;
   }
 
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
+  const reservations = await dbLayer.getReservations(ids);
+  for (let i = 0; i < ids.length; i++) {
+    const rid = ids[i];
+    const r = reservations[i];
     if (!r || r.status !== 'awaiting_payment') continue;
 
     const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;

package/lib/settings.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+
+// Tiny in-memory cache to avoid repeated meta.settings.get() calls.
+// Safe because NodeBB settings rarely change per-second.
+const cache = new Map();
+
+async function getSettingsCached(namespace, ttlMs = 3000) {
+  const key = String(namespace || '');
+  const now = Date.now();
+  const hit = cache.get(key);
+  if (hit && hit.expiresAt > now) {
+    return hit.value;
+  }
+
+  let value = {};
+  try {
+    value = (await meta.settings.get(key)) || {};
+  } catch (e) {
+    value = {};
+  }
+  cache.set(key, { value, expiresAt: now + (parseInt(ttlMs, 10) || 0) });
+  return value;
+}
+
+function invalidateSettings(namespace) {
+  cache.delete(String(namespace || ''));
+}
+
+module.exports = {
+  getSettingsCached,
+  invalidateSettings,
+};

package/lib/widgets.js

@@ -41,7 +41,7 @@ widgets.defineWidgets = async function (widgetData) {
 
   list.push({
     widget: 'calendar-onekite-twoweeks',
-    name: 'Calendrier OneKite (2 semaines)',
+    name: 'Calendrier OneKite',
     description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
     content: '',
   });
@@ -63,7 +63,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const html = `
 <div class="onekite-twoweeks">
   <div class="d-flex justify-content-between align-items-center mb-1">
-    <div style="font-weight: 600;">Calendrier (2 semaines)</div>
+    <div style="font-weight: 600;">Calendrier</div>
     <a href="${escapeHtml(calUrl)}" class="btn btn-sm btn-outline-secondary" style="line-height: 1.1;">Ouvrir</a>
   </div>
   <div id="${escapeHtml(id)}"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "12.0.21",
+  "version": "12.0.22",
   "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": "1.2.8"
+  "version": "1.3.0"
 }