nodebb-plugin-calendar-onekite 11.1.82 → 11.1.83

package/lib/admin.js

@@ -21,27 +21,26 @@ function formatFR(tsOrIso) {
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   try {
-    const safeSubject = String(subject || '').trim() || 'Location';
-    const dataWithSubject = Object.assign({}, data || {}, { subject: safeSubject, _subject: safeSubject });
-
-    // Deterministic call order to avoid passing `subject` as data on some NodeBB versions.
     if (typeof emailer.sendToEmail === 'function') {
       if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, dataWithSubject, safeSubject);
+        await emailer.sendToEmail(template, toEmail, subject, data);
       } else {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
         await emailer.sendToEmail(template, toEmail, dataWithSubject);
       }
       return;
     }
-
-    // Fallback: some installs expose `emailer.send` only.
     if (typeof emailer.send === 'function') {
       if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, dataWithSubject, safeSubject);
-      } else {
+        await emailer.send(template, toEmail, subject, data);
+        return;
+      }
+      if (emailer.send.length === 3) {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
         await emailer.send(template, toEmail, dataWithSubject);
+        return;
       }
-      return;
+      await emailer.send(template, toEmail, subject, data);
     }
   } catch (err) {
     console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err && err.message || err) });
@@ -87,12 +86,7 @@ admin.getSettings = async function (req, res) {
 };
 
 admin.saveSettings = async function (req, res) {
-  // Merge instead of overwrite so a missing/empty body (eg. due to body parser
-  // differences across NodeBB versions) does not wipe existing settings.
-  const current = (await meta.settings.get('calendar-onekite')) || {};
-  const incoming = req.body && typeof req.body === 'object' ? req.body : {};
-  const merged = Object.assign({}, current, incoming);
-  await meta.settings.set('calendar-onekite', merged);
+  await meta.settings.set('calendar-onekite', req.body || {});
   res.json({ ok: true });
 };
 

package/lib/api.js

@@ -16,34 +16,44 @@ async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   const emailer = require.main.require('./src/emailer');
   try {
-    const safeSubject = String(subject || '').trim() || 'Location';
-    const dataWithSubject = Object.assign({}, data || {}, { subject: safeSubject, _subject: safeSubject });
-
-    // Deterministic call order to avoid passing `subject` as `data` on some NodeBB versions.
+    // Newer NodeBB builds expose sendToEmail
     if (typeof emailer.sendToEmail === 'function') {
       if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, dataWithSubject, safeSubject);
-      } else {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+        return;
+      }
+      if (emailer.sendToEmail.length === 3) {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
         await emailer.sendToEmail(template, toEmail, dataWithSubject);
+        return;
       }
+      // Fallback
+      await emailer.sendToEmail(template, toEmail, subject, data);
       return;
     }
-
     if (typeof emailer.send === 'function') {
+      // Common: (template, email, subject, data)
       if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, dataWithSubject, safeSubject);
-      } else {
+        await emailer.send(template, toEmail, subject, data);
+        return;
+      }
+      // Some builds: (template, email, data)
+      // In that case, subject is expected inside `data.subject`.
+      if (emailer.send.length === 3) {
+        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
         await emailer.send(template, toEmail, dataWithSubject);
+        return;
       }
+      // Fallback: try 4-args anyway
+      await emailer.send(template, toEmail, subject, data);
       return;
     }
   } catch (err) {
     // eslint-disable-next-line no-console
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err && err.message || err) });
   }
 }
 
-
 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']) : '';
@@ -229,12 +239,7 @@ function eventsForSpecial(ev) {
     allDay: false,
     start: startIso,
     end: endIso,
-    // In month (dayGrid) view, timed events default to a "list-item" rendering (dot only).
-    // Force a block rendering so the event stays visually distinct (purple background).
-    display: 'block',
-    backgroundColor: '#8e44ad',
-    borderColor: '#8e44ad',
-    textColor: '#ffffff',
+    color: '#8e44ad',
     extendedProps: {
       type: 'special',
       eid: ev.eid,
@@ -502,7 +507,7 @@ api.createReservation = async function (req, res) {
             await sendEmail(
               'calendar-onekite_pending',
               md.email,
-              'Location - Demande de réservation',
+              'Location matériel - Demande de réservation',
               {
                 username: md.username,
                 requester: requester.username,
@@ -600,7 +605,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 - 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] : [])),
@@ -636,7 +641,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 - 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] : [])),

package/lib/helloassoWebhook.js

@@ -26,34 +26,31 @@ const PROCESSED_KEY = 'calendar-onekite:helloasso:processedPayments';
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   const emailer = require.main.require('./src/emailer');
-  const dataWithSubject = Object.assign({}, data || {}, subject ? { subject, _subject: subject } : {});
   try {
-    const attempts = [];
     if (typeof emailer.sendToEmail === 'function') {
-      if (subject) {
-        attempts.push(() => emailer.sendToEmail(template, toEmail, subject, dataWithSubject));
-        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject, subject));
+      // NodeBB versions differ:
+      // - sendToEmail(template, email, subject, data)
+      // - sendToEmail(template, email, data)
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+      } else {
+        const dataWithSubject = Object.assign({}, data || {}, { subject });
+        await emailer.sendToEmail(template, toEmail, dataWithSubject);
       }
-      attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
+      return;
     }
     if (typeof emailer.send === 'function') {
-      if (subject) {
-        attempts.push(() => emailer.send(template, toEmail, subject, dataWithSubject));
-        attempts.push(() => emailer.send(template, toEmail, dataWithSubject, subject));
+      if (emailer.send.length >= 4) {
+        await emailer.send(template, toEmail, subject, data);
+        return;
       }
-      attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
-    }
-
-    let lastErr = null;
-    for (const fn of attempts) {
-      try {
-        await fn();
+      if (emailer.send.length === 3) {
+        const dataWithSubject = Object.assign({}, data || {}, { subject });
+        await emailer.send(template, toEmail, dataWithSubject);
         return;
-      } catch (e) {
-        lastErr = e;
       }
+      await emailer.send(template, toEmail, subject, data);
     }
-    if (lastErr) throw lastErr;
   } 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) });

package/lib/scheduler.js

@@ -58,34 +58,21 @@ async function processAwaitingPayment() {
   async function sendEmail(template, toEmail, subject, data) {
     if (!toEmail) return;
     try {
-      const dataWithSubject = Object.assign({}, data || {}, subject ? { subject, _subject: subject } : {});
-
-      const attempts = [];
-    if (typeof emailer.sendToEmail === 'function') {
-      if (subject) {
-        attempts.push(() => emailer.sendToEmail(template, toEmail, subject, dataWithSubject));
-        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject, subject));
-      }
-      attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
-    }
-    if (typeof emailer.send === 'function') {
-      if (subject) {
-        attempts.push(() => emailer.send(template, toEmail, subject, dataWithSubject));
-        attempts.push(() => emailer.send(template, toEmail, dataWithSubject, subject));
+      if (typeof emailer.sendToEmail === 'function') {
+        await emailer.sendToEmail(template, toEmail, subject, data);
+        return;
       }
-      attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
-    }
-
-      let lastErr = null;
-      for (const fn of attempts) {
-        try {
-          await fn();
+      if (typeof emailer.send === 'function') {
+        if (emailer.send.length >= 4) {
+          await emailer.send(template, toEmail, subject, data);
+          return;
+        }
+        if (emailer.send.length === 3) {
+          await emailer.send(template, toEmail, data);
           return;
-        } catch (e) {
-          lastErr = e;
         }
+        await emailer.send(template, toEmail, subject, data);
       }
-      if (lastErr) throw lastErr;
     } 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) });

package/library.js

@@ -19,120 +19,9 @@ const Plugin = {};
 const isFn = (fn) => typeof fn === 'function';
 const mw = (...fns) => fns.filter(isFn);
 
-function escapeHtml(str) {
-  return String(str)
-    .replace(/&/g, '&')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;');
-}
-
-// --- Widgets ---------------------------------------------------------------
-// Docs: https://docs.nodebb.org/development/widgets/
-Plugin.defineWidgets = async function (widgets, callback) {
-  try {
-    widgets = widgets || [];
-    widgets.push({
-      widget: 'calendar-onekite-mini',
-      name: 'Calendrier OneKite (mini)',
-      description: 'Mini calendrier (mois en cours) avec indicateurs de réservations/évènements.',
-      // Widget settings form (ACP Widgets editor)
-      content: [
-        '<div class="form-group">',
-        '  <label>Titre</label>',
-        '  <input type="text" class="form-control" name="title" placeholder="Calendrier" />',
-        '</div>',
-        '<div class="form-group">',
-        '  <label>Afficher les évènements</label>',
-        '  <select class="form-control" name="showSpecial">',
-        '    <option value="1">Oui</option>',
-        '    <option value="0">Non</option>',
-        '  </select>',
-        '</div>',
-      ].join(''),
-    });
-
-    if (typeof callback === 'function') {
-      return callback(null, widgets);
-    }
-    return widgets;
-  } catch (err) {
-    if (typeof callback === 'function') {
-      return callback(err);
-    }
-    throw err;
-  }
-};
-
-Plugin.renderMiniWidget = async function (hookData, callback) {
-  try {
-    const widget = hookData.widget || {};
-    const data = widget.data || {};
-    const title = (data.title || 'Calendrier').toString();
-    const showSpecial = String(data.showSpecial ?? '1') !== '0';
-
-    const widgetId = `calendar-onekite-mini-${Date.now()}-${Math.floor(Math.random() * 1e9)}`;
-
-    // Note: We render client-side to avoid extra server-side queries. The widget fetches
-    // events via the existing public API endpoint.
-    widget.html = `
-<div class="calendar-onekite-widget" id="${widgetId}" data-show-special="${showSpecial ? '1' : '0'}">
-  <div class="calendar-onekite-widget__header">
-    <strong>${escapeHtml(title)}</strong>
-    <a class="calendar-onekite-widget__link" href="/calendar">Ouvrir</a>
-  </div>
-  <div class="calendar-onekite-widget__month"></div>
-  <div class="calendar-onekite-widget__legend">
-    <span class="calendar-onekite-dot calendar-onekite-dot--pending"></span> en attente
-    <span class="calendar-onekite-dot calendar-onekite-dot--paid"></span> payée
-    ${showSpecial ? '<span class="calendar-onekite-dot calendar-onekite-dot--special"></span> évènement' : ''}
-  </div>
-</div>
-<style>
-.calendar-onekite-widget{border:1px solid rgba(0,0,0,.1);border-radius:8px;padding:10px}
-.calendar-onekite-widget__header{display:flex;justify-content:space-between;align-items:center;margin-bottom:8px}
-.calendar-onekite-widget__link{font-size:12px}
-.calendar-onekite-widget__grid{display:grid;grid-template-columns:repeat(7,1fr);gap:4px}
-.calendar-onekite-widget__cell{position:relative;aspect-ratio:1/1;border-radius:6px;display:flex;align-items:center;justify-content:center;font-size:12px;user-select:none}
-.calendar-onekite-widget__cell--muted{opacity:.35}
-.calendar-onekite-widget__cell--today{outline:2px solid rgba(0,0,0,.2)}
-.calendar-onekite-badges{position:absolute;bottom:2px;left:50%;transform:translateX(-50%);display:flex;gap:2px}
-.calendar-onekite-dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin:0 4px 0 10px;vertical-align:middle}
-.calendar-onekite-dot--pending{background:#0d6efd}
-.calendar-onekite-dot--paid{background:#198754}
-.calendar-onekite-dot--special{background:#fd7e14}
-.calendar-onekite-badge{width:6px;height:6px;border-radius:50%}
-.calendar-onekite-badge--pending{background:#0d6efd}
-.calendar-onekite-badge--paid{background:#198754}
-.calendar-onekite-badge--special{background:#fd7e14}
-.calendar-onekite-widget__legend{margin-top:8px;font-size:12px;opacity:.8}
-</style>
-`;
-
-    hookData.widget = widget;
-    if (typeof callback === 'function') {
-      return callback(null, hookData);
-    }
-    return hookData;
-  } catch (err) {
-    if (typeof callback === 'function') {
-      return callback(err);
-    }
-    throw err;
-  }
-};
-
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
-  // Parse JSON bodies for our API routes.
-  // NodeBB core parses bodies for many built-in routes, but custom plugin
-  // routes are not guaranteed to have body parsing enabled across versions.
-  const jsonBody = bodyParser.json({
-    type: ['application/json', 'application/*+json'],
-  });
-
   // Build middleware arrays safely and always spread them into Express route methods.
   // Express will throw if any callback is undefined, so we filter strictly.
   const publicExpose = mw(middleware && middleware.exposeUid);
@@ -180,12 +69,12 @@ Plugin.init = async function (params) {
   });
 
   ['/api/v3/plugins/calendar-onekite/reservations', '/api/plugins/calendar-onekite/reservations'].forEach((p) => {
-    router.post(p, jsonBody, ...publicAuth, api.createReservation);
+    router.post(p, ...publicAuth, api.createReservation);
   });
 
   // Special events (other colour) - created/deleted by configured groups
   ['/api/v3/plugins/calendar-onekite/special-events', '/api/plugins/calendar-onekite/special-events'].forEach((p) => {
-    router.post(p, jsonBody, ...publicAuth, api.createSpecialEvent);
+    router.post(p, ...publicAuth, api.createSpecialEvent);
   });
   ['/api/v3/plugins/calendar-onekite/special-events/:eid', '/api/plugins/calendar-onekite/special-events/:eid'].forEach((p) => {
     router.delete(p, ...publicAuth, api.deleteSpecialEvent);
@@ -193,14 +82,14 @@ Plugin.init = async function (params) {
 
   // Validator actions from the calendar popup (requires login + validatorGroups)
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/approve', '/api/plugins/calendar-onekite/reservations/:rid/approve'].forEach((p) => {
-    router.put(p, jsonBody, ...publicAuth, api.approveReservation);
+    router.put(p, ...publicAuth, api.approveReservation);
   });
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', '/api/plugins/calendar-onekite/reservations/:rid/refuse'].forEach((p) => {
-    router.put(p, jsonBody, ...publicAuth, api.refuseReservation);
+    router.put(p, ...publicAuth, api.refuseReservation);
   });
   // Cancellation by requester (or staff): owner can cancel even if not in validator group
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', '/api/plugins/calendar-onekite/reservations/:rid/cancel'].forEach((p) => {
-    router.put(p, jsonBody, ...publicAuth, api.cancelReservation);
+    router.put(p, ...publicAuth, api.cancelReservation);
   });
 
 
@@ -209,21 +98,21 @@ Plugin.init = async function (params) {
 
   adminBases.forEach((base) => {
     router.get(`${base}/settings`, ...adminMws, admin.getSettings);
-    router.put(`${base}/settings`, jsonBody, ...adminMws, admin.saveSettings);
+    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
 
     router.get(`${base}/pending`, ...adminMws, admin.listPending);
-    router.put(`${base}/reservations/:rid/approve`, jsonBody, ...adminMws, admin.approveReservation);
-    router.put(`${base}/reservations/:rid/refuse`, jsonBody, ...adminMws, admin.refuseReservation);
+    router.put(`${base}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
+    router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
 
-    router.post(`${base}/purge`, jsonBody, ...adminMws, admin.purgeByYear);
+    router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
     router.get(`${base}/debug`, ...adminMws, admin.debugHelloAsso);
     // Accounting / exports
     router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
     router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
-    router.post(`${base}/accounting/purge`, jsonBody, ...adminMws, admin.purgeAccounting);
+    router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
 
     // Purge special events by year
-    router.post(`${base}/special-events/purge`, jsonBody, ...adminMws, admin.purgeSpecialEventsByYear);
+    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.82",
+  "version": "11.1.83",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -8,4 +8,4 @@
     "node": ">=18"
   },
   "dependencies": {}
-}
+}

package/plugin.json

@@ -8,16 +8,6 @@
       "hook": "static:app.load",
       "method": "init"
     },
-    {
-      "hook": "filter:widgets.getWidgets",
-      "method": "defineWidgets",
-      "callbacked": true
-    },
-    {
-      "hook": "filter:widget.render:calendar-onekite-mini",
-      "method": "renderMiniWidget",
-      "callbacked": true
-    },
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminNavigation"
@@ -27,14 +17,15 @@
     "public": "./public"
   },
   "templates": "./templates",
+  "modules": {
+    "../admin/plugins/calendar-onekite.js": "./public/admin.js",
+    "admin/plugins/calendar-onekite": "./public/admin.js"
+  },
   "scripts": [
     "public/client.js"
   ],
   "acpScripts": [
-    "public/admin/plugins/calendar-onekite.js"
+    "public/admin.js"
   ],
-  "version": "1.0.59",
-  "modules": {
-    "./plugins/calendar-onekite": "./public/admin/plugins/calendar-onekite.js"
-  }
+  "version": "1.0.46"
 }