nodebb-plugin-calendar-onekite 11.1.95 → 11.1.97

package/lib/admin.js

@@ -20,500 +20,32 @@ function formatFR(tsOrIso) {
 
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
+  const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
+  const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
+  const params = Object.assign({}, data || {}, subject ? { subject } : {});
   try {
     if (typeof emailer.sendToEmail === 'function') {
+      // NodeBB: sendToEmail(template, email, language, params)
       if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, subject, data);
+        await emailer.sendToEmail(template, toEmail, lang, params);
       } else {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+        // Older signature: sendToEmail(template, email, params)
+        await emailer.sendToEmail(template, toEmail, params);
       }
       return;
     }
     if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
-        return;
-      }
-      if (emailer.send.length === 3) {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.send(template, toEmail, dataWithSubject);
-        return;
-      }
-      await emailer.send(template, toEmail, subject, data);
+      // Fallback: send(template, uid, params) - not usable without uid
+      // Best effort: do nothing rather than crash
+      return;
     }
   } catch (err) {
-    console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err && err.message || err) });
-  }
-}
-
-function normalizeCallbackUrl(configured, meta) {
-  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  let url = (configured || '').trim();
-  if (!url) {
-    url = base ? `${base}/helloasso` : '';
-  }
-  if (url && url.startsWith('/') && base) {
-    url = `${base}${url}`;
-  }
-  return url;
-}
-
-function normalizeReturnUrl(meta) {
-  const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
-  const b = String(base || '').trim().replace(/\/$/, '');
-  if (!b) return '';
-  return `${b}/calendar`;
-}
-
-
-const dbLayer = require('./db');
-const helloasso = require('./helloasso');
-
-const ADMIN_PRIV = 'admin:settings';
-
-const admin = {};
-
-admin.renderAdmin = async function (req, res) {
-  res.render('admin/plugins/calendar-onekite', {
-    title: 'Calendar OneKite',
-  });
-};
-
-admin.getSettings = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
-  res.json(settings || {});
-};
-
-admin.saveSettings = async function (req, res) {
-  await meta.settings.set('calendar-onekite', req.body || {});
-  res.json({ ok: true });
-};
-
-admin.listPending = async function (req, res) {
-  const ids = await dbLayer.listAllReservationIds(5000);
-  const pending = [];
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (r && r.status === 'pending') {
-      pending.push(r);
-    }
-  }
-  pending.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));
-  res.json(pending);
-};
-
-admin.approveReservation = async function (req, res) {
-  const rid = req.params.rid;
-  const r = await dbLayer.getReservation(rid);
-  if (!r) return res.status(404).json({ error: 'not-found' });
-
-  r.status = 'awaiting_payment';
-  r.pickupAddress = String((req.body && (req.body.pickupAddress || req.body.adminNote || req.body.note)) || '').trim();
-  r.notes = String((req.body && req.body.notes) || '').trim();
-  r.pickupTime = String((req.body && (req.body.pickupTime || req.body.pickup)) || '').trim();
-  r.pickupLat = String((req.body && req.body.pickupLat) || '').trim();
-  r.pickupLon = String((req.body && req.body.pickupLon) || '').trim();
-  r.approvedAt = Date.now();
-
-  try {
-    const approver = await user.getUserFields(req.uid, ['username']);
-    r.approvedBy = req.uid;
-    r.approvedByUsername = approver && approver.username ? approver.username : '';
-  } catch (e) {
-    r.approvedBy = req.uid;
-    r.approvedByUsername = '';
-  }
-
-  // Create HelloAsso payment link if configured
-  const settings = await meta.settings.get('calendar-onekite');
-  const env = settings.helloassoEnv || 'prod';
-  const token = await helloasso.getAccessToken({
-    env,
-    clientId: settings.helloassoClientId,
-    clientSecret: settings.helloassoClientSecret,
-  });
-        if (!token) {
-          console.warn('[calendar-onekite] HelloAsso access token not obtained (approve ACP)', { rid: r && r.rid });
-        }
-
-  let paymentUrl = null;
-  if (token) {
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    // r.total is stored as an estimated total in euros; HelloAsso expects cents.
-    const totalAmount = Math.max(0, Math.round((Number(r.total) || 0) * 100));
-    const base = forumBaseUrl();
-    const returnUrl = base ? `${base}/calendar` : '';
-    const webhookUrl = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
-    const year = new Date(Number(r.start)).getFullYear();
-    paymentUrl = await helloasso.createCheckoutIntent({
-      env,
-      token,
-      organizationSlug: settings.helloassoOrganizationSlug,
-      formType: settings.helloassoFormType,
-      // Form slug is derived from the year
-      formSlug: `locations-materiel-${year}`,
-      totalAmount,
-      payerEmail: requester && requester.email,
-      // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
-      callbackUrl: returnUrl,
-      webhookUrl: webhookUrl,
-      itemName: 'Réservation matériel OneKite',
-      containsDonation: false,
-      metadata: { reservationId: String(rid) },
+    console.warn('[calendar-onekite] Failed to send email', {
+      template,
+      toEmail,
+      err: err && err.message ? err.message : String(err),
     });
   }
-
-  if (paymentUrl) {
-    r.paymentUrl = paymentUrl;
-  } else {
-    console.warn('[calendar-onekite] HelloAsso payment link not created (approve ACP)', { rid });
-  }
-
-  await dbLayer.saveReservation(r);
-
-  // Email requester
-  try {
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    if (requester && requester.email) {
-      const latNum = Number(r.pickupLat);
-      const lonNum = Number(r.pickupLon);
-      const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
-        ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
-        : '';
-      await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
-        username: requester.username,
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
-        dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
-        paymentUrl: paymentUrl || '',
-        pickupAddress: r.pickupAddress || '',
-        notes: r.notes || '',
-        pickupTime: r.pickupTime || '',
-        pickupLat: r.pickupLat || '',
-        pickupLon: r.pickupLon || '',
-        mapUrl,
-        validatedBy: r.approvedByUsername || '',
-        validatedByUrl: (r.approvedByUsername ? `https://www.onekite.com/user/${encodeURIComponent(String(r.approvedByUsername))}` : ''),
-      });
-    }
-  } catch (e) {}
-
-  res.json({ ok: true, paymentUrl: paymentUrl || null });
-};
-
-admin.refuseReservation = async function (req, res) {
-  const rid = req.params.rid;
-  const r = await dbLayer.getReservation(rid);
-  if (!r) return res.status(404).json({ error: 'not-found' });
-
-  r.status = 'refused';
-  await dbLayer.saveReservation(r);
-
-  try {
-    const requester = await user.getUserFields(r.uid, ['username', 'email']);
-    if (requester && requester.email) {
-      await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
-        username: requester.username,
-        itemName: r.itemName,
-        start: formatFR(r.start),
-        end: formatFR(r.end),
-      });
-    }
-  } catch (e) {}
-
-  res.json({ ok: true });
-};
-
-admin.purgeByYear = async function (req, res) {
-  const year = (req.body && req.body.year ? String(req.body.year) : '').trim();
-  if (!/^\d{4}$/.test(year)) {
-    return res.status(400).json({ error: 'invalid-year' });
-  }
-  const y = parseInt(year, 10);
-  const startTs = new Date(Date.UTC(y, 0, 1)).getTime();
-  const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
-
-  const ids = await dbLayer.listReservationIdsByStartRange(startTs, endTs, 100000);
-  let count = 0;
-  for (const rid of ids) {
-    await dbLayer.removeReservation(rid);
-    count++;
-  }
-  res.json({ ok: true, removed: count });
-};
-
-admin.purgeSpecialEventsByYear = async function (req, res) {
-  const year = (req.body && req.body.year ? String(req.body.year) : '').trim();
-  if (!/^\d{4}$/.test(year)) {
-    return res.status(400).json({ error: 'invalid-year' });
-  }
-  const y = parseInt(year, 10);
-  const startTs = new Date(Date.UTC(y, 0, 1)).getTime();
-  const endTs = new Date(Date.UTC(y + 1, 0, 1)).getTime() - 1;
-
-  const ids = await dbLayer.listSpecialIdsByStartRange(startTs, endTs, 100000);
-  let count = 0;
-  for (const eid of ids) {
-    await dbLayer.removeSpecialEvent(eid);
-    count++;
-  }
-  return res.json({ ok: true, removed: count });
-};
-
-// Debug endpoint to validate HelloAsso connectivity and item loading
-
-
-admin.debugHelloAsso = async function (req, res) {
-  const settings = await meta.settings.get('calendar-onekite');
-  const env = (settings && settings.helloassoEnv) || 'prod';
-
-  // Never expose secrets in debug output
-  const safeSettings = {
-    helloassoEnv: env,
-    helloassoClientId: settings && settings.helloassoClientId ? String(settings.helloassoClientId) : '',
-    helloassoClientSecret: settings && settings.helloassoClientSecret ? '***' : '',
-    helloassoOrganizationSlug: settings && settings.helloassoOrganizationSlug ? String(settings.helloassoOrganizationSlug) : '',
-    helloassoFormType: settings && settings.helloassoFormType ? String(settings.helloassoFormType) : '',
-    helloassoFormSlug: settings && settings.helloassoFormSlug ? String(settings.helloassoFormSlug) : '',
-  };
-
-  const out = {
-    ok: true,
-    settings: safeSettings,
-    token: { ok: false },
-    // Catalog = what you actually want for a shop (available products/material)
-    catalog: { ok: false, count: 0, sample: [], keys: [] },
-    // Sold items = items present in orders (can be 0 if no sales yet)
-    soldItems: { ok: false, count: 0, sample: [] },
-  };
-
-  try {
-    const token = await helloasso.getAccessToken({
-      env,
-      clientId: settings.helloassoClientId,
-      clientSecret: settings.helloassoClientSecret,
-    });
-    if (!token) {
-      out.token = { ok: false, error: 'token-null' };
-      return res.json(out);
-    }
-    out.token = { ok: true };
-
-    // Catalog items (via /public)
-    try {
-      const y = new Date().getFullYear();
-      const { publicForm, items } = await helloasso.listCatalogItems({
-        env,
-        token,
-        organizationSlug: settings.helloassoOrganizationSlug,
-        formType: settings.helloassoFormType,
-        formSlug: `locations-materiel-${y}`,
-      });
-
-      const arr = Array.isArray(items) ? items : [];
-      out.catalog.ok = true;
-      out.catalog.count = arr.length;
-      out.catalog.keys = publicForm && typeof publicForm === 'object' ? Object.keys(publicForm) : [];
-      out.catalog.sample = arr.slice(0, 10).map((it) => ({
-        id: it.id,
-        name: it.name,
-        price: it.price ?? null,
-      }));
-    } catch (e) {
-      out.catalog = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [], keys: [] };
-    }
-
-    // Sold items
-    try {
-      const y2 = new Date().getFullYear();
-      const items = await helloasso.listItems({
-        env,
-        token,
-        organizationSlug: settings.helloassoOrganizationSlug,
-        formType: settings.helloassoFormType,
-        formSlug: `locations-materiel-${y2}`,
-      });
-      const arr = Array.isArray(items) ? items : [];
-      out.soldItems.ok = true;
-      out.soldItems.count = arr.length;
-      out.soldItems.sample = arr.slice(0, 10).map((it) => ({
-        id: it.id || it.itemId || it.reference || it.name,
-        name: it.name || it.label || it.itemName,
-        price: it.price || it.amount || it.unitPrice || null,
-      }));
-    } catch (e) {
-      out.soldItems = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
-    }
-
-    return res.json(out);
-  } catch (e) {
-    out.ok = false;
-    out.token = { ok: false, error: String(e && e.message ? e.message : e) };
-    return res.json(out);
-  }
-};
-
-// Accounting endpoint: aggregates paid reservations so you can contabilize what was rented.
-// Query params:
-//   from=YYYY-MM-DD (inclusive, based on reservation.start)
-//   to=YYYY-MM-DD (exclusive, based on reservation.start)
-admin.getAccounting = async function (req, res) {
-  const qFrom = String((req.query && req.query.from) || '').trim();
-  const qTo = String((req.query && req.query.to) || '').trim();
-  const parseDay = (s) => {
-    if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return null;
-    const [y, m, d] = s.split('-').map((x) => parseInt(x, 10));
-    const dt = new Date(Date.UTC(y, m - 1, d));
-    const ts = dt.getTime();
-    return Number.isFinite(ts) ? ts : null;
-  };
-  const fromTs = parseDay(qFrom);
-  const toTs = parseDay(qTo);
-
-  // Default: last 12 months (UTC)
-  const now = new Date();
-  const defaultTo = Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 1);
-  const defaultFrom = Date.UTC(now.getUTCFullYear() - 1, now.getUTCMonth() + 1, 1);
-  const minTs = fromTs ?? defaultFrom;
-  const maxTs = toTs ?? defaultTo;
-
-  const ids = await dbLayer.listAllReservationIds(100000);
-  const rows = [];
-  const byItem = new Map();
-
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (!r) continue;
-    if (String(r.status) !== 'paid') continue;
-    if (r.accPurgedAt) continue;
-    const start = parseInt(r.start, 10);
-    if (!Number.isFinite(start)) continue;
-    if (start < minTs || start >= maxTs) continue;
-
-    const itemNames = Array.isArray(r.itemNames) && r.itemNames.length
-      ? r.itemNames
-      : (r.itemName ? [r.itemName] : []);
-
-    const total = Number(r.total) || 0;
-    const startDate = formatFR(r.start);
-    const endDate = formatFR(r.end);
-
-    rows.push({
-      rid: r.rid,
-      uid: r.uid,
-      username: r.username || '',
-      start: r.start,
-      end: r.end,
-      startDate,
-      endDate,
-      items: itemNames,
-      total,
-      paidAt: r.paidAt || '',
-    });
-
-    for (const name of itemNames) {
-      const key = String(name || '').trim();
-      if (!key) continue;
-      const cur = byItem.get(key) || { item: key, count: 0, total: 0 };
-      cur.count += 1;
-      cur.total += total;
-      byItem.set(key, cur);
-    }
-  }
-
-  const summary = Array.from(byItem.values()).sort((a, b) => b.count - a.count);
-  rows.sort((a, b) => parseInt(a.start, 10) - parseInt(b.start, 10));
-
-  return res.json({
-    ok: true,
-    from: new Date(minTs).toISOString().slice(0, 10),
-    to: new Date(maxTs).toISOString().slice(0, 10),
-    summary,
-    rows,
-  });
-};
-
-admin.exportAccountingCsv = async function (req, res) {
-  // Reuse the same logic and emit a CSV.
-  const fakeRes = { json: (x) => x };
-  const data = await admin.getAccounting(req, fakeRes);
-  // If getAccounting returned via res.json, data is undefined; rebuild by calling logic directly.
-  // Easiest: call getAccounting's internals by fetching the endpoint logic via HTTP is not possible here.
-  // So we re-run getAccounting but capture output by monkeypatching.
-  let payload;
-  await admin.getAccounting(req, { json: (x) => { payload = x; return x; } });
-  if (!payload || !payload.ok) {
-    return res.status(500).send('error');
-  }
-  const escape = (v) => {
-    const s = String(v ?? '');
-    if (/[\n\r,\"]/g.test(s)) {
-      return '"' + s.replace(/"/g, '""') + '"';
-    }
-    return s;
-  };
-  const lines = [];
-  lines.push(['rid', 'username', 'uid', 'start', 'end', 'items', 'total', 'paidAt'].map(escape).join(','));
-  for (const r of payload.rows || []) {
-    lines.push([
-      r.rid,
-      r.username,
-      r.uid,
-      r.startDate,
-      r.endDate,
-      (Array.isArray(r.items) ? r.items.join(' | ') : ''),
-      (Number(r.total) || 0).toFixed(2),
-      r.paidAt ? new Date(parseInt(r.paidAt, 10)).toISOString() : '',
-    ].map(escape).join(','));
-  }
-  const csv = lines.join('\n');
-  res.setHeader('Content-Type', 'text/csv; charset=utf-8');
-  res.setHeader('Content-Disposition', 'attachment; filename="calendar-onekite-accounting.csv"');
-  return res.send(csv);
-};
-
-
-admin.purgeAccounting = async function (req, res) {
-  const qFrom = String((req.query && req.query.from) || '').trim();
-  const qTo = String((req.query && req.query.to) || '').trim();
-  const parseDay = (s) => {
-    if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return null;
-    const [y, m, d] = s.split('-').map((x) => parseInt(x, 10));
-    const dt = new Date(Date.UTC(y, m - 1, d));
-    const ts = dt.getTime();
-    return Number.isFinite(ts) ? ts : null;
-  };
-  const fromTs = parseDay(qFrom);
-  const toTs = parseDay(qTo);
-
-  const now = new Date();
-  const defaultTo = Date.UTC(now.getUTCFullYear() + 100, 0, 1); // far future
-  const defaultFrom = Date.UTC(1970, 0, 1);
-  const minTs = fromTs ?? defaultFrom;
-  const maxTs = toTs ?? defaultTo;
-
-  const ids = await dbLayer.listAllReservationIds(200000);
-  let purged = 0;
-  const ts = Date.now();
-
-  for (const rid of ids) {
-    const r = await dbLayer.getReservation(rid);
-    if (!r) continue;
-    if (String(r.status) !== 'paid') continue;
-    // Already purged from accounting
-    if (r.accPurgedAt) continue;
-    const start = parseInt(r.start, 10);
-    if (!Number.isFinite(start)) continue;
-    if (start < minTs || start >= maxTs) continue;
-
-    r.accPurgedAt = ts;
-    await dbLayer.saveReservation(r);
-    purged++;
-  }
-
-  return res.json({ ok: true, purged });
-};
+}
 
 
-module.exports = admin;

package/package.json

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

package/public/client.js

@@ -189,6 +189,33 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
     openMapViewer('Adresse', addr, lat, lon);
   });
 
+
+// Close any open Bootbox modal when navigating to a user profile from within a modal
+document.addEventListener('click', (ev) => {
+  const a = ev.target && ev.target.closest ? ev.target.closest('a.onekite-user-link') : null;
+  if (!a) return;
+  const inModal = !!(a.closest && a.closest('.modal, .bootbox'));
+  if (!inModal) return;
+  const href = a.getAttribute('href');
+  if (!href) return;
+  ev.preventDefault();
+  try { bootbox.hideAll(); } catch (e) {}
+  setTimeout(() => { window.location.href = href; }, 50);
+});
+
+// Close any open Bootbox modal when navigating to a user profile from within a modal
+document.addEventListener('click', (ev) => {
+  const a = ev.target && ev.target.closest ? ev.target.closest('a.onekite-user-link') : null;
+  if (!a) return;
+  const inModal = !!(a.closest && a.closest('.modal, .bootbox'));
+  if (!inModal) return;
+  const href = a.getAttribute('href');
+  if (!href) return;
+  ev.preventDefault();
+  try { bootbox.hideAll(); } catch (e) {}
+  setTimeout(() => { window.location.href = href; }, 50);
+});
+
   function statusLabel(s) {
     const map = {
       pending: 'En attente',
@@ -228,7 +255,14 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
       ...opts,
     });
     if (!res.ok) {
-      throw new Error(`${res.status}`);
+      let payload = null;
+      try {
+        payload = await res.json();
+      } catch (e) {}
+      const err = new Error(`${res.status}`);
+      err.status = res.status;
+      err.payload = payload;
+      throw err;
     }
     return await res.json();
   }
@@ -634,7 +668,8 @@ function toDatetimeLocalValue(date) {
     const canCreateSpecial = !!caps.canCreateSpecial;
     const canDeleteSpecial = !!caps.canDeleteSpecial;
 
-    let setMode('reservation'); 
+    // Current creation mode: reservation (location) or special (event)
+    let mode = 'reservation';
         function refreshDesktopModeButton() {
           try {
             const btn = document.querySelector('#onekite-calendar .fc-newSpecial-button');
@@ -818,13 +853,22 @@ function toDatetimeLocalValue(date) {
           calendar.unselect();
           isDialogOpen = false;
         } catch (e) {
-          const code = String(e && e.message || '');
+          const code = String((e && (e.status || e.message)) || '');
+          const payload = e && e.payload ? e.payload : null;
+
           if (code === '403') {
-            showAlert('error', 'Impossible de créer la demande : droits insuffisants (groupe).');
+            const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
+            const c = payload && payload.code ? String(payload.code) : '';
+            if (c === 'NOT_MEMBER' || /adh(é|e)rent/i.test(msg) || /membership/i.test(msg)) {
+              showAlert('error', msg || 'Vous devez être adhérent pour pouvoir effectuer une réservation.');
+            } else {
+              showAlert('error', msg || 'Impossible de créer la demande : droits insuffisants (groupe).');
+            }
           } else if (code === '409') {
             showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
           } else {
-            showAlert('error', 'Erreur lors de la création de la demande.');
+            const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
+            showAlert('error', msg || 'Erreur lors de la création de la demande.');
           }
           calendar.unselect();
           isDialogOpen = false;
@@ -833,6 +877,39 @@ function toDatetimeLocalValue(date) {
       dateClick: async function (info) {
         // One-day selection convenience
         const start = info.date;
+
+        // In "special event" mode, a simple click should propose a one-day event (not two days in the modal)
+        if (mode === 'special' && canCreateSpecial) {
+          if (isDialogOpen) {
+            return;
+          }
+          isDialogOpen = true;
+          try {
+            // Default to a same-day event: 00:00 -> 23:59
+            const end = new Date(start.getTime() + (23 * 60 + 59) * 60 * 1000);
+            const payload = await openSpecialEventDialog({ start, end, allDay: true });
+            setMode('reservation');
+            if (!payload) {
+              isDialogOpen = false;
+              return;
+            }
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
+              method: 'POST',
+              body: JSON.stringify(payload),
+            }).catch(async () => {
+              return await fetchJson('/api/plugins/calendar-onekite/special-events', {
+                method: 'POST',
+                body: JSON.stringify(payload),
+              });
+            });
+            showAlert('success', 'Évènement créé.');
+            calendar.refetchEvents();
+          } finally {
+            isDialogOpen = false;
+          }
+          return;
+        }
+
         const end = new Date(start.getTime() + 24 * 60 * 60 * 1000);
         calendar.select(start, end);
       },
@@ -843,7 +920,7 @@ function toDatetimeLocalValue(date) {
         if (p.type === 'special') {
           const username = String(p.username || '').trim();
           const userLine = username
-            ? `<div class="mb-2"><strong>Créé par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+            ? `<div class="mb-2"><strong>Créé par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
             : '';
           const addr = String(p.pickupAddress || '').trim();
           const lat = Number(p.pickupLat);
@@ -895,7 +972,7 @@ function toDatetimeLocalValue(date) {
         // Reserved-by line (user profile link)
         const username = String(p.username || p.user || p.reservedBy || p.ownerUsername || '').trim();
         const userLine = username
-          ? `<div class="mb-2"><strong>Réservée par</strong><br><a href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
+          ? `<div class="mb-2"><strong>Réservée par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
           : '';
         const itemsHtml = (() => {
         const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
@@ -908,7 +985,7 @@ function toDatetimeLocalValue(date) {
 
         const approvedBy = String(p.approvedByUsername || '').trim();
         const validatedByHtml = approvedBy
-          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a href=\"https://www.onekite.com/user/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
+          ? `<div class=\"mb-2\"><strong>Validée par</strong><br><a class=\"onekite-user-link\" href=\"${window.location.origin}/user/${encodeURIComponent(approvedBy)}\">${escapeHtml(approvedBy)}</a></div>`
           : '';
 
         // Pickup details (address / time / notes) shown once validated