nodebb-plugin-onekite-calendar 2.0.70 → 2.0.72

package/lib/admin.js

@@ -20,10 +20,6 @@ const {
   autoFormSlugForYear,
 } = shared;
 
-// Kept for local compatibility in accounting helper
-function baseUrl() { return forumBaseUrl(); }
-
-
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
 

package/lib/api.js

@@ -361,12 +361,6 @@ function eventsForOuting(o) {
 
 const api = {};
 
-// baseUrl, hmacSecret, signCalendarLink, ymdToCompact, dtToGCalUtc,
-// buildCalendarLinks are imported from shared.js
-function baseUrl() {
-  return forumBaseUrl();
-}
-
 function computeEtag(payload) {
   // 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');
@@ -773,19 +767,18 @@ api.getCapabilities = async function (req, res) {
       specialEventCategoryCid: 0,
     });
   }
-  const [canMod, canSpecialC, canSpecialD, canOuting, canRes] = await Promise.all([
+  const [canMod, canSpecialC, canSpecialD, canReq] = await Promise.all([
     canValidate(uid, settings),
     canCreateSpecial(uid, settings),
     canDeleteSpecial(uid, settings),
     canRequest(uid, settings, Date.now()),
-    canRequest(uid, settings, Date.now()),
   ]);
   res.json({
     canModerate: canMod,
     canCreateSpecial: canSpecialC,
     canDeleteSpecial: canSpecialD,
-    canCreateOuting: canOuting,
-    canCreateReservation: canRes,
+    canCreateOuting: canReq,
+    canCreateReservation: canReq,
     specialEventCategoryCid: parseInt(settings && settings.specialEventCategoryId, 10) || 0,
   });
 };
@@ -1376,7 +1369,7 @@ api.createReservation = async function (req, res) {
 
   // Notify groups by email (NodeBB emailer config)
   try {
-    const notifyGroups = (settings.notifyGroups || '').split(',').map(s => s.trim()).filter(Boolean);
+    const notifyGroups = normalizeAllowedGroups(settings.notifyGroups);
     if (notifyGroups.length) {
       const requester = await user.getUserFields(uid, ['username', 'email']);
       const itemsLabel = (resv.itemNames || []).join(', ');
@@ -1601,18 +1594,7 @@ api.approveReservation = async function (req, res) {
       pickupLon: r.pickupLon || '',
       mapUrl,
       paymentUrl: r.paymentUrl || '',
-      icsUrl: (buildCalendarLinks({
-        type: 'reservation',
-        id: String(r.rid),
-        uid: requesterUid,
-        title: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Location - ${r.itemNames.join(', ')}` : 'Location',
-        details: (Array.isArray(r.itemNames) && r.itemNames.length) ? `Matériel: ${r.itemNames.join(', ')}` : (r.itemName ? `Matériel: ${r.itemName}` : ''),
-        location: r.pickupAddress || '',
-        allDay: true,
-        startYmd: (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10),
-        endYmd: (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10),
-      })).icsUrl,
-      googleCalUrl: (buildCalendarLinks({
+      ...buildCalendarLinks({
         type: 'reservation',
         id: String(r.rid),
         uid: requesterUid,
@@ -1622,7 +1604,7 @@ api.approveReservation = async function (req, res) {
         allDay: true,
         startYmd: (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate))) ? String(r.startDate) : new Date(parseInt(r.start, 10)).toISOString().slice(0, 10),
         endYmd: (r.endDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.endDate))) ? String(r.endDate) : new Date(parseInt(r.end, 10)).toISOString().slice(0, 10),
-      })).googleCalUrl,
+      }),
       validatedBy: r.approvedByUsername || '',
       validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
     });
@@ -1972,7 +1954,7 @@ api.getIcs = async function (req, res) {
         allDay: true,
         startYmd,
         endYmd,
-        url: `${baseUrl()}/calendar`,
+        url: `${forumBaseUrl()}/calendar`,
       });
     } else if (type === 'special') {
       const ev = await dbLayer.getSpecialEvent(id);
@@ -1987,7 +1969,7 @@ api.getIcs = async function (req, res) {
         allDay: false,
         start,
         end,
-        url: `${baseUrl()}/calendar`,
+        url: `${forumBaseUrl()}/calendar`,
       });
     } else if (type === 'outing') {
       const o = await dbLayer.getOuting(id);
@@ -2002,7 +1984,7 @@ api.getIcs = async function (req, res) {
         allDay: false,
         start,
         end,
-        url: `${baseUrl()}/calendar`,
+        url: `${forumBaseUrl()}/calendar`,
       });
     } else {
       return res.status(400).send('unknown-type');

package/lib/db.js

@@ -21,19 +21,6 @@ const KEY_MAINTENANCE_ZSET = 'calendar-onekite:maintenance:itemIds';
 const KEY_AUDIT_ZSET = (year) => `calendar-onekite:audit:${year}`;
 const KEY_AUDIT_OBJ = (id) => `calendar-onekite:audit:entry:${id}`;
 
-// Helpers
-function reservationKey(rid) {
-  return KEY_OBJ(rid);
-}
-
-function specialKey(eid) {
-  return KEY_SPECIAL_OBJ(eid);
-}
-
-function outingKey(oid) {
-  return KEY_OUTING_OBJ(oid);
-}
-
 async function getReservation(rid) {
   return await db.getObject(KEY_OBJ(rid));
 }
@@ -45,7 +32,7 @@ async function getReservation(rid) {
 async function getReservations(rids) {
   const ids = Array.isArray(rids) ? rids.filter(Boolean) : [];
   if (!ids.length) return [];
-  const keys = ids.map(reservationKey);
+  const keys = ids.map(KEY_OBJ);
   const rows = await db.getObjects(keys);
   // Ensure rid is present even if older objects were missing it.
   return (rows || []).map((row, idx) => {
@@ -198,7 +185,7 @@ module.exports = {
   getSpecialEvents: async (eids) => {
     const ids = Array.isArray(eids) ? eids.filter(Boolean) : [];
     if (!ids.length) return [];
-    const keys = ids.map(specialKey);
+    const keys = ids.map(KEY_SPECIAL_OBJ);
     const rows = await db.getObjects(keys);
     return (rows || []).map((row, idx) => {
       if (!row) return null;
@@ -225,7 +212,7 @@ module.exports = {
   getOutings: async (oids) => {
     const ids = Array.isArray(oids) ? oids.filter(Boolean) : [];
     if (!ids.length) return [];
-    const keys = ids.map(outingKey);
+    const keys = ids.map(KEY_OUTING_OBJ);
     const rows = await db.getObjects(keys);
     return (rows || []).map((row, idx) => {
       if (!row) return null;

package/lib/helloassoWebhook.js

@@ -14,9 +14,6 @@ const realtime = require('./realtime');
 const shared = require('./shared');
 const { formatFR, forumBaseUrl, sendEmail, buildCalendarLinks, signCalendarLink, ymdToCompact } = shared;
 
-function baseUrl() { return forumBaseUrl(); }
-
-
 function buildReservationCalendarLinks(r) {
   const startYmd = (r.startDate && /^\d{4}-\d{2}-\d{2}$/.test(String(r.startDate)))
     ? String(r.startDate)

package/lib/scheduler.js

@@ -2,6 +2,7 @@
 
 const nconf = require.main.require('nconf');
 const db = require.main.require('./src/database');
+const user = require.main.require('./src/user');
 const dbLayer = require('./db');
 const discord = require('./discord');
 const realtime = require('./realtime');
@@ -109,8 +110,6 @@ async function expirePending(preIds, preReservations) {
   const validatorReminderMins = parseInt(getSetting(settings, 'validatorReminderMinutesPending', '0'), 10) || 0;
   const now = Date.now();
 
-  const user = require.main.require('./src/user');
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';
@@ -214,8 +213,6 @@ async function processAwaitingPayment(preIds, preReservations) {
   const ids = preIds || await dbLayer.listAllReservationIds(5000);
   if (!ids || !ids.length) return;
 
-  const user = require.main.require('./src/user');
-
   const adminUrl = (() => {
     const base = forumBaseUrl();
     return base ? `${base}/admin/plugins/calendar-onekite` : '/admin/plugins/calendar-onekite';

package/lib/shared.js

@@ -23,8 +23,8 @@ function forumBaseUrl() {
   // Try meta.config first (runtime-accurate), then nconf fallback.
   let base = '';
   try {
-    base = (meta && meta.config && (meta.config.url || meta.config['url']))
-      ? String(meta.config.url || meta.config['url'])
+    base = (meta && meta.config && meta.config.url)
+      ? String(meta.config.url)
       : '';
   } catch (_) { /* ignore */ }
   if (!base) {

package/library.js

@@ -101,28 +101,26 @@ Plugin.init = async function (params) {
   router.get('/plugins/calendar-onekite/ics/:type/:id', api.getIcs);
 
   // Admin API (JSON)
-  const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
-
-  adminBases.forEach((base) => {
-    router.get(`${base}/settings`, ...adminMws, admin.getSettings);
-    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
-
-    router.get(`${base}/pending`, ...adminMws, admin.listPending);
-    router.put(`${base}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
-    router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
-
-    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`, ...adminMws, admin.purgeAccounting);
-
-    // Purge special events by year
-    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
-    // Purge outings by year
-    router.post(`${base}/outings/purge`, ...adminMws, admin.purgeOutingsByYear);
-  });
+  const adminBase = '/api/v3/admin/plugins/calendar-onekite';
+
+  router.get(`${adminBase}/settings`, ...adminMws, admin.getSettings);
+  router.put(`${adminBase}/settings`, ...adminMws, admin.saveSettings);
+
+  router.get(`${adminBase}/pending`, ...adminMws, admin.listPending);
+  router.put(`${adminBase}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
+  router.put(`${adminBase}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
+
+  router.post(`${adminBase}/purge`, ...adminMws, admin.purgeByYear);
+  router.get(`${adminBase}/debug`, ...adminMws, admin.debugHelloAsso);
+  // Accounting / exports
+  router.get(`${adminBase}/accounting`, ...adminMws, admin.getAccounting);
+  router.get(`${adminBase}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
+  router.post(`${adminBase}/accounting/purge`, ...adminMws, admin.purgeAccounting);
+
+  // Purge special events by year
+  router.post(`${adminBase}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+  // Purge outings by year
+  router.post(`${adminBase}/outings/purge`, ...adminMws, admin.purgeOutingsByYear);
 
   // HelloAsso callback endpoint (hardened)
   // - Only accepts POST

package/package.json

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

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 (
@@ -1809,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;
@@ -1987,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;
@@ -2160,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>
           `
           : '';