nodebb-plugin-onekite-calendar 2.0.67 → 2.0.68

package/lib/api.js

@@ -768,6 +768,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 +784,7 @@ api.getCapabilities = async function (req, res) {
     canDeleteSpecial: canSpecialD,
     canCreateOuting: canOuting,
     canCreateReservation: canRes,
+    specialEventCategoryCid: parseInt(settings && settings.specialEventCategoryId, 10) || 0,
   });
 };
 
@@ -815,6 +817,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 +830,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 +845,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) {

package/package.json

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

@@ -339,6 +339,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         <label class="form-label">Notes (facultatif)</label>
         <textarea class="form-control" id="onekite-se-notes" rows="3" placeholder="..."></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) => {
@@ -392,8 +398,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;
             },
           },
@@ -1225,6 +1234,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 +1425,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 +1513,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.');

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">