nodebb-plugin-calendar-onekite 11.1.30 → 11.1.31

package/lib/api.js

@@ -4,12 +4,6 @@ const meta = require.main.require('./src/meta');
 const dbi = require('./db');
 const hello = require('./helloasso');
 
-const BLOCKING_STATUSES = new Set(['pending', 'awaiting_payment', 'approved', 'paid']);
-
-function overlaps(aStart, aEnd, bStart, bEnd) {
-  return Number(aStart) < Number(bEnd) && Number(bStart) < Number(aEnd);
-}
-
 function parseDateParam(s) {
   // FullCalendar sends ISO date/time. Accept 'YYYY-MM-DD' too.
   const d = new Date(s);
@@ -35,35 +29,6 @@ function daysBetweenInclusive(startYMD, endYMDExclusive) {
 
 let catalogCache = { at: 0, items: [], raw: null, ok: false, err: null };
 
-async function sweepExpiredPending() {
-  const now = Date.now();
-  const ids = await dbi.listExpiredIds(now, 5000);
-  if (!ids.length) return 0;
-  const rows = await dbi.getReservations(ids);
-  let expiredCount = 0;
-  for (const r of rows) {
-    if (!r) continue;
-    const status = r.status || 'pending';
-    const expiresAt = Number(r.expiresAt || 0);
-    if (status === 'pending' && expiresAt && expiresAt <= now) {
-      r.status = 'expired';
-      r.expiredAt = now;
-      r.expiresAt = '';
-      await dbi.saveReservation(r);
-      await dbi.clearExpiryIndex(r.id);
-      expiredCount++;
-    } else {
-      // Not actually expired, remove from expiry index to avoid repeated scans
-      if (expiresAt && expiresAt > now) {
-        // keep
-      } else {
-        await dbi.clearExpiryIndex(r.id);
-      }
-    }
-  }
-  return expiredCount;
-}
-
 async function getSettings() {
   const settings = await meta.settings.get('calendar-onekite');
   return settings || {};
@@ -96,7 +61,6 @@ async function getCatalog(req, res) {
 }
 
 async function getEvents(req, res) {
-  await sweepExpiredPending();
   const start = parseDateParam(req.query.start);
   const end = parseDateParam(req.query.end);
   const startTs = start ? start.getTime() : Date.now() - 365*86400000;
@@ -105,17 +69,11 @@ async function getEvents(req, res) {
   const ids = await dbi.listReservationIdsByStartRange(startTs, endTs, 5000);
   const rows = await dbi.getReservations(ids);
 
-  const events = rows
-    .filter(r => {
-      const status = r.status || 'pending';
-      // Hide expired requests from calendar
-      return status !== 'expired';
-    })
-    .map(r => {
+  const events = rows.map(r => {
     const itemNames = (r.items || []).map(it => it.name).join(', ');
     const title = itemNames || 'Réservation';
     const status = r.status || 'pending';
-    const icon = status === 'approved' ? '✅' : status === 'awaiting_payment' ? '💳' : status === 'refused' ? '⛔' : '⏳';
+    const icon = status === 'approved' ? '✅' : status === 'refused' ? '⛔' : '⏳';
     return {
       id: r.id,
       title: `${icon} ${title}`,
@@ -139,9 +97,6 @@ async function createReservation(req, res) {
   const uid = req.uid;
   if (!uid) return res.status(403).json({ status: { code: 'forbidden', message: 'Not logged in' } });
 
-  // Expire old pending holds before checking availability
-  await sweepExpiredPending();
-
   const body = req.body || {};
   const startYMD = body.start;
   const endYMD = body.end;
@@ -170,35 +125,6 @@ async function createReservation(req, res) {
   const startTs = new Date(startYMD + 'T00:00:00Z').getTime();
   const endTs = new Date(endYMD + 'T00:00:00Z').getTime();
 
-  // Prevent double-booking (reserved OR awaiting payment OR approved) for any selected item
-  // Query candidates by start range; then filter by overlap and item intersection
-  const candidateIds = await dbi.listReservationIdsByStartRange(startTs - 86400000, endTs + 86400000, 10000);
-  const candidates = await dbi.getReservations(candidateIds);
-  const wanted = new Set(itemIds);
-  const conflicts = [];
-  for (const r of candidates) {
-    if (!r) continue;
-    const status = r.status || 'pending';
-    if (!BLOCKING_STATUSES.has(status)) continue;
-    if (status === 'pending' && r.expiresAt && Number(r.expiresAt) <= Date.now()) continue;
-    if (!overlaps(startTs, endTs, Number(r.startTs), Number(r.endTs))) continue;
-    const rItemIds = (r.items || []).map(it => String(it.id));
-    const hit = rItemIds.filter(x => wanted.has(x));
-    if (hit.length) {
-      conflicts.push({ id: r.id, status, itemIds: hit, startYMD: r.startYMD, endYMD: r.endYMD });
-    }
-  }
-  if (conflicts.length) {
-    return res.status(409).json({
-      status: { code: 'conflict', message: 'Matériel déjà réservé ou en attente de paiement.' },
-      conflicts,
-    });
-  }
-
-  const settings = await getSettings();
-  const holdMinutes = Math.max(1, parseInt(settings.holdMinutes, 10) || 5);
-  const expiresAt = Date.now() + holdMinutes * 60 * 1000;
-
   const resv = {
     id,
     uid: String(uid),
@@ -211,7 +137,6 @@ async function createReservation(req, res) {
     totalCents,
     status: 'pending',
     createdAt: Date.now(),
-    expiresAt,
   };
   await dbi.saveReservation(resv);
 
@@ -222,7 +147,6 @@ module.exports = {
   getEvents,
   getCatalog,
   createReservation,
-  _sweepExpiredPending: sweepExpiredPending,
   _getCatalogItems: getCatalogItems,
   _catalogCache: () => catalogCache,
 };

package/lib/db.js

@@ -4,7 +4,6 @@ const db = require.main.require('./src/database');
 
 const KEYS = {
   Z_BY_START: 'calendar-onekite:reservations:byStart',
-  Z_BY_EXPIRES: 'calendar-onekite:reservations:byExpires',
   HASH: (id) => `calendar-onekite:reservation:${id}`,
   NEXT_ID: 'calendar-onekite:reservation:nextId',
 };
@@ -17,13 +16,6 @@ async function nextId() {
 async function saveReservation(resv) {
   await db.setObject(KEYS.HASH(resv.id), resv);
   await db.sortedSetAdd(KEYS.Z_BY_START, resv.startTs, resv.id);
-
-  // Track expiration for pending reservations
-  if (resv.expiresAt) {
-    await db.sortedSetAdd(KEYS.Z_BY_EXPIRES, Number(resv.expiresAt), resv.id);
-  } else {
-    await db.sortedSetRemove(KEYS.Z_BY_EXPIRES, resv.id);
-  }
 }
 
 async function getReservation(id) {
@@ -46,17 +38,6 @@ async function listReservationIdsByStartRange(startTs, endTs, limit = 2000) {
 async function deleteReservation(id) {
   await db.delete(KEYS.HASH(id));
   await db.sortedSetRemove(KEYS.Z_BY_START, id);
-  await db.sortedSetRemove(KEYS.Z_BY_EXPIRES, id);
-}
-
-async function listExpiredIds(nowTs, limit = 5000) {
-  // NodeBB db API: getSortedSetRangeByScore(set, start, stop, min, max)
-  const ids = await db.getSortedSetRangeByScore(KEYS.Z_BY_EXPIRES, 0, limit - 1, 0, nowTs);
-  return ids || [];
-}
-
-async function clearExpiryIndex(id) {
-  await db.sortedSetRemove(KEYS.Z_BY_EXPIRES, id);
 }
 
 async function listAllIds(limit=100000) {
@@ -71,7 +52,5 @@ module.exports = {
   getReservations,
   listReservationIdsByStartRange,
   deleteReservation,
-  listExpiredIds,
-  clearExpiryIndex,
   listAllIds,
 };

package/library.js

@@ -7,7 +7,6 @@ const api = require('./lib/api');
 const admin = require('./lib/admin');
 
 const Plugin = {};
-let sweeper = null;
 
 function isFn(fn) { return typeof fn === 'function'; }
 function safeMws(arr) { return (Array.isArray(arr) ? arr : []).filter(isFn); }
@@ -76,15 +75,6 @@ Plugin.init = async function (params) {
   router.get('/api/admin/plugins/calendar-onekite/pending', ...adminMws, admin.getPending);
   router.post('/api/admin/plugins/calendar-onekite/purge', ...adminMws, admin.purgeByYear);
   router.get('/api/admin/plugins/calendar-onekite/debug', ...adminMws, admin.debugHelloAsso);
-
-  // Background expiry sweeper: ensures pending holds are released even if nobody loads the calendar
-  if (!sweeper) {
-    sweeper = setInterval(() => {
-      api._sweepExpiredPending().catch(() => {});
-    }, 60 * 1000);
-    // do not keep the process alive just for the timer
-    if (typeof sweeper.unref === 'function') sweeper.unref();
-  }
 };
 
 Plugin.addAdminNavigation = async function (header) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.30",
+  "version": "11.1.31",
   "description": "Calendar reservations with HelloAsso integration for OneKite",
   "main": "library.js",
   "scripts": {},

package/lib/email.js

@@ -1,13 +0,0 @@
-'use strict';
-
-const emailer = require.main.require('./src/emailer');
-
-async function sendToUid(template, uid, data) {
-  try {
-    await emailer.send(template, uid, data);
-  } catch (e) {
-    // don't crash server
-  }
-}
-
-module.exports = { sendToUid };

package/lib/logic.js

@@ -1,120 +0,0 @@
-'use strict';
-
-const db = require('./db');
-const { getCatalogItems } = require('./helloasso');
-const settings = require('./settings');
-
-const BLOCKING_STATUSES = new Set(['pending', 'awaiting_payment', 'approved', 'paid']);
-
-function dateToTs(dateStr) {
-  // interpret as UTC midnight
-  return Date.parse(dateStr + 'T00:00:00.000Z');
-}
-function addDays(dateStr, days) {
-  const ts = dateToTs(dateStr) + days * 86400000;
-  const d = new Date(ts);
-  return d.toISOString().slice(0,10);
-}
-function overlap(aStart, aEnd, bStart, bEnd) {
-  return aStart < bEnd && bStart < aEnd;
-}
-
-async function sweepExpired(nowTs = Date.now()) {
-  const expiredIds = await db.listExpiredIds(nowTs);
-  for (const rid of expiredIds) {
-    const r = await db.getReservation(rid);
-    if (!r) continue;
-    if (r.status === 'pending' && r.expiresAt && r.expiresAt <= nowTs) {
-      r.status = 'expired';
-      r.expiresAt = 0;
-      await db.saveReservation(r);
-    } else {
-      // remove from expires index
-      r.expiresAt = 0;
-      await db.saveReservation(r);
-    }
-  }
-}
-
-async function listEvents(startDate, endDate) {
-  await sweepExpired();
-  const startTs = dateToTs(startDate);
-  const endTs = dateToTs(endDate);
-  const ids = await db.listReservationIdsByStartRange(startTs - 86400000*400, endTs); // wide window
-  const events = [];
-  for (const id of ids) {
-    const r = await db.getReservation(id);
-    if (!r) continue;
-    if (r.status === 'expired') continue;
-    if (overlap(dateToTs(r.startDate), dateToTs(r.endDate), startTs, endTs)) {
-      events.push(r);
-    }
-  }
-  return events;
-}
-
-async function computeTotal(itemIds, days) {
-  const { items } = await getCatalogItems();
-  const map = new Map(items.map(i => [i.id, i]));
-  let sum = 0;
-  for (const id of itemIds) {
-    const it = map.get(String(id));
-    if (it) sum += it.priceCents;
-  }
-  return sum * days;
-}
-
-async function checkConflicts(itemIds, startDate, endDate) {
-  const events = await listEvents(startDate, endDate);
-  const conflicts = [];
-  const wantSet = new Set(itemIds.map(String));
-  for (const r of events) {
-    if (!BLOCKING_STATUSES.has(r.status)) continue;
-    const has = (r.itemIds || []).some(x => wantSet.has(String(x)));
-    if (has && overlap(dateToTs(r.startDate), dateToTs(r.endDate), dateToTs(startDate), dateToTs(endDate))) {
-      conflicts.push({ rid: r.rid, status: r.status, startDate: r.startDate, endDate: r.endDate, itemIds: r.itemIds });
-    }
-  }
-  return conflicts;
-}
-
-async function createReservation(uid, itemIds, startDate, endDate, note='') {
-  await sweepExpired();
-  const s = await settings.get();
-  const holdMinutes = parseInt(s.holdMinutes, 10) || 5;
-
-  // normalize dates and days (end exclusive)
-  const startTs = dateToTs(startDate);
-  const endTs = dateToTs(endDate);
-  const days = Math.max(1, Math.round((endTs - startTs) / 86400000));
-  const conflicts = await checkConflicts(itemIds, startDate, endDate);
-  if (conflicts.length) {
-    const err = new Error('conflict');
-    err.code = 'conflict';
-    err.conflicts = conflicts;
-    throw err;
-  }
-  const totalCents = await computeTotal(itemIds, days);
-
-  const rid = await db.nextId();
-  const now = Date.now();
-  const expiresAt = now + holdMinutes * 60 * 1000;
-
-  const title = `${itemIds.length} matériel(s)`;
-  const resv = { rid, uid, itemIds: itemIds.map(String), startDate, endDate, startTs, endTs, status: 'pending', createdAt: now, expiresAt, days, totalCents, title, note };
-  await db.saveReservation(resv);
-  return resv;
-}
-
-async function setStatus(rid, status) {
-  const r = await db.getReservation(rid);
-  if (!r) return null;
-  r.status = status;
-  if (status !== 'pending') {
-    r.expiresAt = 0;
-  }
-  await db.saveReservation(r);
-  return r;
-}
-
-module.exports = { listEvents, createReservation, checkConflicts, sweepExpired, setStatus, dateToTs };

package/lib/mailer.js

@@ -1,78 +0,0 @@
-'use strict';
-
-const Emailer = (() => {
-  try { return require.main.require('./src/emailer'); } catch (e) { return null; }
-})();
-const User = (() => {
-  try { return require.main.require('./src/user'); } catch (e) { return null; }
-})();
-const Groups = (() => {
-  try { return require.main.require('./src/groups'); } catch (e) { return null; }
-})();
-const meta = (() => {
-  try { return require.main.require('./src/meta'); } catch (e) { return null; }
-})();
-
-const PLUGIN_ID = 'calendar-onekite';
-
-async function getGroupMemberUids(groupName) {
-  if (!Groups) return [];
-  if (typeof Groups.getMembers === 'function') {
-    return await Groups.getMembers(groupName, 0, -1);
-  }
-  if (typeof Groups.getMemberUsers === 'function') {
-    const users = await Groups.getMemberUsers(groupName, 0, 1000);
-    return users.map(u => u && u.uid).filter(Boolean);
-  }
-  return [];
-}
-
-async function getEmailsFromUids(uids) {
-  if (!User) return [];
-  const data = await User.getUsersFields(uids, ['email']);
-  return (data || []).map(u => u && u.email).filter(Boolean);
-}
-
-async function sendEmailToEmails(template, emails, data) {
-  if (!Emailer || !emails.length) return { ok: false, skipped: true };
-  // Try different APIs depending on NodeBB version
-  try {
-    if (typeof Emailer.sendToEmail === 'function') {
-      for (const email of emails) {
-        // eslint-disable-next-line no-await-in-loop
-        await Emailer.sendToEmail(template, email, data);
-      }
-      return { ok: true };
-    }
-    if (typeof Emailer.send === 'function') {
-      for (const email of emails) {
-        // eslint-disable-next-line no-await-in-loop
-        await Emailer.send(template, email, data);
-      }
-      return { ok: true };
-    }
-  } catch (e) {
-    return { ok: false, error: e.message };
-  }
-  return { ok: false, error: 'Emailer API not found' };
-}
-
-async function notifyGroups(template, groupsCsv, data) {
-  const groups = String(groupsCsv || '').split(',').map(s => s.trim()).filter(Boolean);
-  const allUids = [];
-  for (const g of groups) {
-    // eslint-disable-next-line no-await-in-loop
-    const uids = await getGroupMemberUids(g);
-    allUids.push(...uids);
-  }
-  const uniq = Array.from(new Set(allUids.map(String))).map(Number).filter(n => n > 0);
-  const emails = await getEmailsFromUids(uniq);
-  return await sendEmailToEmails(template, emails, data);
-}
-
-async function notifyUser(template, uid, data) {
-  const emails = await getEmailsFromUids([uid]);
-  return await sendEmailToEmails(template, emails, data);
-}
-
-module.exports = { notifyGroups, notifyUser };

package/lib/middlewares.js

@@ -1,69 +0,0 @@
-'use strict';
-
-const Groups = (() => {
-  try { return require.main.require('./src/groups'); } catch (e) { return null; }
-})();
-const meta = (() => {
-  try { return require.main.require('./src/meta'); } catch (e) { return null; }
-})();
-
-const PLUGIN_ID = 'calendar-onekite';
-
-function safeMiddlewares(mws) {
-  return (Array.isArray(mws) ? mws : []).filter(fn => typeof fn === 'function');
-}
-
-function ensureLoggedIn(req, res, next) {
-  if (req && req.uid && Number(req.uid) > 0) return next();
-  res.status(401).json({ ok: false, error: 'not-logged-in' });
-}
-
-async function isInAnyGroup(uid, groupsCsv) {
-  if (!Groups || !uid || uid <= 0) return false;
-  const groups = String(groupsCsv || '').split(',').map(s => s.trim()).filter(Boolean);
-  if (!groups.length) return false;
-  for (const g of groups) {
-    // Groups.isMember(uid, groupName)
-    if (typeof Groups.isMember === 'function') {
-      // eslint-disable-next-line no-await-in-loop
-      const ok = await Groups.isMember(uid, g);
-      if (ok) return true;
-    }
-  }
-  return false;
-}
-
-async function ensureAdminGroup(req, res, next) {
-  try {
-    const uid = Number(req.uid) || 0;
-    if (uid <= 0) return res.status(401).json({ ok: false, error: 'not-logged-in' });
-    // Default: administrators group
-    const ok = await isInAnyGroup(uid, 'administrators');
-    if (ok) return next();
-    return res.status(403).json({ ok: false, error: 'not-authorized' });
-  } catch (e) {
-    return res.status(500).json({ ok: false, error: 'internal-error' });
-  }
-}
-
-async function ensureValidatorGroup(req, res, next) {
-  try {
-    const uid = Number(req.uid) || 0;
-    if (uid <= 0) return res.status(401).json({ ok: false, error: 'not-logged-in' });
-    const settings = meta ? await meta.settings.get(PLUGIN_ID) : {};
-    const groupsCsv = settings && settings.validatorGroups ? settings.validatorGroups : 'administrators';
-    const ok = await isInAnyGroup(uid, groupsCsv) || await isInAnyGroup(uid, 'administrators');
-    if (ok) return next();
-    return res.status(403).json({ ok: false, error: 'not-validator' });
-  } catch (e) {
-    return res.status(500).json({ ok: false, error: 'internal-error' });
-  }
-}
-
-module.exports = {
-  safeMiddlewares,
-  ensureLoggedIn,
-  ensureAdminGroup,
-  ensureValidatorGroup,
-  isInAnyGroup,
-};

package/lib/perms.js

@@ -1,44 +0,0 @@
-'use strict';
-
-const Groups = require.main.require('./src/groups');
-const settings = require('./settings');
-
-async function isInAnyGroup(uid, groups) {
-  if (!uid || uid <= 0) return false;
-  for (const g of groups) {
-    try {
-      const ok = await Groups.isMember(uid, g);
-      if (ok) return true;
-    } catch {}
-  }
-  return false;
-}
-
-async function canCreate(uid) {
-  const s = await settings.get();
-  const groups = settings.splitCsv(s.creatorGroups);
-  if (!groups.length) return !!uid;
-  return await isInAnyGroup(uid, groups);
-}
-
-async function canValidate(uid) {
-  const s = await settings.get();
-  const groups = settings.splitCsv(s.validatorGroups);
-  if (!groups.length) return false;
-  return await isInAnyGroup(uid, groups);
-}
-
-async function listNotifyUids() {
-  const s = await settings.get();
-  const groups = settings.splitCsv(s.notifyGroups);
-  const uids = new Set();
-  for (const g of groups) {
-    try {
-      const members = await Groups.getMembers(g, 0, -1);
-      (members || []).forEach(uid => uids.add(parseInt(uid, 10)));
-    } catch {}
-  }
-  return [...uids].filter(n => Number.isFinite(n) && n > 0);
-}
-
-module.exports = { canCreate, canValidate, listNotifyUids };

package/lib/settings.js

@@ -1,18 +0,0 @@
-'use strict';
-const meta = require.main.require('./src/meta');
-const PLUGIN_ID = 'calendar-onekite';
-
-async function get() {
-  const s = await meta.settings.get(PLUGIN_ID);
-  return s || {};
-}
-
-function normalizeCsv(v) {
-  return String(v || '').split(',').map(s => s.trim()).filter(Boolean).join(',');
-}
-function splitCsv(v) {
-  const n = normalizeCsv(v);
-  return n ? n.split(',') : [];
-}
-
-module.exports = { PLUGIN_ID, get, normalizeCsv, splitCsv };

package/lib/store.js

@@ -1,209 +0,0 @@
-'use strict';
-
-const db = require.main.require('./src/database');
-
-const KEY_NEXT = 'onekite:cal:nextRid';
-const KEY_HASH = (rid) => `onekite:cal:r:${rid}`;
-const KEY_Z_START = 'onekite:cal:z:start';
-const KEY_Z_STATUS = (status) => `onekite:cal:z:status:${status}`;
-const KEY_Z_EXPIRES = 'onekite:cal:z:expires';
-
-function toDayString(ms) {
-  return new Date(ms).toISOString().slice(0, 10);
-}
-
-async function nextRid() {
-  const v = await db.incrObjectField('global', KEY_NEXT);
-  return String(v);
-}
-
-async function setReservation(rid, data) {
-  await db.setObject(KEY_HASH(rid), data);
-}
-
-async function getReservation(rid) {
-  const obj = await db.getObject(KEY_HASH(rid));
-  if (!obj || !obj.rid) return null;
-  // parse
-  obj.startMs = parseInt(obj.startMs, 10);
-  obj.endMs = parseInt(obj.endMs, 10);
-  obj.uid = parseInt(obj.uid, 10);
-  obj.expiresAt = parseInt(obj.expiresAt || '0', 10);
-  obj.days = parseInt(obj.days || '0', 10);
-  obj.totalCents = parseInt(obj.totalCents || '0', 10);
-  try { obj.itemIds = JSON.parse(obj.itemIds || '[]'); } catch (e) { obj.itemIds = []; }
-  return obj;
-}
-
-async function indexReservation(rid, r) {
-  await db.sortedSetAdd(KEY_Z_START, r.startMs, rid);
-  await db.sortedSetAdd(KEY_Z_STATUS(r.status), r.startMs, rid);
-  if (r.expiresAt && r.expiresAt > 0) {
-    await db.sortedSetAdd(KEY_Z_EXPIRES, r.expiresAt, rid);
-  }
-}
-
-async function deindexStatus(rid, oldStatus) {
-  await db.sortedSetRemove(KEY_Z_STATUS(oldStatus), rid);
-}
-
-async function updateStatusIndex(rid, oldStatus, newStatus, startMs) {
-  if (oldStatus) await deindexStatus(rid, oldStatus);
-  await db.sortedSetAdd(KEY_Z_STATUS(newStatus), startMs, rid);
-}
-
-async function removeExpireIndex(rid) {
-  await db.sortedSetRemove(KEY_Z_EXPIRES, rid);
-}
-
-async function createReservation(input) {
-  const rid = await nextRid();
-  const r = {
-    rid,
-    uid: input.uid,
-    startMs: input.startMs,
-    endMs: input.endMs,
-    status: input.status,
-    expiresAt: input.expiresAt || 0,
-    days: input.days || 0,
-    totalCents: input.totalCents || 0,
-    itemIds: JSON.stringify(input.itemIds || []),
-  };
-  await setReservation(rid, r);
-  await indexReservation(rid, r);
-  return rid;
-}
-
-async function updateReservation(rid, patch) {
-  const existing = await getReservation(rid);
-  if (!existing) return null;
-  const updated = Object.assign({}, existing, patch);
-  // indexes
-  if (patch.status && patch.status !== existing.status) {
-    await updateStatusIndex(rid, existing.status, patch.status, existing.startMs);
-  }
-  if (typeof patch.expiresAt !== 'undefined') {
-    await removeExpireIndex(rid);
-    if (patch.expiresAt && patch.expiresAt > 0) {
-      await db.sortedSetAdd(KEY_Z_EXPIRES, patch.expiresAt, rid);
-    }
-  }
-  // persist
-  const obj = Object.assign({}, updated, {
-    itemIds: JSON.stringify(updated.itemIds || existing.itemIds || []),
-  });
-  await setReservation(rid, obj);
-  return updated;
-}
-
-async function listByStatus(status, start, stop) {
-  const ids = await db.getSortedSetRange(KEY_Z_STATUS(status), start, stop);
-  const out = [];
-  for (const rid of ids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await getReservation(rid);
-    if (r) out.push(r);
-  }
-  return out;
-}
-
-function overlaps(aStart, aEnd, bStart, bEnd) {
-  return aStart < bEnd && bStart < aEnd;
-}
-
-async function checkConflicts(itemIds, startMs, endMs, blockingStatuses) {
-  // candidates: reservations with start <= endMs
-  const ids = await db.getSortedSetRangeByScore(KEY_Z_START, 0, 2000, 0, endMs);
-  const conflicts = [];
-  for (const rid of ids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await getReservation(rid);
-    if (!r) continue;
-    if (!blockingStatuses.has(r.status)) continue;
-    if (!overlaps(startMs, endMs, r.startMs, r.endMs)) continue;
-    const set = new Set(r.itemIds || []);
-    const hit = itemIds.filter(id => set.has(String(id)));
-    if (hit.length) conflicts.push({ rid, status: r.status, itemIds: hit, start: toDayString(r.startMs), end: toDayString(r.endMs) });
-  }
-  return conflicts;
-}
-
-async function getEventsInRange(startMs, endMs) {
-  const ids = await db.getSortedSetRangeByScore(KEY_Z_START, 0, 2000, startMs - 365*24*3600*1000, endMs);
-  const events = [];
-  for (const rid of ids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await getReservation(rid);
-    if (!r) continue;
-    if (!overlaps(startMs, endMs, r.startMs, r.endMs)) continue;
-    const icon = r.status === 'pending' ? '⏳' : (r.status === 'refused' ? '⛔' : (r.status === 'awaiting_payment' ? '💳' : '✅'));
-    const title = `${icon} #${r.rid}`;
-    events.push({
-      id: r.rid,
-      title,
-      start: toDayString(r.startMs),
-      end: toDayString(r.endMs),
-      allDay: true,
-      extendedProps: {
-        status: r.status,
-        itemIds: r.itemIds || [],
-        uid: r.uid,
-        days: r.days,
-        totalCents: r.totalCents,
-      },
-    });
-  }
-  return events;
-}
-
-async function sweepExpired() {
-  const now = Date.now();
-  const ids = await db.getSortedSetRangeByScore(KEY_Z_EXPIRES, 0, 500, 0, now);
-  for (const rid of ids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await getReservation(rid);
-    if (!r) {
-      // eslint-disable-next-line no-await-in-loop
-      await removeExpireIndex(rid);
-      continue;
-    }
-    if (r.status === 'pending' && r.expiresAt && r.expiresAt <= now) {
-      // eslint-disable-next-line no-await-in-loop
-      await updateReservation(rid, { status: 'expired', expiresAt: 0 });
-    } else {
-      // eslint-disable-next-line no-await-in-loop
-      await removeExpireIndex(rid);
-    }
-  }
-}
-
-async function purgeRange(startMs, endMs) {
-  const ids = await db.getSortedSetRangeByScore(KEY_Z_START, 0, 100000, startMs, endMs);
-  let count = 0;
-  for (const rid of ids) {
-    // eslint-disable-next-line no-await-in-loop
-    const r = await getReservation(rid);
-    if (!r) continue;
-    // eslint-disable-next-line no-await-in-loop
-    await db.delete(KEY_HASH(rid));
-    // eslint-disable-next-line no-await-in-loop
-    await db.sortedSetRemove(KEY_Z_START, rid);
-    // eslint-disable-next-line no-await-in-loop
-    await db.sortedSetRemove(KEY_Z_STATUS(r.status), rid);
-    // eslint-disable-next-line no-await-in-loop
-    await db.sortedSetRemove(KEY_Z_EXPIRES, rid);
-    count++;
-  }
-  return count;
-}
-
-module.exports = {
-  createReservation,
-  getReservation,
-  updateReservation,
-  listByStatus,
-  getEventsInRange,
-  sweepExpired,
-  purgeRange,
-  checkConflicts,
-};

package/lib/sweeper.js

@@ -1,16 +0,0 @@
-'use strict';
-const logic = require('./logic');
-
-let started = false;
-let timer = null;
-
-function start() {
-  if (started) return;
-  started = true;
-  timer = setInterval(() => {
-    logic.sweepExpired().catch(() => {});
-  }, 60 * 1000);
-  if (timer.unref) timer.unref();
-}
-
-module.exports = { start };

package/templates/emails/calendar-onekite-approved.tpl

@@ -1 +0,0 @@
-Votre réservation #{rid} du {startDate} au {endDate} a été validée.

package/templates/emails/calendar-onekite-pending.tpl

@@ -1 +0,0 @@
-Nouvelle demande de réservation #{rid} du {startDate} au {endDate} par {username}

package/templates/emails/calendar-onekite-refused.tpl

@@ -1 +0,0 @@
-Votre réservation #{rid} du {startDate} au {endDate} a été refusée.