nodebb-plugin-calendar-onekite 12.0.18 → 12.0.20

package/lib/api.js

@@ -50,6 +50,7 @@ function normalizeAllowedGroups(raw) {
 
 
 const helloasso = require('./helloasso');
+const discord = require('./discord');
 
 // Email helper: NodeBB's Emailer signature differs across versions.
 // We try the common forms. Any failure is logged for debugging.
@@ -722,6 +723,20 @@ api.createReservation = async function (req, res) {
     console.warn('[calendar-onekite] Failed to send pending email', e && e.message ? e.message : e);
   }
 
+  // Discord webhook (optional)
+  try {
+    await discord.notifyReservationRequested(settings, {
+      rid: resv.rid,
+      uid: resv.uid,
+      username: resv.username || '',
+      itemIds: resv.itemIds || [],
+      itemNames: resv.itemNames || [],
+      start: resv.start,
+      end: resv.end,
+      status: resv.status,
+    });
+  } catch (e) {}
+
   res.json({ ok: true, rid });
 };
 

package/lib/discord.js

@@ -0,0 +1,127 @@
+'use strict';
+
+const https = require('https');
+const { URL } = require('url');
+
+function isEnabled(v, defaultValue) {
+  if (v === undefined || v === null || v === '') return defaultValue !== false;
+  const s = String(v).trim().toLowerCase();
+  if (['1', 'true', 'yes', 'on'].includes(s)) return true;
+  if (['0', 'false', 'no', 'off'].includes(s)) return false;
+  return defaultValue !== false;
+}
+
+function formatFRShort(ts) {
+  const d = new Date(ts);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yy = String(d.getFullYear()).slice(-2);
+  return `${dd}/${mm}/${yy}`;
+}
+
+function postWebhook(webhookUrl, payload) {
+  return new Promise((resolve, reject) => {
+    try {
+      const u = new URL(String(webhookUrl));
+      if (u.protocol !== 'https:') {
+        return reject(new Error('discord-webhook-must-be-https'));
+      }
+
+      const body = Buffer.from(JSON.stringify(payload || {}), 'utf8');
+      const req = https.request({
+        method: 'POST',
+        hostname: u.hostname,
+        port: u.port || 443,
+        path: u.pathname + (u.search || ''),
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': body.length,
+          'User-Agent': 'nodebb-plugin-calendar-onekite',
+        },
+      }, (res) => {
+        const ok = res.statusCode && res.statusCode >= 200 && res.statusCode < 300;
+        const chunks = [];
+        res.on('data', (c) => chunks.push(c));
+        res.on('end', () => {
+          if (ok) return resolve(true);
+          const msg = Buffer.concat(chunks).toString('utf8');
+          return reject(new Error(`discord-webhook-http-${res.statusCode}: ${msg}`));
+        });
+      });
+      req.on('error', reject);
+      req.write(body);
+      req.end();
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+function buildReservationMessage(kind, reservation) {
+  const calUrl = 'https://www.onekite.com/calendar';
+  const username = reservation && reservation.username ? String(reservation.username) : '';
+  const items = (reservation && Array.isArray(reservation.itemNames) && reservation.itemNames.length)
+    ? reservation.itemNames.map(String)
+    : (reservation && Array.isArray(reservation.itemIds) ? reservation.itemIds.map(String) : []);
+  const start = reservation && reservation.start ? Number(reservation.start) : NaN;
+  const end = reservation && reservation.end ? Number(reservation.end) : NaN;
+
+  const title = kind === 'paid'
+    ? `**[Paiement reçu](${calUrl})** — ${username}`
+    : `**[Demande réservation](${calUrl})** — ${username}`;
+
+  const lines = [
+    title,
+    '',
+    kind === 'paid' ? '**Matériel :**' : '**Matériel demandé :**',
+  ];
+  for (const it of items) {
+    lines.push(`- ${it}`);
+  }
+  if (Number.isFinite(start) && Number.isFinite(end)) {
+    lines.push('');
+    lines.push(`Du ${formatFRShort(start)} au ${formatFRShort(end)}`);
+  }
+  return lines.join('\n');
+}
+
+function buildWebhookPayload(kind, reservation) {
+  // Discord "regroupe" visuellement les messages consécutifs d'un même auteur.
+  // En utilisant un username différent par action, on obtient un message bien distinct.
+  const username = kind === 'paid' ? 'OneKite • Paiement' : 'OneKite • Réservation';
+  return {
+    username,
+    content: buildReservationMessage(kind, reservation),
+  };
+}
+
+async function notifyReservationRequested(settings, reservation) {
+  const url = settings && settings.discordWebhookUrl ? String(settings.discordWebhookUrl).trim() : '';
+  if (!url) return;
+  if (!isEnabled(settings.discordNotifyOnRequest, true)) return;
+
+  try {
+    await postWebhook(url, buildWebhookPayload('request', reservation));
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Discord webhook failed (request)', e && e.message ? e.message : String(e));
+  }
+}
+
+async function notifyPaymentReceived(settings, reservation) {
+  const url = settings && settings.discordWebhookUrl ? String(settings.discordWebhookUrl).trim() : '';
+  if (!url) return;
+  if (!isEnabled(settings.discordNotifyOnPaid, true)) return;
+
+  try {
+    await postWebhook(url, buildWebhookPayload('paid', reservation));
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Discord webhook failed (paid)', e && e.message ? e.message : String(e));
+  }
+}
+
+module.exports = {
+  notifyReservationRequested,
+  notifyPaymentReceived,
+};

package/lib/helloassoWebhook.js

@@ -17,6 +17,7 @@ try {
 
 const dbLayer = require('./db');
 const helloasso = require('./helloasso');
+const discord = require('./discord');
 
 const SETTINGS_KEY = 'calendar-onekite';
 
@@ -363,6 +364,20 @@ async function handler(req, res, next) {
       });
     }
 
+    // Discord webhook (optional)
+    try {
+      await discord.notifyPaymentReceived(settings, {
+        rid: r.rid,
+        uid: r.uid,
+        username: (requester && requester.username) ? requester.username : (r.username || ''),
+        itemIds: r.itemIds || (r.itemId ? [r.itemId] : []),
+        itemNames: r.itemNames || (r.itemName ? [r.itemName] : []),
+        start: r.start,
+        end: r.end,
+        status: r.status,
+      });
+    } catch (e) {}
+
     await markProcessed(paymentId);
     return res.json({ ok: true, processed: true });
   } catch (err) {

package/lib/widgets.js

@@ -0,0 +1,177 @@
+'use strict';
+
+const nconf = require.main.require('nconf');
+
+function forumBaseUrl() {
+  return String(nconf.get('url') || '').trim().replace(/\/$/, '');
+}
+
+function escapeHtml(s) {
+  return String(s || '')
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+function makeDomId() {
+  const r = Math.floor(Math.random() * 1e9);
+  return `onekite-twoweeks-${Date.now()}-${r}`;
+}
+
+function widgetCalendarUrl() {
+  // Per request, keep the public URL fixed (even if forum base differs)
+  return 'https://www.onekite.com/calendar';
+}
+
+const widgets = {};
+
+widgets.defineWidgets = async function (widgetData) {
+  // NodeBB versions differ:
+  // - Some pass an object: { widgets: [...] }
+  // - Others pass the array directly
+  const list = Array.isArray(widgetData)
+    ? widgetData
+    : (widgetData && Array.isArray(widgetData.widgets) ? widgetData.widgets : null);
+
+  if (!list) {
+    return widgetData;
+  }
+
+  list.push({
+    widget: 'calendar-onekite-twoweeks',
+    name: 'Calendrier OneKite (2 semaines)',
+    description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
+    content: '',
+  });
+
+  return widgetData;
+};
+
+widgets.renderTwoWeeksWidget = async function (data) {
+  // data: { widget, ... }
+  const id = makeDomId();
+  const calUrl = widgetCalendarUrl();
+  const apiBase = forumBaseUrl();
+  const eventsEndpoint = `${apiBase}/api/v3/plugins/calendar-onekite/events`;
+
+  const idJson = JSON.stringify(id);
+  const calUrlJson = JSON.stringify(calUrl);
+  const eventsEndpointJson = JSON.stringify(eventsEndpoint);
+
+  const html = `
+<div class="onekite-twoweeks">
+  <div class="d-flex justify-content-between align-items-center mb-1">
+    <div style="font-weight: 600;">Calendrier (2 semaines)</div>
+    <a href="${escapeHtml(calUrl)}" class="btn btn-sm btn-outline-secondary" style="line-height: 1.1;">Ouvrir</a>
+  </div>
+  <div id="${escapeHtml(id)}"></div>
+</div>
+
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@latest/main.min.css" />
+<script>
+(function(){
+  const containerId = ${idJson};
+  const calUrl = ${calUrlJson};
+  const eventsEndpoint = ${eventsEndpointJson};
+
+  function loadOnce(tag, attrs) {
+    return new Promise((resolve, reject) => {
+      try {
+        const key = attrs && (attrs.id || attrs.href || attrs.src);
+        if (key && document.querySelector((attrs.id ? ('#' + attrs.id) : (attrs.href ? ('link[href="' + attrs.href + '"]') : ('script[src="' + attrs.src + '"]'))))) {
+          resolve();
+          return;
+        }
+        const el = document.createElement(tag);
+        Object.keys(attrs || {}).forEach((k) => el.setAttribute(k, attrs[k]));
+        el.onload = () => resolve();
+        el.onerror = () => reject(new Error('load-failed'));
+        document.head.appendChild(el);
+      } catch (e) {
+        reject(e);
+      }
+    });
+  }
+
+  async function ensureFullCalendar() {
+    if (window.FullCalendar && window.FullCalendar.Calendar) {
+      return;
+    }
+    await loadOnce('script', {
+      id: 'onekite-fullcalendar-global',
+      src: 'https://cdn.jsdelivr.net/npm/fullcalendar@latest/index.global.min.js',
+      async: 'true'
+    });
+    await loadOnce('script', {
+      id: 'onekite-fullcalendar-locales',
+      src: 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@latest/locales-all.global.min.js',
+      async: 'true'
+    });
+  }
+
+  async function init() {
+    const el = document.getElementById(containerId);
+    if (!el) return;
+
+    await ensureFullCalendar();
+
+    // Define a 2-week dayGrid view
+    const calendar = new window.FullCalendar.Calendar(el, {
+      initialView: 'dayGridTwoWeek',
+      views: {
+        dayGridTwoWeek: {
+          type: 'dayGrid',
+          duration: { weeks: 2 },
+          buttonText: '2 semaines',
+        },
+      },
+      locale: 'fr',
+      firstDay: 1,
+      height: 'auto',
+      headerToolbar: {
+        left: 'prev,next',
+        center: 'title',
+        right: '',
+      },
+      navLinks: false,
+      eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
+      events: function(info, successCallback, failureCallback) {
+        const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
+        fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
+          .then((r) => r.json())
+          .then((json) => successCallback(json || []))
+          .catch((e) => failureCallback(e));
+      },
+      dateClick: function() {
+        window.location.href = calUrl;
+      },
+      eventClick: function() {
+        window.location.href = calUrl;
+      },
+    });
+
+    calendar.render();
+  }
+
+  // Widgets can be rendered after ajaxify; delay a tick.
+  setTimeout(() => init().catch(() => {}), 0);
+})();
+</script>
+
+<style>
+  .onekite-twoweeks .fc .fc-toolbar-title { font-size: 1rem; }
+  .onekite-twoweeks .fc .fc-button { padding: .2rem .35rem; font-size: .75rem; }
+  .onekite-twoweeks .fc .fc-daygrid-day-number { font-size: .75rem; padding: 2px; }
+  .onekite-twoweeks .fc .fc-col-header-cell-cushion { font-size: .75rem; }
+  .onekite-twoweeks .fc .fc-event-title { font-size: .72rem; }
+</style>
+  `;
+
+  data = data || {};
+  data.html = html;
+  return data;
+};
+
+module.exports = widgets;

package/library.js

@@ -12,6 +12,7 @@ const api = require('./lib/api');
 const admin = require('./lib/admin');
 const scheduler = require('./lib/scheduler');
 const helloassoWebhook = require('./lib/helloassoWebhook');
+const widgets = require('./lib/widgets');
 const bodyParser = require('body-parser');
 
 const Plugin = {};
@@ -149,4 +150,8 @@ Plugin.emailModify = async function (data) {
   return data;
 };
 
+// Widgets
+Plugin.defineWidgets = widgets.defineWidgets;
+Plugin.renderTwoWeeksWidget = widgets.renderTwoWeeksWidget;
+
 module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -15,6 +15,14 @@
     {
       "hook": "filter:email.modify",
       "method": "emailModify"
+    },
+    {
+      "hook": "filter:widgets.getWidgets",
+      "method": "defineWidgets"
+    },
+    {
+      "hook": "filter:widget.render:calendar-onekite-twoweeks",
+      "method": "renderTwoWeeksWidget"
     }
   ],
   "staticDirs": {
@@ -31,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.1.1"
+  "version": "1.2.8"
 }

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

@@ -53,6 +53,31 @@
             <div class="form-text">Après validation (statut <code>paiement en attente</code>), un rappel est envoyé après ce délai. La réservation est ensuite expirée après <strong>2×</strong> ce délai.</div>
           </div>
 
+          <hr class="my-4" />
+          <h4>Discord</h4>
+
+          <div class="mb-3">
+            <label class="form-label">Webhook URL</label>
+            <input class="form-control" name="discordWebhookUrl" placeholder="https://discord.com/api/webhooks/...">
+            <div class="form-text">Si vide, aucune notification Discord n'est envoyée.</div>
+          </div>
+
+          <div class="mb-3">
+            <label class="form-label">Envoyer une notification à la demande</label>
+            <select class="form-select" name="discordNotifyOnRequest">
+              <option value="1">Oui</option>
+              <option value="0">Non</option>
+            </select>
+          </div>
+
+          <div class="mb-3">
+            <label class="form-label">Envoyer une notification au paiement reçu</label>
+            <select class="form-select" name="discordNotifyOnPaid">
+              <option value="1">Oui</option>
+              <option value="0">Non</option>
+            </select>
+          </div>
+
           <h4 class="mt-4">HelloAsso</h4>
 
           <div class="mb-3">