@bobfrankston/rmfmail 1.2.314 → 1.2.316

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([]);
 }
@@ -7214,19 +7218,57 @@ function openNewEventDialog() {
     }
     const api = window.mailxapi;
     const targets = events.length ? events : [null];
+    let authuser = "";
+    try {
+      authuser = String((await getPrimaryAccount("calendar"))?.email || "");
+    } catch (e) {
+      console.warn("[calendar] primary account lookup failed, opening without authuser:", e?.message || e);
+    }
     for (const ev of targets) {
-      const url = buildGoogleEventUrl(ev, text);
+      const url = buildGoogleEventUrl(ev, text, authuser);
       if (api?.openExternal)
         api.openExternal(url);
       else
         window.open(url, "_blank");
     }
+    armPostCreateRefresh();
     close();
   });
 }
-function buildGoogleEventUrl(event, fallbackText) {
+function armPostCreateRefresh() {
+  disarmPostCreateRefresh();
+  const pull = async (why) => {
+    try {
+      const r = await refreshCalendarNow();
+      if (!r?.ok)
+        console.log(`[calendar] post-create refresh (${why}) not started: ${r?.reason || "unknown"}`);
+    } catch (e) {
+      console.warn(`[calendar] post-create refresh (${why}) failed:`, e?.message || e);
+    }
+  };
+  postCreateFocusHandler = () => {
+    void pull("window focus");
+  };
+  window.addEventListener("focus", postCreateFocusHandler);
+  postCreateTimers = POST_CREATE_REFRESH_DELAYS_MS.map((ms, i) => window.setTimeout(() => {
+    void pull(`${ms / 1e3} s after create`);
+    if (i === POST_CREATE_REFRESH_DELAYS_MS.length - 1)
+      disarmPostCreateRefresh();
+  }, ms));
+}
+function disarmPostCreateRefresh() {
+  for (const t of postCreateTimers)
+    window.clearTimeout(t);
+  postCreateTimers = [];
+  if (postCreateFocusHandler)
+    window.removeEventListener("focus", postCreateFocusHandler);
+  postCreateFocusHandler = null;
+}
+function buildGoogleEventUrl(event, fallbackText, authuser = "") {
   const base = "https://calendar.google.com/calendar/render?action=TEMPLATE";
   const params = [];
+  if (authuser)
+    params.push(`authuser=${encodeURIComponent(authuser)}`);
   const fmt = (iso) => {
     const m = iso.match(/(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2}))?)?/);
     if (!m)
@@ -7451,7 +7493,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, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE, POST_CREATE_REFRESH_DELAYS_MS, postCreateTimers, postCreateFocusHandler;
 var init_calendar_sidebar = __esm({
   "client/components/calendar-sidebar.js"() {
     "use strict";
@@ -7473,6 +7515,9 @@ var init_calendar_sidebar = __esm({
     hiddenCalendars = /* @__PURE__ */ new Set();
     selectedTaskUuids = /* @__PURE__ */ new Set();
     TASK_DELETE_NOTE = "Removes it from Google Tasks. To mark it done instead, use the checkbox.";
+    POST_CREATE_REFRESH_DELAYS_MS = [45e3, 12e4, 3e5];
+    postCreateTimers = [];
+    postCreateFocusHandler = null;
   }
 });
 
@@ -9643,6 +9688,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);