@bobfrankston/rmfmail 1.2.315 → 1.2.317

package/client/app.bundle.js

@@ -106,6 +106,7 @@ __export(api_client_exports, {
   reauthGoogleScopes: () => reauthGoogleScopes,
   reauthenticate: () => reauthenticate,
   recordSpamReport: () => recordSpamReport,
+  refreshCalendarNow: () => refreshCalendarNow,
   registerMailto: () => registerMailto,
   removeUserDictWord: () => removeUserDictWord,
   renameFolder: () => renameFolder,
@@ -259,6 +260,9 @@ function getPrimaryAccount(feature) {
 function getCalendarEvents(fromMs, toMs) {
   return ipc().getCalendarEvents?.(fromMs, toMs) ?? Promise.resolve([]);
 }
+function refreshCalendarNow() {
+  return ipc().refreshCalendarNow?.() ?? Promise.resolve({ ok: false, reason: "not available" });
+}
 function getCalendars() {
   return ipc().getCalendars?.() ?? Promise.resolve([]);
 }
@@ -6664,6 +6668,22 @@ __export(calendar_sidebar_exports, {
   isCalendarSidebarOn: () => isCalendarSidebarOn,
   showCalendarSidebar: () => showCalendarSidebar
 });
+function followToday() {
+  if (viewPinned)
+    return;
+  const t = /* @__PURE__ */ new Date();
+  viewYear = t.getFullYear();
+  viewMonth = t.getMonth();
+  viewDay = t.getDate();
+}
+function armMidnightRollover() {
+  const now = /* @__PURE__ */ new Date();
+  const next = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1, 0, 0, 5);
+  window.setTimeout(() => {
+    void refresh();
+    armMidnightRollover();
+  }, next.getTime() - now.getTime());
+}
 function calendarKind(id, primary) {
   if (primary)
     return "personal";
@@ -6743,7 +6763,7 @@ async function renderCalendarList() {
       host.innerHTML = "";
     } else {
       const sorted = [...list].sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
-      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml6(c.name)}">
+      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml6(c.name)} \u2014 untick to hide its events in this list. Which calendars are listed is set in Google Calendar: the ones selected there appear; use Refresh after changing it.">
                 <input type="checkbox" class="cal-side-cal-check" data-cal-id="${escapeHtml6(c.id)}" ${hiddenCalendars.has(c.id) ? "" : "checked"}>
                 ${calIconHtml(c)}
                 <span class="cal-side-cal-name">${escapeHtml6(c.name)}</span>
@@ -6952,7 +6972,7 @@ function renderEvents(events) {
                 <span class="cal-side-event-title cal-side-event-holiday-title" title="${escapeHtml6(e.title)}">${calIconHtml(info)} ${escapeHtml6(e.title)}</span>
             </div>`;
     } else {
-      const titleAttr = link ? 'title="Click to open in Google Calendar"' : "";
+      const titleAttr = link ? 'title="Click to open in Google Calendar to edit it. Right-click for more."' : 'title="Saved in rmfmail, syncing to Google \u2014 it can be opened there once it has synced. Right-click to delete."';
       html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} data-link="${escapeHtml6(link)}" ${titleAttr}>
                 ${calIconHtml(info)}
                 <span class="cal-side-event-time">${escapeHtml6(formatTime(e))}</span>
@@ -6997,18 +7017,43 @@ function renderEvents(events) {
     el.addEventListener("contextmenu", (e) => {
       e.preventDefault();
       const link = el.dataset.link;
+      const uuid = el.dataset.id || "";
+      const title = el.querySelector(".cal-side-event-title")?.textContent?.trim() || "this event";
       const items = [];
       if (link)
         items.push({
-          label: "View in browser",
+          label: `Edit "${title}" in Google Calendar`,
           action: () => openInBrowser(link)
         });
       items.push({
         label: "Open Google Calendar",
         action: () => openInBrowser("https://calendar.google.com/")
       });
-      if (items.length > 0)
-        showContextMenu(e.clientX, e.clientY, items, { editTarget: e.target });
+      if (uuid) {
+        items.push({ label: "", action: () => {
+        }, separator: true });
+        items.push({
+          label: `Delete "${title}"`,
+          tooltip: "Removes it from your calendar in rmfmail now and from Google when it syncs.",
+          action: async () => {
+            if (!await confirmAt(e.clientX, e.clientY, `Delete "${title}"`))
+              return;
+            try {
+              await deleteCalendarEvent(uuid);
+              const st = document.getElementById("status-sync");
+              if (st)
+                st.textContent = `Deleted event: ${title}`;
+              await refresh();
+            } catch (err) {
+              const st = document.getElementById("status-sync");
+              if (st)
+                st.textContent = `Couldn't delete "${title}": ${err?.message || err}`;
+              console.error("[calendar] delete failed:", err);
+            }
+          }
+        });
+      }
+      showContextMenu(e.clientX, e.clientY, items, { editTarget: e.target });
     });
   });
 }
@@ -7108,6 +7153,7 @@ async function renderTasks(prefetched) {
   });
 }
 async function refresh() {
+  followToday();
   renderHead();
   const from = new Date(viewYear, viewMonth, viewDay);
   let prefetchedTasks;
@@ -7141,7 +7187,7 @@ function openNewEventDialog() {
   heading.textContent = "New event";
   const hint = document.createElement("div");
   hint.style.cssText = "font-size:0.9em;color:var(--color-text-muted);";
-  hint.textContent = "Describe the event in plain English \u2014 AI extracts the details and opens Google Calendar to confirm.";
+  hint.textContent = "Describe the event in plain English \u2014 AI extracts the details and saves it to your calendar. Edit it afterwards if it needs adjusting.";
   const ta = document.createElement("textarea");
   ta.style.cssText = "width:100%;min-height:120px;font:inherit;padding:8px;border-radius:4px;border:1px solid var(--color-border, #ccc);box-sizing:border-box;resize:vertical;";
   ta.placeholder = "Lunch with John tomorrow at noon at Joe's Pizza";
@@ -7212,54 +7258,60 @@ function openNewEventDialog() {
         return;
       }
     }
-    const api = window.mailxapi;
     const targets = events.length ? events : [null];
+    const saved = [];
     for (const ev of targets) {
-      const url = buildGoogleEventUrl(ev, text);
-      if (api?.openExternal)
-        api.openExternal(url);
-      else
-        window.open(url, "_blank");
+      const row = eventToLocalRow(ev, text);
+      try {
+        await createCalendarEvent(row);
+        saved.push(row.title);
+      } catch (e) {
+        status.textContent = `Couldn't save "${row.title}": ${e?.message || e}`;
+        createBtn.disabled = false;
+        cancelBtn.disabled = false;
+        return;
+      }
     }
     close();
+    const st = document.getElementById("status-sync");
+    if (st)
+      st.textContent = saved.length === 1 ? `Saved event: ${saved[0]}` : `Saved ${saved.length} events: ${saved.join("; ")}`;
+    await refresh();
   });
 }
-function buildGoogleEventUrl(event, fallbackText) {
-  const base = "https://calendar.google.com/calendar/render?action=TEMPLATE";
-  const params = [];
-  const fmt = (iso) => {
-    const m = iso.match(/(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2}))?)?/);
-    if (!m)
-      return "";
-    const [, y, mo, d, hh, mm, ss] = m;
-    const date = `${y}${mo}${d}`;
-    if (!hh)
-      return date;
-    return `${date}T${hh}${mm}${ss || "00"}`;
-  };
-  if (event?.title)
-    params.push(`text=${encodeURIComponent(event.title)}`);
+function eventToLocalRow(event, fallbackText) {
+  const startOfToday = /* @__PURE__ */ new Date();
+  startOfToday.setHours(0, 0, 0, 0);
+  if (!event?.startISO) {
+    return { title: (event?.title || fallbackText).slice(0, 200), startMs: startOfToday.getTime(), endMs: startOfToday.getTime() + 864e5, allDay: true };
+  }
+  const allDay = !!event.allDay || !event.startISO.includes("T");
+  const startMs = allDay ? (/* @__PURE__ */ new Date(event.startISO.slice(0, 10) + "T00:00:00")).getTime() : wallClockToMs(event.startISO, event.timeZone);
+  let endMs;
+  if (event.endISO)
+    endMs = allDay ? (/* @__PURE__ */ new Date(event.endISO.slice(0, 10) + "T00:00:00")).getTime() : wallClockToMs(event.endISO, event.timeZone);
   else
-    params.push(`text=${encodeURIComponent(fallbackText.slice(0, 200))}`);
-  if (event?.startISO) {
-    const startFmt = fmt(event.startISO);
-    if (event.allDay) {
-      const startDate = /* @__PURE__ */ new Date(event.startISO + (event.startISO.includes("T") ? "" : "T00:00:00"));
-      const endDate = new Date(startDate.getTime() + 864e5);
-      const endFmt = `${endDate.getFullYear()}${String(endDate.getMonth() + 1).padStart(2, "0")}${String(endDate.getDate()).padStart(2, "0")}`;
-      params.push(`dates=${startFmt}/${endFmt}`);
-    } else {
-      const endFmt = event.endISO ? fmt(event.endISO) : fmt(new Date(new Date(event.startISO).getTime() + 36e5).toISOString().slice(0, 19));
-      params.push(`dates=${startFmt}/${endFmt}`);
+    endMs = startMs + (allDay ? 864e5 : 36e5);
+  if (allDay && endMs <= startMs)
+    endMs = startMs + 864e5;
+  return { title: event.title || fallbackText.slice(0, 200), startMs, endMs, allDay, location: event.location || void 0, notes: event.notes || void 0 };
+}
+function wallClockToMs(iso, timeZone) {
+  const local = new Date(iso).getTime();
+  if (!timeZone)
+    return local;
+  try {
+    let ms = local;
+    for (let i = 0; i < 2; i++) {
+      const parts = new Intl.DateTimeFormat("en-US", { timeZone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit" }).formatToParts(new Date(ms)).reduce((o, p) => (o[p.type] = p.value, o), {});
+      const asIfLocal = (/* @__PURE__ */ new Date(`${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}:${parts.second}`)).getTime();
+      ms += local - asIfLocal;
     }
+    return ms;
+  } catch (e) {
+    console.warn(`[calendar] unknown time zone "${timeZone}", reading the time as local:`, e?.message || e);
+    return local;
   }
-  if (event?.location)
-    params.push(`location=${encodeURIComponent(event.location)}`);
-  if (event?.notes)
-    params.push(`details=${encodeURIComponent(event.notes)}`);
-  if (event?.timeZone)
-    params.push(`ctz=${encodeURIComponent(event.timeZone)}`);
-  return `${base}&${params.join("&")}`;
 }
 async function showCalendarSidebar() {
   const el = document.getElementById("calendar-sidebar");
@@ -7303,6 +7355,7 @@ function initCalendarSidebar() {
     el.addEventListener("click", fn);
   };
   wireOnce("cal-side-prev", () => {
+    viewPinned = true;
     const d = new Date(viewYear, viewMonth, viewDay - 1);
     viewYear = d.getFullYear();
     viewMonth = d.getMonth();
@@ -7310,6 +7363,7 @@ function initCalendarSidebar() {
     refresh();
   });
   wireOnce("cal-side-next", () => {
+    viewPinned = true;
     const d = new Date(viewYear, viewMonth, viewDay + 1);
     viewYear = d.getFullYear();
     viewMonth = d.getMonth();
@@ -7317,12 +7371,22 @@ function initCalendarSidebar() {
     refresh();
   });
   wireOnce("cal-side-today", () => {
-    const t = /* @__PURE__ */ new Date();
-    viewYear = t.getFullYear();
-    viewMonth = t.getMonth();
-    viewDay = t.getDate();
+    viewPinned = false;
+    followToday();
     refresh();
   });
+  if (!window.__mailxCalRolloverArmed) {
+    window.__mailxCalRolloverArmed = true;
+    armMidnightRollover();
+    window.addEventListener("focus", () => {
+      if (!isCalendarSidebarOn())
+        return;
+      void refreshCalendarNow().then((r) => {
+        if (!r?.ok && r?.reason && !/refreshed \d+ s ago/.test(r.reason))
+          console.log(`[calendar] focus refresh not started: ${r.reason}`);
+      }).catch((e) => console.warn("[calendar] focus refresh failed:", e?.message || e));
+    });
+  }
   wireOnce("cal-side-new", () => {
     openNewEventDialog();
   });
@@ -7357,7 +7421,12 @@ function initCalendarSidebar() {
     if (btn)
       btn.disabled = true;
     try {
-      await Promise.all([renderCalendarList(), refresh()]);
+      const [, , pulled] = await Promise.all([renderCalendarList(), refresh(), refreshCalendarNow()]);
+      if (!pulled?.ok) {
+        const st = document.getElementById("status-sync");
+        if (st)
+          st.textContent = `Calendar not pulled from Google: ${pulled?.reason || "unknown"}`;
+      }
     } finally {
       setTimeout(() => {
         btn?.classList.remove("cal-side-refreshing");
@@ -7451,7 +7520,7 @@ function initCalendarSidebar() {
     }
   }
 }
-var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE;
+var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, viewPinned, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE;
 var init_calendar_sidebar = __esm({
   "client/components/calendar-sidebar.js"() {
     "use strict";
@@ -7466,6 +7535,7 @@ var init_calendar_sidebar = __esm({
     viewYear = (/* @__PURE__ */ new Date()).getFullYear();
     viewMonth = (/* @__PURE__ */ new Date()).getMonth();
     viewDay = (/* @__PURE__ */ new Date()).getDate();
+    viewPinned = false;
     lastEvents = [];
     lastOverdueTasks = [];
     calById = /* @__PURE__ */ new Map();
@@ -9643,6 +9713,9 @@ window.__btick && window.__btick("app.ts module body executing");
   }, true);
   document.addEventListener("contextmenu", (e) => {
     if (e.defaultPrevented) return;
+    const t = e.target;
+    const tag = t?.tagName;
+    if (tag === "TEXTAREA" || tag === "INPUT" && !["checkbox", "radio", "button", "submit", "range", "color", "file"].includes(t.type)) return;
     e.preventDefault();
     const items = editMenuItems({ target: e.target });
     if (items.length > 0) showContextMenu(e.clientX, e.clientY, items);