nodebb-plugin-calendar-onekite 11.1.84 → 11.1.86

package/lib/api.js

@@ -3,6 +3,7 @@
 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');
@@ -14,43 +15,30 @@ const helloasso = require('./helloasso');
 // We try the common forms. Any failure is logged for debugging.
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
-  const emailer = require.main.require('./src/emailer');
   try {
-    // Newer NodeBB builds expose sendToEmail
+    // 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') {
-      if (emailer.sendToEmail.length >= 4) {
-        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);
+      await emailer.sendToEmail(template, toEmail, language, params);
       return;
     }
+    // Fallback for older/unusual builds (rare)
     if (typeof emailer.send === 'function') {
-      // Common: (template, email, subject, data)
+      // Some builds accept (template, email, language, params)
       if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
+        await emailer.send(template, toEmail, language, params);
         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;
+      // 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) });
+    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err) });
   }
 }
 
@@ -195,6 +183,7 @@ async function canDeleteSpecial(uid, settings) {
 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);
 
@@ -211,6 +200,9 @@ function eventsFor(resv) {
       // keep id unique per item for FullCalendar, but keep the real rid in extendedProps.rid
       id: `${resv.rid}:${itemId || i}`,
       title: `${icons[status] || ''} ${itemName}`.trim(),
+      backgroundColor: colors[status] || '#3498db',
+      borderColor: colors[status] || '#3498db',
+      textColor: '#ffffff',
       allDay: true,
       start: startIsoDate,
       end: endIsoDate,
@@ -239,7 +231,9 @@ function eventsForSpecial(ev) {
     allDay: false,
     start: startIso,
     end: endIso,
-    color: '#8e44ad',
+    backgroundColor: '#8e44ad',
+    borderColor: '#8e44ad',
+    textColor: '#ffffff',
     extendedProps: {
       type: 'special',
       eid: ev.eid,

package/lib/scheduler.js

@@ -56,81 +56,31 @@ async function processAwaitingPayment() {
   const user = require.main.require('./src/user');
 
   async function sendEmail(template, toEmail, subject, data) {
-    if (!toEmail) return;
-    try {
-      if (typeof emailer.sendToEmail === 'function') {
-        await emailer.sendToEmail(template, toEmail, subject, data);
-        return;
-      }
-      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;
-        }
-        await emailer.send(template, toEmail, subject, data);
-      }
-    } 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) });
+  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;
     }
-  }
-
-  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);
-    if (!r || r.status !== 'awaiting_payment') continue;
-
-    const approvedAt = parseInt(r.approvedAt || r.validatedAt || 0, 10) || 0;
-    if (!approvedAt) continue;
-
-    const reminderAt = approvedAt + holdMins * 60 * 1000;
-    const expireAt = approvedAt + 2 * holdMins * 60 * 1000;
-
-    if (!r.reminderSent && now >= reminderAt && now < expireAt) {
-      // 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', {
-          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)}`,
-          paymentUrl: r.paymentUrl || '',
-          delayMinutes: holdMins,
-          pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
-        });
-      }
-      r.reminderSent = true;
-      r.reminderAt = now;
-      await dbLayer.saveReservation(r);
-      continue;
-    }
-
-    if (now >= expireAt) {
-      // 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', {
-          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,
-        });
+    // 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;
       }
-      await dbLayer.removeReservation(rid);
+      // 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) });
   }
 }
 

package/library.js

@@ -148,4 +148,23 @@ Plugin.addAdminNavigation = async function (header) {
   return header;
 };
 
+
+// Ensure our transactional emails always get a subject.
+// NodeBB's Emailer.sendToEmail signature expects (template, email, language, params),
+// so plugins typically inject/modify the subject via this hook.
+Plugin.emailModify = async function (data) {
+  try {
+    if (!data || !data.template) return data;
+    const tpl = String(data.template);
+    if (!tpl.startsWith('calendar-onekite_')) return data;
+
+    // If the caller provided a subject (we pass it in params.subject), copy it to data.subject.
+    const provided = data.params && data.params.subject ? String(data.params.subject) : '';
+    if (provided && (!data.subject || !String(data.subject).trim())) {
+      data.subject = provided;
+    }
+  } catch (e) {}
+  return data;
+};
+
 module.exports = Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.84",
+  "version": "11.1.86",
   "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

@@ -11,6 +11,10 @@
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminNavigation"
+    },
+    {
+      "hook": "filter:email.modify",
+      "method": "emailModify"
     }
   ],
   "staticDirs": {
@@ -27,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.46"
+  "version": "1.0.47"
 }

package/public/client.js

@@ -332,6 +332,16 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     }
   }
 
+
+  function formatDtWithTime(d) {
+    try {
+      return new Date(d).toLocaleString('fr-FR', { dateStyle: 'short', timeStyle: 'short' });
+    } catch (e) {
+      return String(d);
+    }
+  }
+
+
   function toDatetimeLocalValue(date) {
     const d = new Date(date);
     const pad = (n) => String(n).padStart(2, '0');
@@ -591,7 +601,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           const html = `
             <div class="mb-2"><strong>Titre</strong><br>${escapeHtml(p.title || ev.title || '')}</div>
             ${userLine}
-            <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDt(ev.start))} → ${escapeHtml(formatDt(ev.end))}</div>
+            <div class="mb-2"><strong>Période</strong><br>${escapeHtml(formatDtWithTime(ev.start))} → ${escapeHtml(formatDtWithTime(ev.end))}</div>
             ${addr ? `<div class="mb-2"><strong>Adresse</strong><br>${addrHtml}</div>` : ''}
             ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
           `;

package/templates/admin/plugins/calendar-onekite.tpl

@@ -23,9 +23,10 @@
     </ul>
 
     <div class="tab-content pt-3">
-      <form id="onekite-settings-form" class="mt-1">
+      
       <div class="tab-pane fade show active" id="onekite-tab-settings" role="tabpanel">
-          <h4>Groupes</h4>
+                  <form id="onekite-settings-form" class="mt-1">
+<h4>Groupes</h4>
           <div class="mb-3">
             <label class="form-label">Groupes autorisés à créer une demande (csv)</label>
             <input class="form-control" name="creatorGroups" placeholder="ex: registered-users,membres">
@@ -87,6 +88,7 @@
             <label class="form-label">Form Slug</label>
             <input class="form-control" name="helloassoFormSlug">
           </div>
+              </form>
       </div>
 
       <div class="tab-pane fade" id="onekite-tab-events" role="tabpanel">
@@ -112,7 +114,7 @@
         <div class="form-text mt-2">Supprime définitivement tous les évènements dont la date de début est dans l'année sélectionnée.</div>
       </div>
 
-      </form>
+      
 
       <div class="tab-pane fade" id="onekite-tab-pending" role="tabpanel">
         <h4>Demandes en attente</h4>