nodebb-plugin-calendar-onekite 12.0.1 → 12.0.2

package/lib/admin.js

@@ -4,85 +4,18 @@ const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
+const { sendTemplateEmail } = require('./utils/mailer');
+const { formatFR } = require('./utils/time');
+const { normalizeReturnUrl, normalizeCallbackUrl } = require('./utils/url');
 
 function forumBaseUrl() {
   const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
   return base;
 }
 
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
 async function sendEmail(template, toEmail, subject, data) {
-  // Prefer sending by uid (NodeBB core expects uid in various places)
   const uid = data && Number.isInteger(data.uid) ? data.uid : null;
-  if (!toEmail && !uid) return;
-
-  const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
-  const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
-  const params = Object.assign({}, data || {}, subject ? { subject } : {});
-
-  // If we have a uid, use the native uid-based sender first.
-  try {
-    if (uid && typeof emailer.send === 'function') {
-      // NodeBB: send(template, uid, params)
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, uid, params);
-      } else {
-        await emailer.send(template, uid, params);
-      }
-      return;
-    }
-  } catch (err) {
-    console.warn('[calendar-onekite] Failed to send email', {
-      template,
-      toEmail,
-      err: err && err.message ? err.message : String(err),
-    });
-  }
-
-  try {
-    if (typeof emailer.sendToEmail === 'function') {
-      // NodeBB: sendToEmail(template, email, language, params)
-      if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, lang, params);
-      } else {
-        // Older signature: sendToEmail(template, email, params)
-        await emailer.sendToEmail(template, toEmail, params);
-      }
-      return;
-    }
-  } catch (err) {
-    console.warn('[calendar-onekite] Failed to send email', {
-      template,
-      toEmail,
-      err: err && err.message ? err.message : String(err),
-    });
-  }
-}
-
-function normalizeCallbackUrl(configured, meta) {
-  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  let url = (configured || '').trim();
-  if (!url) {
-    url = base ? `${base}/helloasso` : '';
-  }
-  if (url && url.startsWith('/') && base) {
-    url = `${base}${url}`;
-  }
-  return url;
-}
-
-function normalizeReturnUrl(meta) {
-  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  const b = String(base || '').trim().replace(/\/$/, '');
-  if (!b) return '';
-  return `${b}/calendar`;
+  await sendTemplateEmail({ template, uid, toEmail, subject, data });
 }
 
 
@@ -112,10 +45,13 @@ 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);
+  // Bulk fetch in chunks to avoid long key lists
+  const chunkSize = 500;
+  for (let i = 0; i < ids.length; i += chunkSize) {
+    const slice = ids.slice(i, i + chunkSize);
+    const rows = await dbLayer.getReservations(slice);
+    for (const r of rows) {
+      if (r && r.status === 'pending') pending.push(r);
     }
   }
   pending.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));

package/lib/api.js

@@ -10,73 +10,22 @@ const groups = require.main.require('./src/groups');
 
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
+const { sendTemplateEmail } = require('./utils/mailer');
+const urlUtils = require('./utils/url');
+const timeUtils = require('./utils/time');
+const permUtils = require('./utils/permissions');
 
 // 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) });
-  }
+  await sendTemplateEmail({ template, toEmail, subject, data });
 }
 
-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']) : '';
-  if (!base) {
-    base = String(nconf.get('url') || '').trim();
-  }
-  base = String(base || '').trim().replace(/\/$/, '');
-  // Ensure absolute with scheme
-  if (base && !/^https?:\/\//i.test(base)) {
-    base = `https://${base.replace(/^\/\//, '')}`;
-  }
-  return base;
-}
+function normalizeBaseUrl(meta) { return urlUtils.normalizeBaseUrl(meta); }
 
-function normalizeCallbackUrl(configured, meta) {
-  const base = normalizeBaseUrl(meta);
-  let url = (configured || '').trim();
-  if (!url) {
-    // Default webhook endpoint (recommended): namespaced under /plugins
-    url = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
-  }
-  if (url && url.startsWith('/') && base) {
-    url = `${base}${url}`;
-  }
-  // Ensure scheme for absolute URLs
-  if (url && !/^https?:\/\//i.test(url)) {
-    url = `https://${url.replace(/^\/\//, '')}`;
-  }
-  return url;
-}
+function normalizeCallbackUrl(configured, meta) { return urlUtils.normalizeCallbackUrl(configured, meta); }
 
-function normalizeReturnUrl(meta) {
-  const base = normalizeBaseUrl(meta);
-  return base ? `${base}/calendar` : '';
-}
+function normalizeReturnUrl(meta) { return urlUtils.normalizeReturnUrl(meta); }
 
 
 function overlap(aStart, aEnd, bStart, bEnd) {
@@ -84,100 +33,32 @@ function overlap(aStart, aEnd, bStart, bEnd) {
 }
 
 
-function formatFR(tsOrIso) {
-  const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
+function formatFR(tsOrIso) { return timeUtils.formatFR(tsOrIso); }
 
-function toTs(v) {
-  if (v === undefined || v === null || v === '') return NaN;
-  // Accept milliseconds timestamps passed as strings or numbers.
-  if (typeof v === 'number') return v;
-  const s = String(v).trim();
-  if (/^[0-9]+$/.test(s)) return parseInt(s, 10);
-  const d = new Date(s);
-  return d.getTime();
-}
+function toTs(v) { return timeUtils.toTs(v); }
 
-function yearFromTs(ts) {
-  const d = new Date(Number(ts));
-  return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
-}
+function yearFromTs(ts) { return timeUtils.yearFromTs(ts); }
 
-function autoCreatorGroupForYear(year) {
-  return `onekite-ffvl-${year}`;
-}
+function autoCreatorGroupForYear(year) { return permUtils.autoCreatorGroupForYear(year); }
 
 function autoFormSlugForYear(year) {
   return `locations-materiel-${year}`;
 }
 
 async function canRequest(uid, settings, startTs) {
-  const year = yearFromTs(startTs);
-  const defaultGroup = autoCreatorGroupForYear(year);
-  const extras = (settings.creatorGroups || settings.allowedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-  const allowed = [defaultGroup, ...extras].filter(Boolean);
-  // If only the default group exists, enforce membership (do not open access to all).
-  if (!allowed.length) return true;
-  for (const g of allowed) {
-    const isMember = await groups.isMember(uid, g);
-    if (isMember) return true;
-  }
-  return false;
+  return await permUtils.canRequest(uid, settings, startTs);
 }
 
 async function canValidate(uid, settings) {
-  // Always allow forum administrators (and global moderators) to validate,
-  // even if validatorGroups is empty.
-  try {
-    const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;
-    const isGlobalMod = await groups.isMember(uid, 'Global Moderators');
-    if (isGlobalMod) return true;
-  } catch (e) {}
-
-  const allowed = (settings.validatorGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-  if (!allowed.length) return false;
-  for (const g of allowed) {
-    const isMember = await groups.isMember(uid, g);
-    if (isMember) return true;
-  }
-  return false;
+  return await permUtils.canValidate(uid, settings);
 }
 
 async function canCreateSpecial(uid, settings) {
-  if (!uid) return false;
-  try {
-    const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;
-    const isGlobalMod = await groups.isMember(uid, 'Global Moderators');
-    if (isGlobalMod) return true;
-  } catch (e) {}
-  const allowed = (settings.specialCreatorGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-  if (!allowed.length) return false;
-  for (const g of allowed) {
-    if (await groups.isMember(uid, g)) return true;
-  }
-  return false;
+  return await permUtils.canCreateSpecial(uid, settings);
 }
 
 async function canDeleteSpecial(uid, settings) {
-  if (!uid) return false;
-  try {
-    const isAdmin = await groups.isMember(uid, 'administrators');
-    if (isAdmin) return true;
-    const isGlobalMod = await groups.isMember(uid, 'Global Moderators');
-    if (isGlobalMod) return true;
-  } catch (e) {}
-  const allowed = (settings.specialDeleterGroups || settings.specialCreatorGroups || '').split(',').map(s => s.trim()).filter(Boolean);
-  if (!allowed.length) return false;
-  for (const g of allowed) {
-    if (await groups.isMember(uid, g)) return true;
-  }
-  return false;
+  return await permUtils.canDeleteSpecial(uid, settings);
 }
 
 function eventsFor(resv) {

package/lib/db.js

@@ -14,6 +14,19 @@ async function getReservation(rid) {
   return await db.getObject(KEY_OBJ(rid));
 }
 
+
+async function getReservations(rids) {
+  if (!Array.isArray(rids) || !rids.length) return [];
+  const keys = rids.map((rid) => KEY_OBJ(rid));
+  return await db.getObjects(keys);
+}
+
+async function getSpecialEvents(eids) {
+  if (!Array.isArray(eids) || !eids.length) return [];
+  const keys = eids.map((eid) => KEY_SPECIAL_OBJ(eid));
+  return await db.getObjects(keys);
+}
+
 async function saveReservation(resv) {
   await db.setObject(KEY_OBJ(resv.rid), resv);
   // score = start timestamp
@@ -50,6 +63,8 @@ module.exports = {
   KEY_SPECIAL_ZSET,
   KEY_CHECKOUT_INTENT_TO_RID,
   getReservation,
+  getReservations,
+  getSpecialEvents,
   saveReservation,
   removeReservation,
   // Special events

package/lib/scheduler.js

@@ -2,6 +2,8 @@
 
 const meta = require.main.require('./src/meta');
 const dbLayer = require('./db');
+const { sendTemplateEmail } = require('./utils/mailer');
+const { formatFR } = require('./utils/time');
 
 let timer = null;
 
@@ -23,8 +25,12 @@ async function expirePending() {
     return;
   }
 
-  for (const rid of ids) {
-    const resv = await dbLayer.getReservation(rid);
+  const chunkSize = 500;
+  for (let i = 0; i < ids.length; i += chunkSize) {
+    const slice = ids.slice(i, i + chunkSize);
+    const rows = await dbLayer.getReservations(slice);
+    for (const resv of rows) {
+      const rid = resv && resv.rid;
     if (!resv || resv.status !== 'pending') {
       continue;
     }
@@ -34,6 +40,7 @@ async function expirePending() {
       // Expire (remove from calendar)
       await dbLayer.removeReservation(rid);
     }
+    }
   }
 }
 
@@ -51,55 +58,12 @@ 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');
-    const mm = String(d.getMonth() + 1).padStart(2, '0');
-    const yyyy = d.getFullYear();
-    return `${dd}/${mm}/${yyyy}`;
-  }
-
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
+  const user = require.main.require('./src/user');  const chunkSize = 500;
+  for (let i = 0; i < ids.length; i += chunkSize) {
+    const slice = ids.slice(i, i + chunkSize);
+    const rows = await dbLayer.getReservations(slice);
+    for (const r of rows) {
+      const rid = r && r.rid;
     if (!r || r.status !== 'awaiting_payment') continue;
 
     const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
@@ -112,7 +76,7 @@ async function processAwaitingPayment() {
       // Send reminder once
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (u && u.email) {
-        await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
+        await sendTemplateEmail({ template: 'calendar-onekite_reminder', toEmail: u.email, subject: 'Location matériel - Rappel', data: {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -120,7 +84,7 @@ async function processAwaitingPayment() {
           paymentUrl: r.paymentUrl || '',
           delayMinutes: holdMins,
           pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
-        });
+        }});
       }
       r.reminderSent = true;
       r.reminderAt = now;
@@ -132,16 +96,17 @@ async function processAwaitingPayment() {
       // Expire: remove reservation so it disappears from calendar and frees items
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (u && u.email) {
-        await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
+        await sendTemplateEmail({ template: 'calendar-onekite_expired', toEmail: u.email, subject: 'Location matériel - Rappel', data: {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
-        });
+        }});
       }
       await dbLayer.removeReservation(rid);
     }
+    }
   }
 }
 

package/lib/utils/mailer.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
+
+/**
+ * Send NodeBB email templates in a way that survives slight core signature differences.
+ * - Prefer uid-based sending when a uid is available.
+ * - Otherwise use sendToEmail.
+ *
+ * @param {object} opts
+ * @param {string} opts.template
+ * @param {number} [opts.uid]
+ * @param {string} [opts.toEmail]
+ * @param {string} [opts.subject]
+ * @param {object} [opts.data]
+ */
+async function sendTemplateEmail(opts) {
+  const template = opts && opts.template;
+  const uid = opts && Number.isInteger(opts.uid) ? opts.uid : null;
+  const toEmail = opts && opts.toEmail ? String(opts.toEmail) : '';
+  const subject = opts && opts.subject ? String(opts.subject) : '';
+  const data = (opts && opts.data) || {};
+
+  if (!template) return;
+  if (!uid && !toEmail) return;
+
+  const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
+  const params = Object.assign({}, data, subject ? { subject } : {});
+
+  // uid-first
+  if (uid && typeof emailer.send === 'function') {
+    try {
+      // NodeBB: send(template, uid, params)
+      await emailer.send(template, uid, params);
+      return;
+    } catch (err) {
+      // fall through to email
+    }
+  }
+
+  if (toEmail && typeof emailer.sendToEmail === 'function') {
+    try {
+      // NodeBB commonly: sendToEmail(template, email, language, params)
+      await emailer.sendToEmail(template, toEmail, language, params);
+      return;
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.warn('[calendar-onekite] Failed to send email', {
+        template,
+        toEmail,
+        uid,
+        err: err && err.message ? err.message : String(err),
+      });
+    }
+  }
+}
+
+module.exports = { sendTemplateEmail };

package/lib/utils/permissions.js

@@ -0,0 +1,73 @@
+'use strict';
+
+const groups = require.main.require('./src/groups');
+const { yearFromTs } = require('./time');
+
+function autoCreatorGroupForYear(year) {
+  return `onekite-ffvl-${year}`;
+}
+
+async function isPrivileged(uid) {
+  try {
+    if (await groups.isMember(uid, 'administrators')) return true;
+    if (await groups.isMember(uid, 'Global Moderators')) return true;
+  } catch (e) {}
+  return false;
+}
+
+function parseGroupList(s) {
+  return String(s || '')
+    .split(',')
+    .map((x) => x.trim())
+    .filter(Boolean);
+}
+
+async function canRequest(uid, settings, startTs) {
+  const year = yearFromTs(startTs);
+  const defaultGroup = autoCreatorGroupForYear(year);
+  const extras = parseGroupList(settings && (settings.creatorGroups || settings.allowedGroups));
+  const allowed = [defaultGroup, ...extras].filter(Boolean);
+  if (!allowed.length) return true;
+  for (const g of allowed) {
+    if (await groups.isMember(uid, g)) return true;
+  }
+  return false;
+}
+
+async function canValidate(uid, settings) {
+  if (!uid) return false;
+  if (await isPrivileged(uid)) return true;
+  const allowed = parseGroupList(settings && settings.validatorGroups);
+  for (const g of allowed) {
+    if (await groups.isMember(uid, g)) return true;
+  }
+  return false;
+}
+
+async function canCreateSpecial(uid, settings) {
+  if (!uid) return false;
+  if (await isPrivileged(uid)) return true;
+  const allowed = parseGroupList(settings && settings.specialCreatorGroups);
+  for (const g of allowed) {
+    if (await groups.isMember(uid, g)) return true;
+  }
+  return false;
+}
+
+async function canDeleteSpecial(uid, settings) {
+  if (!uid) return false;
+  if (await isPrivileged(uid)) return true;
+  const allowed = parseGroupList(settings && (settings.specialDeleterGroups || settings.specialCreatorGroups));
+  for (const g of allowed) {
+    if (await groups.isMember(uid, g)) return true;
+  }
+  return false;
+}
+
+module.exports = {
+  autoCreatorGroupForYear,
+  canRequest,
+  canValidate,
+  canCreateSpecial,
+  canDeleteSpecial,
+};

package/lib/utils/time.js

@@ -0,0 +1,32 @@
+'use strict';
+
+function toTs(v) {
+  if (v === undefined || v === null || v === '') return NaN;
+  // Accept milliseconds timestamps passed as strings or numbers.
+  if (typeof v === 'number') return v;
+  const s = String(v).trim();
+  if (/^[0-9]+$/.test(s)) return parseInt(s, 10);
+  const d = new Date(s);
+  return d.getTime();
+}
+
+function formatFR(tsOrIso) {
+  const d = new Date(
+    typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso
+  );
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
+function yearFromTs(ts) {
+  const d = new Date(Number(ts));
+  return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
+}
+
+module.exports = {
+  toTs,
+  formatFR,
+  yearFromTs,
+};

package/lib/utils/url.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const nconf = require.main.require('nconf');
+
+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'])
+    : '';
+  if (!base) base = String(nconf.get('url') || '').trim();
+  base = String(base || '').trim().replace(/\/$/, '');
+  if (base && !/^https?:\/\//i.test(base)) {
+    base = `https://${base.replace(/^\/\//, '')}`;
+  }
+  return base;
+}
+
+function normalizeCallbackUrl(configured, meta, fallbackPath = '/plugins/calendar-onekite/helloasso') {
+  const base = normalizeBaseUrl(meta);
+  let url = String(configured || '').trim();
+  if (!url) url = base ? `${base}${fallbackPath}` : '';
+  if (url && url.startsWith('/') && base) url = `${base}${url}`;
+  if (url && !/^https?:\/\//i.test(url)) url = `https://${url.replace(/^\/\//, '')}`;
+  return url;
+}
+
+function normalizeReturnUrl(meta, path = '/calendar') {
+  const base = normalizeBaseUrl(meta);
+  return base ? `${base}${path}` : '';
+}
+
+module.exports = {
+  normalizeBaseUrl,
+  normalizeCallbackUrl,
+  normalizeReturnUrl,
+};

package/package.json

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

package/public/client.js

@@ -886,6 +886,25 @@ function toDatetimeLocalValue(date) {
   }
 
   async function init(selector) {
+
+const container = typeof selector === 'string' ? document.querySelector(selector) : selector;
+if (!container) return;
+
+// Prevent double-init (ajaxify + initial load, or return from payment)
+if (container.dataset && container.dataset.onekiteCalendarInit === '1') {
+  // Still refresh the custom button label in case FC rerendered
+  try { refreshDesktopModeButton(); } catch (e) {}
+  return;
+}
+if (container.dataset) container.dataset.onekiteCalendarInit = '1';
+
+// If a previous instance exists (shouldn't, but happens in some navigation flows), destroy it.
+try {
+  if (window.oneKiteCalendar && typeof window.oneKiteCalendar.destroy === 'function') {
+    window.oneKiteCalendar.destroy();
+  }
+  window.oneKiteCalendar = null;
+} catch (e) {}
     const el = document.querySelector(selector);
     if (!el) {
       return;
@@ -1063,6 +1082,7 @@ function toDatetimeLocalValue(date) {
 
     const calendar = new FullCalendar.Calendar(el, {
       initialView: 'dayGridMonth',
+      windowResize: function () { try { refreshDesktopModeButton(); } catch (e) {} },
       height: 'auto',
       contentHeight: 'auto',
       aspectRatio: computeAspectRatio(),
@@ -1671,6 +1691,21 @@ function toDatetimeLocalValue(date) {
 
     calendar.render();
 
+// Keep the custom button label stable even if FullCalendar rerenders the toolbar
+try {
+  const toolbar = container.querySelector('.fc-toolbar');
+  if (toolbar && !toolbar.__oneKiteObserved) {
+    toolbar.__oneKiteObserved = true;
+    const mo = new MutationObserver(() => {
+      try { refreshDesktopModeButton(); } catch (e) {}
+    });
+    mo.observe(toolbar, { childList: true, subtree: true, characterData: true });
+    // Disconnect after a while to avoid permanent overhead
+    setTimeout(() => { try { mo.disconnect(); } catch (e) {} }, 15000);
+  }
+} catch (e) {}
+
+
     refreshDesktopModeButton();
 
 
@@ -1765,7 +1800,7 @@ function toDatetimeLocalValue(date) {
   // Auto-init on /calendar when ajaxify finishes rendering.
   function autoInit(data) {
     try {
-      const tpl = data && data.template ? data.template.name : (ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
+      const tpl = (data && data.template && data.template.name) || (ajaxify && ajaxify.data && ajaxify.data.template && ajaxify.data.template.name) || '';
       if (tpl === 'calendar-onekite') {
         init('#onekite-calendar');
       }