nodebb-plugin-onekite-calendar 2.0.69 → 2.0.71

package/lib/discord.js

@@ -2,7 +2,7 @@
 
 const https = require('https');
 const { URL } = require('url');
-const { formatFRShort } = require('./shared');
+const { formatFRShort, forumBaseUrl } = require('./shared');
 
 function isEnabled(v, defaultValue) {
   if (v === undefined || v === null || v === '') return defaultValue !== false;
@@ -53,7 +53,7 @@ function postWebhook(webhookUrl, payload) {
 }
 
 function buildReservationMessage(kind, reservation) {
-  const calUrl = 'https://www.onekite.com/calendar';
+  const calUrl = forumBaseUrl() + '/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
   const items = (reservation && Array.isArray(reservation.itemNames) && reservation.itemNames.length)
     ? reservation.itemNames.map(String)
@@ -87,7 +87,7 @@ function buildWebhookPayload(kind, reservation) {
     ? 'Onekite • Paiement'
     : (kind === 'cancelled' ? 'Onekite • Annulation' : 'Onekite • Réservation');
 
-  const calUrl = 'https://www.onekite.com/calendar';
+  const calUrl = forumBaseUrl() + '/calendar';
   const username = reservation && reservation.username ? String(reservation.username) : '';
   const items = (reservation && Array.isArray(reservation.itemNames) && reservation.itemNames.length)
     ? reservation.itemNames.map(String)
@@ -186,7 +186,7 @@ async function notifyReservationCancelled(settings, reservation) {
 
 function buildSimpleCalendarPayload(kind, label, entity, opts) {
   const options = opts || {};
-  const calUrl = options.calUrl || 'https://www.onekite.com/calendar';
+  const calUrl = options.calUrl || forumBaseUrl() + '/calendar';
   const webhookUsername = options.webhookUsername || `Onekite • ${label}`;
 
   const title = kind === 'deleted' ? '❌ ' + label + ' annulé(e)' : label + ' créé(e)';

package/lib/shared.js

@@ -44,6 +44,7 @@ function hmacSecret() {
     const s = String(nconf.get('secret') || '').trim();
     if (s) return s;
   } catch (_) { /* ignore */ }
+  console.warn('[calendar-onekite] nconf.secret not set — ICS URLs use weak fallback key');
   return 'calendar-onekite';
 }
 

package/lib/widgets.js

@@ -17,8 +17,7 @@ function makeDomId() {
 }
 
 function widgetCalendarUrl() {
-  // Per request, keep the public URL fixed (even if forum base differs)
-  return 'https://www.onekite.com/calendar';
+  return forumBaseUrl() + '/calendar';
 }
 
 const widgets = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-onekite-calendar",
-  "version": "2.0.69",
+  "version": "2.0.71",
   "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": "2.0.66"
+  "version": "2.0.70"
 }

package/public/client.js

@@ -169,6 +169,13 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       .replace(/'/g, ''');
   }
 
+  function linkifyNotes(str) {
+    return escapeHtml(str).replace(
+      /https?:\/\/[^\s<>"']+/g,
+      url => `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`
+    );
+  }
+
   function getCsrfToken() {
     try {
       return (
@@ -1266,8 +1273,14 @@ function toDatetimeLocalValue(date) {
     }
 
     if (typeof FullCalendar === 'undefined') {
-      showAlert('error', 'FullCalendar non chargé');
-      return;
+      const loaded = await new Promise((resolve) => {
+        const start = Date.now();
+        const iv = setInterval(() => {
+          if (typeof FullCalendar !== 'undefined') { clearInterval(iv); resolve(true); }
+          else if (Date.now() - start > 5000) { clearInterval(iv); resolve(false); }
+        }, 50);
+      });
+      if (!loaded) { showAlert('error', 'FullCalendar non chargé'); return; }
     }
 
     const items = await loadItems();
@@ -1803,7 +1816,7 @@ function toDatetimeLocalValue(date) {
               ${calHtml}
               ${participantsHtml}
               ${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>` : ''}
+              ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${linkifyNotes(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
             const canEdit = !!p.canEditSpecial;
@@ -1981,7 +1994,7 @@ function toDatetimeLocalValue(date) {
               ${calHtml}
               ${participantsHtml}
               ${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>` : ''}
+              ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${linkifyNotes(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteOuting);
             const canEditOuting = !!p.canEditOuting;
@@ -2154,7 +2167,7 @@ function toDatetimeLocalValue(date) {
               ${pickupAddress ? `${escapeHtml(pickupAddress)}<br>` : ''}
               ${pickupTime ? `Heure : ${escapeHtml(pickupTime)}<br>` : ''}
               ${hasCoords ? `<a href="${osmLink}" target="_blank" rel="noopener">Voir sur la carte</a><br>` : ''}
-              ${notes ? `<div class="mt-1"><strong>Notes</strong><br>${escapeHtml(notes)}</div>` : ''}
+              ${notes ? `<div class="mt-1"><strong>Notes</strong><br>${linkifyNotes(notes).replace(/\n/g,'<br>')}</div>` : ''}
             </div>
           `
           : '';