nodebb-plugin-onekite-calendar 2.0.67 → 2.0.69

package/lib/api.js

@@ -647,6 +647,7 @@ api.getSpecialEventDetails = async function (req, res) {
   const settings = await getSettings();
   const canMod = uid ? await canValidate(uid, settings) : false;
   const canSpecialDelete = uid ? await canDeleteSpecial(uid, settings) : false;
+  const canSpecialCreate = uid ? await canCreateSpecial(uid, settings) : false;
 
   const eid = String(req.params.eid || '').trim();
   if (!eid) return res.status(400).json({ error: 'missing-eid' });
@@ -680,6 +681,7 @@ api.getSpecialEventDetails = async function (req, res) {
     notes: ev.notes || '',
     participants,
     participantsUsernames: await usernamesByUids(participants),
+    canEditSpecial: canSpecialCreate,
     canDeleteSpecial: canSpecialDelete,
     canJoin: uid ? await canJoinSpecial(uid, settings) : false,
     isParticipant: uid ? participants.includes(String(uid)) : false,
@@ -768,6 +770,7 @@ api.getCapabilities = async function (req, res) {
       canDeleteSpecial: false,
       canCreateOuting: false,
       canCreateReservation: false,
+      specialEventCategoryCid: 0,
     });
   }
   const [canMod, canSpecialC, canSpecialD, canOuting, canRes] = await Promise.all([
@@ -783,6 +786,7 @@ api.getCapabilities = async function (req, res) {
     canDeleteSpecial: canSpecialD,
     canCreateOuting: canOuting,
     canCreateReservation: canRes,
+    specialEventCategoryCid: parseInt(settings && settings.specialEventCategoryId, 10) || 0,
   });
 };
 
@@ -815,6 +819,7 @@ api.createSpecialEvent = async function (req, res) {
   const notes = String((req.body && req.body.notes) || '').trim();
   const lat = String((req.body && req.body.lat) || '').trim();
   const lon = String((req.body && req.body.lon) || '').trim();
+  const content = String((req.body && req.body.content) || '').trim();
 
   const u = await user.getUserFields(req.uid, ['username']);
   const eid = crypto.randomUUID();
@@ -827,6 +832,7 @@ api.createSpecialEvent = async function (req, res) {
     notes,
     lat,
     lon,
+    content,
     uid: String(req.uid),
     username: u && u.username ? String(u.username) : '',
     createdAt: String(Date.now()),
@@ -841,7 +847,8 @@ api.createSpecialEvent = async function (req, res) {
 
   // Real-time refresh for all viewers
   realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'created', eid: ev.eid });
-  res.json({ ok: true, eid });
+  const categoryCid = parseInt(settings && settings.specialEventCategoryId, 10) || 0;
+  res.json({ ok: true, eid, categoryCid });
 };
 
 api.deleteSpecialEvent = async function (req, res) {
@@ -866,6 +873,37 @@ api.deleteSpecialEvent = async function (req, res) {
   res.json({ ok: true });
 };
 
+api.updateSpecialEvent = async function (req, res) {
+  const settings = await getSettings();
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+  const ok = await canCreateSpecial(req.uid, settings);
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
+
+  const eid = String(req.params.eid || '').replace(/^special:/, '').trim();
+  if (!eid) return res.status(400).json({ error: 'bad-id' });
+
+  const ev = await dbLayer.getSpecialEvent(eid);
+  if (!ev) return res.status(404).json({ error: 'not-found' });
+
+  const startTs = toTs(req.body && req.body.start);
+  const endTs = toTs(req.body && req.body.end);
+  if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
+    return res.status(400).json({ error: 'bad-dates' });
+  }
+
+  ev.title = String((req.body && req.body.title) || '').trim() || ev.title || 'Évènement';
+  ev.start = String(startTs);
+  ev.end = String(endTs);
+  ev.address = String((req.body && req.body.address) || '').trim();
+  ev.lat = String((req.body && req.body.lat) || '').trim();
+  ev.lon = String((req.body && req.body.lon) || '').trim();
+  ev.notes = String((req.body && req.body.notes) || '').trim();
+
+  await dbLayer.saveSpecialEvent(ev);
+  realtime.emitCalendarUpdated({ kind: 'specialEvent', action: 'updated', eid });
+  return res.json({ ok: true });
+};
+
 /**
  * Get detailed information about an outing (prévision de sortie).
  * 
@@ -906,6 +944,7 @@ api.getOutingDetails = async function (req, res) {
   });
 
   const participants = normalizeUidList(o.participants);
+  const canEditOuting = uid ? await canRequest(uid, settings, Date.now()) : false;
   const out = {
     oid: o.oid,
     title: o.title || '',
@@ -917,7 +956,8 @@ api.getOutingDetails = async function (req, res) {
     notes: o.notes || '',
     participants,
     participantsUsernames: await usernamesByUids(participants),
-    canJoin: uid ? await canRequest(uid, settings, Date.now()) : false,
+    canEditOuting,
+    canJoin: canEditOuting,
     isParticipant: uid ? participants.includes(String(uid)) : false,
     canDeleteOuting: canMod || (uid && String(uid) === String(o.uid)),
     icsUrl: links.icsUrl,
@@ -1085,6 +1125,37 @@ api.deleteOuting = async function (req, res) {
   return res.json({ ok: true });
 };
 
+api.updateOuting = async function (req, res) {
+  const settings = await getSettings();
+  if (!req.uid) return res.status(401).json({ error: 'not-logged-in' });
+  const ok = await canRequest(req.uid, settings, Date.now());
+  if (!ok) return res.status(403).json({ error: 'not-allowed' });
+
+  const oid = String(req.params.oid || '').replace(/^outing:/, '').trim();
+  if (!oid) return res.status(400).json({ error: 'bad-id' });
+
+  const o = await dbLayer.getOuting(oid);
+  if (!o) return res.status(404).json({ error: 'not-found' });
+
+  const startTs = toTs(req.body && req.body.start);
+  const endTs = toTs(req.body && req.body.end);
+  if (!Number.isFinite(startTs) || !Number.isFinite(endTs) || !(startTs < endTs)) {
+    return res.status(400).json({ error: 'bad-dates' });
+  }
+
+  o.title = String((req.body && req.body.title) || '').trim() || o.title || 'Sortie';
+  o.start = String(startTs);
+  o.end = String(endTs);
+  o.address = String((req.body && req.body.address) || '').trim();
+  o.lat = String((req.body && req.body.lat) || '').trim();
+  o.lon = String((req.body && req.body.lon) || '').trim();
+  o.notes = String((req.body && req.body.notes) || '').trim();
+
+  await dbLayer.saveOuting(o);
+  realtime.emitCalendarUpdated({ kind: 'outing', action: 'updated', oid });
+  return res.json({ ok: true });
+};
+
 api.getItems = async function (req, res) {
   const settings = await getSettings();
 

package/library.js

@@ -82,6 +82,7 @@ Plugin.init = async function (params) {
   router.post('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, api.createSpecialEvent);
   router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.getSpecialEventDetails);
   router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
+  router.put('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.updateSpecialEvent);
   // Participants (self-join) for special events
   router.post('/api/v3/plugins/calendar-onekite/special-events/:eid/participants', ...publicExpose, api.joinSpecialEvent);
   router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid/participants', ...publicExpose, api.leaveSpecialEvent);
@@ -90,6 +91,7 @@ Plugin.init = async function (params) {
   router.post('/api/v3/plugins/calendar-onekite/outings', ...publicExpose, api.createOuting);
   router.get('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.getOutingDetails);
   router.delete('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.deleteOuting);
+  router.put('/api/v3/plugins/calendar-onekite/outings/:oid', ...publicExpose, api.updateOuting);
   // Participants (self-join) for outings
   router.post('/api/v3/plugins/calendar-onekite/outings/:oid/participants', ...publicExpose, api.joinOuting);
   router.delete('/api/v3/plugins/calendar-onekite/outings/:oid/participants', ...publicExpose, api.leaveOuting);

package/package.json

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

package/public/admin.js

@@ -615,6 +615,32 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
       const s = await loadSettings();
       fillForm(form, s || {});
 
+      // Populate special event category selector
+      const catSelect = document.getElementById('onekite-special-category-select');
+      if (catSelect) {
+        try {
+          const cats = await fetchJson('/api/categories');
+          const list = cats && (cats.categories || cats.categoryList || cats.data) || [];
+          function flatCats(arr) {
+            const out = [];
+            for (const c of (arr || [])) {
+              if (!c || !c.cid) continue;
+              out.push(c);
+              if (c.children && c.children.length) out.push(...flatCats(c.children));
+            }
+            return out;
+          }
+          for (const c of flatCats(list)) {
+            const opt = document.createElement('option');
+            opt.value = String(c.cid);
+            opt.textContent = String(c.name || c.cid);
+            catSelect.appendChild(opt);
+          }
+          // Re-apply saved value (fillForm ran before options were added)
+          if (s && s.specialEventCategoryId) catSelect.value = String(s.specialEventCategoryId);
+        } catch (e) { /* non-blocking */ }
+      }
+
       // Ensure default creator group prefix appears in the ACP field
       const y = new Date().getFullYear();
       const defaultGroup = `onekite-ffvl-${y}`;

package/public/client.js

@@ -239,8 +239,32 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     return opts.join('');
   }
 
+  function buildInitialValuesFromEvent(details) {
+    function toLocal(ts) {
+      const d = new Date(parseInt(ts, 10));
+      return {
+        ymd: `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`,
+        time: `${pad2(d.getHours())}:${pad2(d.getMinutes())}`,
+      };
+    }
+    const s = toLocal(details.start);
+    const e = toLocal(details.end);
+    return {
+      title: details.title || '',
+      startYmd: s.ymd,
+      startTime: s.time,
+      endYmd: e.ymd,
+      endTime: e.time,
+      address: details.address || details.pickupAddress || '',
+      lat: details.lat || details.pickupLat || '',
+      lon: details.lon || details.pickupLon || '',
+      notes: details.notes || '',
+    };
+  }
+
   async function openSpecialEventDialog(selectionInfo, opts) {
     const kind = (opts && opts.kind) ? String(opts.kind) : 'special';
+    const iv = opts && opts.initialValues;
     const start = selectionInfo.start;
     // FullCalendar can omit `end` for certain interactions. Also, for all-day
     // selections, `end` is exclusive (next day at 00:00). We normalise below
@@ -289,12 +313,20 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       }
     }
 
+    // Edit mode: override computed dates with existing event values.
+    if (iv) {
+      if (iv.startYmd && iv.startTime) seStart = new Date(`${iv.startYmd}T${iv.startTime}`);
+      if (iv.endYmd && iv.endTime) seEnd = new Date(`${iv.endYmd}T${iv.endTime}`);
+    }
+
     const seStartTime = timeString(seStart);
     const seEndTime = timeString(seEnd);
-    // Same UX for all types: an example placeholder, but never pre-fill the value.
-    // If left empty, the server can still apply its own default label.
     const defaultTitlePlaceholder = 'Ex: ...';
-    const defaultTitleValue = '';
+    const defaultTitleValue = iv ? (iv.title || '') : '';
+    const ivAddress = iv ? (iv.address || '') : '';
+    const ivLat = iv ? (iv.lat || '') : '';
+    const ivLon = iv ? (iv.lon || '') : '';
+    const ivNotes = iv ? (iv.notes || '') : '';
 
     const html = `
       <div class="mb-3">
@@ -328,23 +360,32 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       <div class="mt-3">
         <label class="form-label">Adresse</label>
         <div class="input-group">
-          <input type="text" class="form-control" id="onekite-se-address" placeholder="Adresse complète" />
+          <input type="text" class="form-control" id="onekite-se-address" placeholder="Adresse complète" value="${escapeHtml(ivAddress)}" />
           <button class="btn btn-outline-secondary" type="button" id="onekite-se-geocode">Rechercher</button>
         </div>
         <div id="onekite-se-map" style="height:220px; border:1px solid #ddd; border-radius:6px; margin-top:0.5rem;"></div>
-        <input type="hidden" id="onekite-se-lat" />
-        <input type="hidden" id="onekite-se-lon" />
+        <input type="hidden" id="onekite-se-lat" value="${escapeHtml(ivLat)}" />
+        <input type="hidden" id="onekite-se-lon" value="${escapeHtml(ivLon)}" />
       </div>
       <div class="mt-3">
         <label class="form-label">Notes (facultatif)</label>
-        <textarea class="form-control" id="onekite-se-notes" rows="3" placeholder="..."></textarea>
+        <textarea class="form-control" id="onekite-se-notes" rows="3" placeholder="...">${escapeHtml(ivNotes)}</textarea>
+      </div>
+      ${(kind !== 'outing' && opts && opts.withContent) ? `
+      <div class="mt-3">
+        <label class="form-label">Message (facultatif)</label>
+        <textarea class="form-control" id="onekite-se-content" rows="4" placeholder="Corps du sujet qui sera publié dans le forum (brouillon)..."></textarea>
       </div>
+      ` : ''}
     `;
 
     return await new Promise((resolve) => {
       let resolved = false;
+      const isEditMode = !!iv;
       const dialog = bootbox.dialog({
-        title: kind === 'outing' ? 'Créer une prévision de sortie' : 'Créer un évènement',
+        title: isEditMode
+          ? (kind === 'outing' ? 'Modifier la sortie' : "Modifier l'évènement")
+          : (kind === 'outing' ? 'Créer une prévision de sortie' : 'Créer un évènement'),
         message: html,
         buttons: {
           cancel: {
@@ -356,7 +397,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             },
           },
           ok: {
-            label: 'Créer',
+            label: isEditMode ? 'Enregistrer' : 'Créer',
             className: 'btn-primary',
             callback: () => {
               const title = (document.getElementById('onekite-se-title')?.value || '').trim();
@@ -392,8 +433,11 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
               const notes = (document.getElementById('onekite-se-notes')?.value || '').trim();
               const lat = (document.getElementById('onekite-se-lat')?.value || '').trim();
               const lon = (document.getElementById('onekite-se-lon')?.value || '').trim();
+              const content = (kind !== 'outing' && opts && opts.withContent)
+                ? (document.getElementById('onekite-se-content')?.value || '').trim()
+                : '';
               resolved = true;
-              resolve({ title, start: startVal, end: endVal, address, notes, lat, lon });
+              resolve({ title, start: startVal, end: endVal, address, notes, lat, lon, content });
               return true;
             },
           },
@@ -437,6 +481,14 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             document.getElementById('onekite-se-lon').value = String(lon);
             map.setView([lat, lon], 14);
           }
+          // Pre-fill marker if editing an event with existing coordinates.
+          if (ivLat && ivLon) {
+            const initLat = Number(ivLat);
+            const initLon = Number(ivLon);
+            if (Number.isFinite(initLat) && Number.isFinite(initLon)) {
+              setMarker(initLat, initLon);
+            }
+          }
           const geocodeBtn = document.getElementById('onekite-se-geocode');
           const addrInput = document.getElementById('onekite-se-address');
           try {
@@ -1225,6 +1277,7 @@ function toDatetimeLocalValue(date) {
     const canDeleteSpecial = !!caps.canDeleteSpecial;
     const canCreateOuting = !!caps.canCreateOuting;
     const canCreateReservation = !!caps.canCreateReservation;
+    const specialEventCategoryCid = parseInt(caps.specialEventCategoryCid, 10) || 0;
 
     // Creation chooser: Location / Prévision de sortie / Évènement (si autorisé).
 
@@ -1415,15 +1468,23 @@ function toDatetimeLocalValue(date) {
         },
         onCreateSpecial: async (sel) => {
           try {
-            const payload = await openSpecialEventDialog(sel);
+            const payload = await openSpecialEventDialog(sel, { withContent: specialEventCategoryCid > 0 });
             if (!payload) return;
-            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+            const resp = await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             });
             showAlert('success', 'Évènement créé.');
             invalidateEventsCache();
             scheduleRefetch(calendar);
+            const cid = (resp && resp.categoryCid) ? parseInt(resp.categoryCid, 10) : specialEventCategoryCid;
+            if (payload.content && cid > 0) {
+              try {
+                require(['composer'], (composer) => {
+                  composer.newTopic({ cid, title: payload.title || 'Évènement', body: payload.content });
+                });
+              } catch (e) {}
+            }
           } catch (e) {
             handleCreateError(e);
           } finally {
@@ -1495,15 +1556,23 @@ function toDatetimeLocalValue(date) {
         },
         onCreateSpecial: async (sel) => {
           try {
-            const payload = await openSpecialEventDialog(sel);
+            const payload = await openSpecialEventDialog(sel, { withContent: specialEventCategoryCid > 0 });
             if (!payload) return;
-            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+            const resp = await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             });
             showAlert('success', 'Évènement créé.');
             invalidateEventsCache();
             scheduleRefetch(calendar);
+            const cid = (resp && resp.categoryCid) ? parseInt(resp.categoryCid, 10) : specialEventCategoryCid;
+            if (payload.content && cid > 0) {
+              try {
+                require(['composer'], (composer) => {
+                  composer.newTopic({ cid, title: payload.title || 'Évènement', body: payload.content });
+                });
+              } catch (e) {}
+            }
           } catch (e) {
             const msg = (e && e.payload && (e.payload.message || e.payload.error || e.payload.msg)) ? String(e.payload.message || e.payload.error || e.payload.msg) : '';
             showAlert('error', msg || 'Erreur lors de la création.');
@@ -1737,11 +1806,39 @@ function toDatetimeLocalValue(date) {
               ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteSpecial || canDeleteSpecial);
+            const canEdit = !!p.canEditSpecial;
             const dlg = bootbox.dialog({
               title: 'Évènement',
               message: html,
               buttons: {
                 close: { label: 'Fermer', className: 'btn-secondary' },
+                ...(canEdit ? {
+                  edit: {
+                    label: 'Éditer',
+                    className: 'btn-default',
+                    callback: () => {
+                      (async () => {
+                        try { dlg.modal('hide'); } catch (e) { try { bootbox.hideAll(); } catch (e2) {} }
+                        const eid = String(p.eid || ev.id).replace(/^special:/, '');
+                        const initialValues = buildInitialValuesFromEvent(p);
+                        const payload = await openSpecialEventDialog({}, { kind: 'special', initialValues });
+                        if (!payload) return;
+                        try {
+                          await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, {
+                            method: 'PUT',
+                            body: JSON.stringify(payload),
+                          });
+                          showAlert('success', 'Évènement mis à jour.');
+                          invalidateEventsCache();
+                          scheduleRefetch(calendar);
+                        } catch (e) {
+                          showAlert('error', 'Mise à jour impossible.');
+                        }
+                      })();
+                      return false;
+                    },
+                  },
+                } : {}),
                 ...(canDel ? {
                   del: {
                     label: 'Supprimer',
@@ -1887,11 +1984,39 @@ function toDatetimeLocalValue(date) {
               ${notes ? `<div class="mb-2"><strong>Notes</strong><br>${escapeHtml(notes).replace(/\n/g,'<br>')}</div>` : ''}
             `;
             const canDel = !!(p.canDeleteOuting);
+            const canEditOuting = !!p.canEditOuting;
             const dlg = bootbox.dialog({
               title: 'Sortie',
               message: html,
               buttons: {
                 close: { label: 'Fermer', className: 'btn-secondary' },
+                ...(canEditOuting ? {
+                  edit: {
+                    label: 'Éditer',
+                    className: 'btn-default',
+                    callback: () => {
+                      (async () => {
+                        try { dlg.modal('hide'); } catch (e) { try { bootbox.hideAll(); } catch (e2) {} }
+                        const oid = String(p.oid || ev.id).replace(/^outing:/, '');
+                        const initialValues = buildInitialValuesFromEvent(p);
+                        const payload = await openSpecialEventDialog({}, { kind: 'outing', initialValues });
+                        if (!payload) return;
+                        try {
+                          await fetchJson(`/api/v3/plugins/calendar-onekite/outings/${encodeURIComponent(oid)}`, {
+                            method: 'PUT',
+                            body: JSON.stringify(payload),
+                          });
+                          showAlert('success', 'Sortie mise à jour.');
+                          invalidateEventsCache();
+                          scheduleRefetch(calendar);
+                        } catch (e) {
+                          showAlert('error', 'Mise à jour impossible.');
+                        }
+                      })();
+                      return false;
+                    },
+                  },
+                } : {}),
                 ...(canDel ? {
                   del: {
                     label: 'Supprimer',

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

@@ -161,11 +161,13 @@
         <h4>Évènements (autre couleur)</h4>
         <div class="form-text mb-3">Permet de créer des évènements horaires (début/fin) avec adresse (Leaflet) et notes.</div>
 
-        <h4 class="mt-3">Discord</h4>
+        <h4 class="mt-3">Publication forum</h4>
         <div class="mb-3">
-          <label class="form-label">Webhook URL — Évènements</label>
-          <input class="form-control" name="discordWebhookUrlEvents" placeholder="https://discord.com/api/webhooks/...">
-          <div class="form-text">Canal Discord dédié aux notifications d'évènements (création / annulation).</div>
+          <label class="form-label">Catégorie de publication des évènements</label>
+          <select class="form-select" name="specialEventCategoryId" id="onekite-special-category-select">
+            <option value="">— Désactivé —</option>
+          </select>
+          <div class="form-text">Si une catégorie est sélectionnée, un champ "Message" apparaît dans la modale de création. À la validation, le compositeur NodeBB s'ouvre pré-rempli pour que vous puissiez relire et publier.</div>
         </div>
 
         <div class="mb-3">