nodebb-plugin-equipment-calendar 8.0.2 → 8.1.2

package/library.js

@@ -45,6 +45,33 @@ function normalizeItemIds(itemIdsRaw) {
   }
 }
 
+
+function parseDateInput(v) {
+  if (v === null || v === undefined) return null;
+  if (typeof v === 'number' || (typeof v === 'string' && v.trim() && /^\d+$/.test(v.trim()))) {
+    const ms = typeof v === 'number' ? v : parseInt(v.trim(), 10);
+    const d = new Date(ms);
+    return Number.isNaN(d.getTime()) ? null : d;
+  }
+  if (typeof v === 'string') {
+    const s = v.trim();
+    if (!s) return null;
+    if (/^\d{4}-\d{2}-\d{2}$/.test(s)) {
+      const d = new Date(s + 'T00:00:00Z');
+      return Number.isNaN(d.getTime()) ? null : d;
+    }
+    const d = new Date(s);
+    return Number.isNaN(d.getTime()) ? null : d;
+  }
+  try {
+    const d = new Date(String(v));
+    return Number.isNaN(d.getTime()) ? null : d;
+  } catch (e) {
+    return null;
+  }
+}
+
+
 const axios = require('axios');
 const { DateTime } = require('luxon');
 const { v4: uuidv4 } = require('uuid');
@@ -1199,12 +1226,12 @@ async function handleCreateReservation(req, res) {
     if (!itemIds.length) return res.status(400).send('itemIds required');
 
     // Dates come from modal as YYYY-MM-DD
-    const startStr = String(req.body.start || req.body.startDate || req.body.startIso || '');
-    const endStr = String(req.body.end || req.body.endDate || req.body.endIso || '');
-    if (!startStr || !endStr) return res.status(400).send('dates required');
+    const startVal = req.body.start || req.body.startDate || req.body.startIso || req.body.startMs || req.body.startTime || '';
+    const endVal = req.body.end || req.body.endDate || req.body.endIso || req.body.endMs || req.body.endTime || '';
+    const start = parseDateInput(startVal);
+    const end = parseDateInput(endVal);
+    if (!start || !end) return res.status(400).send('dates required');
 
-    const start = new Date(startStr + 'T00:00:00Z');
-    const end = new Date(endStr + 'T00:00:00Z');
     const startMs = Date.UTC(start.getUTCFullYear(), start.getUTCMonth(), start.getUTCDate());
     let endMs = Date.UTC(end.getUTCFullYear(), end.getUTCMonth(), end.getUTCDate());
     if (endMs <= startMs) endMs = startMs + 24 * 60 * 60 * 1000;
@@ -1247,8 +1274,8 @@ async function handleCreateReservation(req, res) {
 
     return res.redirect(nconf.get('relative_path') + '/calendar?created=1');
   } catch (err) {
-    winston.error('[equipment-calendar] create error', err);
-    return res.status(500).send('error');
+    winston.error('[equipment-calendar] create error: ' + (err && err.message ? err.message : ''), err);
+    return res.status(500).send(err && err.message ? err.message : 'error');
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "8.0.2",
+  "version": "8.1.2",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,6 +25,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable4",
+  "version": "3.0.0-stable4c-datefix",
   "minver": "4.7.1"
 }