@bobfrankston/rmfmail 1.0.670 → 1.0.672

package/client/app.bundle.js

@@ -3447,7 +3447,8 @@ async function fetchUpcoming(from) {
     source: r.providerId ? "google" : "local",
     recurringEventId: r.recurringEventId,
     htmlLink: r.htmlLink,
-    isHoliday: !!r.isHoliday
+    isHoliday: !!r.isHoliday,
+    calendarId: r.calendarId
   }));
 }
 function formatDayHeader(d, today, tomorrow) {
@@ -3528,9 +3529,13 @@ function renderEvents(events) {
     }
   }
   let lastDayKey = "";
+  const nowMs = Date.now();
+  const recurHolidayCutoff = nowMs + HOLIDAY_RECUR_HORIZON_MS;
   for (const e of events) {
     if (e.recurringEventId && dailyKeys.has(e.recurringEventId))
       continue;
+    if ((e.isHoliday || e.recurringEventId) && e.start > recurHolidayCutoff)
+      continue;
     const d = new Date(e.start);
     const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
     if (dayKey !== lastDayKey) {
@@ -3539,15 +3544,32 @@ function renderEvents(events) {
     }
     const recurMark = e.recurringEventId ? `<span class="cal-side-event-recur" title="Recurring event">\u21BB</span>` : "";
     const link = e.htmlLink || "";
-    const holidayAttr = e.isHoliday ? ' data-holiday="1"' : "";
+    let holidayKind;
+    if (e.isHoliday) {
+      const cid = (e.calendarId || "").toLowerCase();
+      if (cid.includes("usa"))
+        holidayKind = "us";
+      else if (cid.includes("jewish"))
+        holidayKind = "jewish";
+      else
+        holidayKind = "other";
+    }
+    const holidayAttr = e.isHoliday ? ` data-holiday="1" data-holiday-kind="${holidayKind}"` : "";
+    const recurAttr = e.recurringEventId ? ' data-recurring="1"' : "";
     const clickable = !e.isHoliday;
     const titleAttr = clickable && link ? 'title="Click to open in Google Calendar"' : "";
     const dataLink = clickable ? `data-link="${escapeHtml4(link)}"` : "";
-    html += `<div class="cal-side-event" data-id="${e.id}"${holidayAttr} ${dataLink} ${titleAttr}>
-            <span class="cal-side-event-dot ${e.isHoliday ? "h" : e.source === "google" ? "g" : "l"}"></span>
-            <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
-            <span class="cal-side-event-title">${escapeHtml4(e.title)}${recurMark}</span>
-        </div>`;
+    if (e.isHoliday) {
+      html += `<div class="cal-side-event"${holidayAttr} data-id="${e.id}">
+                <span class="cal-side-event-title cal-side-event-holiday-title">${escapeHtml4(e.title)}</span>
+            </div>`;
+    } else {
+      html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} ${dataLink} ${titleAttr}>
+                <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
+                <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
+                <span class="cal-side-event-title">${escapeHtml4(e.title)}${recurMark}</span>
+            </div>`;
+    }
   }
   body.innerHTML = html;
   const openInCalendar = (url) => {
@@ -4013,7 +4035,7 @@ function initCalendarSidebar() {
     }
   }
 }
-var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, viewYear, viewMonth, viewDay, lastEvents, selectedTaskUuids;
+var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_RECUR_HORIZON_MS, viewYear, viewMonth, viewDay, lastEvents, selectedTaskUuids;
 var init_calendar_sidebar = __esm({
   "client/components/calendar-sidebar.js"() {
     "use strict";
@@ -4024,6 +4046,7 @@ var init_calendar_sidebar = __esm({
     SHOW_DONE_PREF = "mailx-task-show-done";
     HORIZON_DAYS_PREF = "mailx-cal-horizon-days";
     HORIZON_DEFAULT_DAYS = 30;
+    HOLIDAY_RECUR_HORIZON_MS = 14 * 864e5;
     viewYear = (/* @__PURE__ */ new Date()).getFullYear();
     viewMonth = (/* @__PURE__ */ new Date()).getMonth();
     viewDay = (/* @__PURE__ */ new Date()).getDate();