@bobfrankston/mailx 1.0.440 → 1.0.441

package/client/components/calendar-sidebar.js

@@ -99,9 +99,63 @@ function renderEvents(events) {
     const today = new Date();
     today.setHours(0, 0, 0, 0);
     const tomorrow = new Date(today.getTime() + 86400_000);
-    let lastDayKey = "";
+    // Daily-recurring detection: group expanded instances by recurringEventId,
+    // pull out series that fire (roughly) every day at the same time of day,
+    // and render them once at the top instead of cluttering each per-day
+    // section. "Daily" = same recurringEventId + same H:MM + appears on at
+    // least 80% of the days in the rendered horizon (allows for the
+    // occasional skipped day without losing the grouping).
+    const horizonDays = getHorizonDays();
+    const dailyThreshold = Math.max(2, Math.floor(horizonDays * 0.8));
+    const byRecurId = new Map();
+    for (const e of events) {
+        if (!e.recurringEventId)
+            continue;
+        let arr = byRecurId.get(e.recurringEventId);
+        if (!arr) {
+            arr = [];
+            byRecurId.set(e.recurringEventId, arr);
+        }
+        arr.push(e);
+    }
+    const dailyKeys = new Set();
+    const dailyHeads = [];
+    for (const [recId, instances] of byRecurId) {
+        if (instances.length < dailyThreshold)
+            continue;
+        // Same time-of-day across all instances?
+        const hm = (e) => {
+            if (e.allDay)
+                return "all";
+            const d = new Date(e.start);
+            return `${d.getHours()}:${d.getMinutes()}`;
+        };
+        const firstHm = hm(instances[0]);
+        const allSameTime = instances.every(e => hm(e) === firstHm);
+        if (!allSameTime)
+            continue;
+        dailyKeys.add(recId);
+        // Use the earliest instance as the "head" entry (its htmlLink is
+        // identical across instances of the same series).
+        dailyHeads.push(instances.reduce((a, b) => a.start < b.start ? a : b));
+    }
     let html = "";
+    if (dailyHeads.length > 0) {
+        html += `<div class="cal-side-day cal-side-day-daily">Daily</div>`;
+        for (const e of dailyHeads) {
+            const link = e.htmlLink || "";
+            html += `<div class="cal-side-event" data-id="${e.id}" data-link="${escapeHtml(link)}" ${link ? 'title="Click to open in Google Calendar"' : ""}>
+                <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
+                <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
+                <span class="cal-side-event-title">${escapeHtml(e.title)}<span class="cal-side-event-recur" title="Daily">↻</span></span>
+            </div>`;
+        }
+    }
+    let lastDayKey = "";
     for (const e of events) {
+        // Filter out daily-grouped instances — they're shown once at top.
+        if (e.recurringEventId && dailyKeys.has(e.recurringEventId))
+            continue;
         const d = new Date(e.start);
         const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
         if (dayKey !== lastDayKey) {
@@ -320,6 +374,26 @@ export function initCalendarSidebar() {
             }, 600);
         }
     });
+    // Manual events refresh — same pattern as tasks. fetchUpcoming hits the
+    // service which kicks a Google pull under the hood.
+    wireOnce("cal-side-refresh-events", async () => {
+        const btn = document.getElementById("cal-side-refresh-events");
+        if (btn?.classList.contains("cal-side-refreshing"))
+            return;
+        btn?.classList.add("cal-side-refreshing");
+        if (btn)
+            btn.disabled = true;
+        try {
+            await refresh();
+        }
+        finally {
+            setTimeout(() => {
+                btn?.classList.remove("cal-side-refreshing");
+                if (btn)
+                    btn.disabled = false;
+            }, 600);
+        }
+    });
     const showDoneCb = document.getElementById("cal-side-show-done");
     if (showDoneCb && !showDoneCb.__wired) {
         showDoneCb.__wired = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.440",
+  "version": "1.0.441",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -36,7 +36,7 @@
     "@bobfrankston/iflow-node": "^0.1.8",
     "@bobfrankston/miscinfo": "^1.0.10",
     "@bobfrankston/oauthsupport": "^1.0.25",
-    "@bobfrankston/msger": "^0.1.363",
+    "@bobfrankston/msger": "^0.1.364",
     "@bobfrankston/mailx-host": "^0.1.8",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
@@ -100,7 +100,7 @@
       "@bobfrankston/iflow-node": "^0.1.8",
       "@bobfrankston/miscinfo": "^1.0.10",
       "@bobfrankston/oauthsupport": "^1.0.25",
-      "@bobfrankston/msger": "^0.1.363",
+      "@bobfrankston/msger": "^0.1.364",
       "@bobfrankston/mailx-host": "^0.1.8",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",