diff --git a/server/src/email_extract.rs b/server/src/email_extract.rs index 3fac81b..28e6017 100644 --- a/server/src/email_extract.rs +++ b/server/src/email_extract.rs @@ -1837,39 +1837,42 @@ pub fn render_ical_summary(ical_data: &str) -> Result { } } + // Always use America/Los_Angeles for Google Calendar events if no TZID is present + let event_tz: Tz = tzid + .as_deref() + .unwrap_or("America/Los_Angeles") + .parse() + .unwrap_or(chrono_tz::America::Los_Angeles); + // Parse start/end as chrono DateTime let (local_fmt_start, local_fmt_end, event_days, recurrence_display) = if let Some(dtstart) = dtstart { - let tz: Tz = tzid - .as_deref() - .unwrap_or("UTC") - .parse() - .unwrap_or(chrono_tz::UTC); let fallback = chrono::DateTime::::from_timestamp(0, 0) - .map(|dt| dt.with_timezone(&tz)) + .map(|dt| dt.with_timezone(&event_tz)) .unwrap_or_else(|| { - tz.with_ymd_and_hms(1970, 1, 1, 0, 0, 0) + event_tz + .with_ymd_and_hms(1970, 1, 1, 0, 0, 0) .single() - .unwrap_or_else(|| tz.timestamp_opt(0, 0).single().unwrap()) + .unwrap_or_else(|| event_tz.timestamp_opt(0, 0).single().unwrap()) }); - let start = parse_ical_datetime_tz(dtstart, tz).unwrap_or(fallback); + let start = parse_ical_datetime_tz(dtstart, event_tz).unwrap_or(fallback); let end = dtend - .and_then(|d| parse_ical_datetime_tz(d, tz)) + .and_then(|d| parse_ical_datetime_tz(d, event_tz)) .unwrap_or(start); - let local_start = start.with_timezone(&Local); - let local_end = end.with_timezone(&Local); + // Use the event's TZ for all calendar grid/highlighting logic let allday = dtstart.len() == 8 && (dtend.map(|s| s.len() == 8).unwrap_or(false)); let fmt_start = if allday { - local_start.format("%a %b %e, %Y").to_string() + start.format("%a %b %e, %Y").to_string() } else { - local_start.format("%-I:%M %p %a %b %e, %Y").to_string() + start.format("%-I:%M %p %a %b %e, %Y").to_string() }; let fmt_end = if allday { - local_end.format("%a %b %e, %Y").to_string() + end.format("%a %b %e, %Y").to_string() } else { - local_end.format("%-I:%M %p %a %b %e, %Y").to_string() + end.format("%-I:%M %p %a %b %e, %Y").to_string() }; + // All calendar grid and event_days logic below uses start/end in event's TZ // Recurrence support: parse RRULE and generate event_days accordingly let mut days = vec![]; @@ -2144,6 +2147,39 @@ fn parse_ical_datetime_tz(dt: &str, tz: Tz) -> Option> { #[cfg(test)] mod tests { + #[test] + fn google_calendar_email_thursday_highlights_thursday() { + use mailparse::parse_mail; + let raw_email = include_str!("../../server/testdata/google-calendar-example-thursday.eml"); + let parsed = parse_mail(raw_email.as_bytes()).expect("parse_mail"); + let mut part_addr = vec![]; + let body = extract_body(&parsed, &mut part_addr).expect("extract_body"); + let meta = extract_calendar_metadata_from_mail(&parsed, &body); + // Assert detection as Google Calendar + assert!(meta.is_google_calendar_event); + // Debug: print the rendered HTML for inspection + let html = meta.body_html.expect("body_html"); + println!("Rendered HTML: {}", html); + // Check that the calendar table highlights Thursday, not Friday + // Look for a table header row with days of week (allow whitespace) + let thursday_idx = html + .find(">\n Thu<") + .or_else(|| html.find(">Thu<")) + .expect("Should have a Thursday column"); + let friday_idx = html + .find(">\n Fri<") + .or_else(|| html.find(">Fri<")) + .expect("Should have a Friday column"); + // Find the first highlighted cell (background:#ffd700) + let highlight_idx = html + .find("background:#ffd700") + .expect("Should highlight a day"); + // The highlight should be closer to Thursday than Friday + assert!( + highlight_idx > thursday_idx && highlight_idx < friday_idx, + "Thursday should be highlighted, not Friday" + ); + } use super::*; #[test] fn google_calendar_email_3_single_event_metadata() { diff --git a/server/testdata/google-calendar-example-thursday.eml b/server/testdata/google-calendar-example-thursday.eml new file mode 100644 index 0000000..27a1621 --- /dev/null +++ b/server/testdata/google-calendar-example-thursday.eml @@ -0,0 +1,175 @@ +Return-Path: +Delivered-To: bill@xinu.tv +Received: from phx.xinu.tv [74.207.253.222] + by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.1) + for (single-drop); Thu, 11 Sep 2025 12:27:35 -0700 (PDT) +Received: from phx.xinu.tv + by phx.xinu.tv with LMTP + id CqRrBqciw2hiKicAJR8clQ + (envelope-from ) + for ; Thu, 11 Sep 2025 12:27:35 -0700 +X-Original-To: gmail@xinu.tv +Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::130; helo=mail-lf1-x130.google.com; envelope-from=couchmoney+caf_=gmail=xinu.tv@gmail.com; receiver=xinu.tv +Authentication-Results: phx.xinu.tv; + dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=dc+iKaXd; + dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=kf8o8wAd +Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) + by phx.xinu.tv (Postfix) with ESMTPS id D7E2D80037 + for ; Thu, 11 Sep 2025 12:27:33 -0700 (PDT) +Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-55f716e25d9so1141446e87.1 + for ; Thu, 11 Sep 2025 12:27:33 -0700 (PDT) +ARC-Seal: i=2; a=rsa-sha256; t=1757618852; cv=pass; + d=google.com; s=arc-20240605; + b=MZ+1JfQuPR9luCCxiZNUeqSEpjt1vLuM3bTRCaal/W0NBxkCH0y5v9WfPR0KJ2BPb1 + Rtnt/5ayDtmsLf8l6yTTVsBlFYW70ehqXWMD10MMcDEMvnib4KKDAacGaSmijAK4cYGq + FOU9CGNY986OMXMk54TD9NF3fkKDIKcAoh81D6at5/DE3Puuxofq0vZmtmVqQBNKG169 + REkhcDpkXTMs/4rJpmZwXp2HbjD84avusBwSlYIQUWsBgO4g7THHjoR4Uk56cek9aEds + ip8IkTO6KRFe6u8FebQsZ/Q9sSAK3pheMExWFVMha9Y0XhACVOZiV600zRCPS9MNHhYw + XEaA== +ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; + h=to:from:subject:date:message-id:auto-submitted:sender:reply-to + :mime-version:dkim-signature:dkim-signature:delivered-to; + bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=; + fh=WnbwIlqFRbBot/H7TyqablNBDgXRuegsgjC3piothTI=; + b=aYMo5f7VI2b4CiAvLELRJ9zM3dF7ZH8FEqmoAtCcfPHrT9kLLCnriuyXG1R6sC3eoR + ++boT29xoScVroIlfcI77Ty7N5X1fawOABkVDWWt7z5w4WhiesT0klxw5nINj9hnLBiK + 22nrMevpRpFtmuDO7cle78lSAFZoZuyv+aXCK9RnLKvIm2JuXRrvU8LivxbbpNB4gNl0 + hE1jsGuZm1SOJ54SRLwwa4HpSiOJV2x2txTtPCzmvE/LZvNESPjfi3Y2u7gaR87OzkNs + gNi5Xoc+D908zBsmcYKpUYiQcPL79s3DfNwYFIs/rR8Z2xgaHbFD/YmqRUmCEeNLv7o2 + RR8g==; + darn=xinu.tv +ARC-Authentication-Results: i=2; mx.google.com; + dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd; + spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20230601; t=1757618852; x=1758223652; + h=to:from:subject:date:message-id:auto-submitted:sender:reply-to + :mime-version:dkim-signature:dkim-signature:delivered-to + :x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc + :subject:date:message-id:reply-to; + bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=; + b=GKJkb+LmE79XIMEhHRvoCodKS+GBTOCShzMe06Q+zKxUZFHi6XMg8GqteuXQO9LVbw + nPUVN4QO2Hvqch0xzjbc0ryyMOD0u7HqpDUAEZCzamFXIfsX6hZXKLhFqy4YomtsG3os + TCOWBGLqwu7KalfOVg2p+csOR68i0mGyBII1sKcL9vUv9kIQJZxQKHGkuIc48cf6tbUB + L+mkVbMwXLSbpuTJszPmIVZV5o0K52KN+2QoLcmXGfw0mUOnjNI0oSovdbPg4SSDZ3cw + iIsC9vjvtCSFS3pf+Fp807s+Zjh5P6xeSxGU57qhC+HT9kTzIioh5EqKnGqcskDTqrI1 + uCiQ== +X-Forwarded-Encrypted: i=2; AJvYcCUfSSA2sT31daRt2+W7dAD9YPx1gqa4JFpVuqCtxVtjqbKfKhOX/EcDQiECQ4BEWjmAP+IqTQ==@xinu.tv +X-Gm-Message-State: AOJu0Ywn7D0BjTaGiM/UFG0WhGuyYGfpLijg+ouhrOaGZzSREyTcRa37 + XA3bzQ/LKTpzWhhh01GMwnigmELbWdIVr/BeRLVCuJdh+m+JBMgnAjBTIDs9RF3/xfR7rpG7VOB + 6k+ugF+8QRKB4BcL2t8MvfJD03CkrzuhhvUtFTRHopcSZrkqzh8GOJayq42VveQ== +X-Received: by 2002:a05:6512:3b24:b0:55f:6580:818c with SMTP id 2adb3069b0e04-57050fe2fa3mr165340e87.46.1757618851553; + Thu, 11 Sep 2025 12:27:31 -0700 (PDT) +X-Forwarded-To: gmail@xinu.tv +X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv +Delivered-To: couchmoney@gmail.com +Received: by 2002:a05:6504:d09:b0:2c3:f6c4:ad72 with SMTP id c9csp3388833lty; + Thu, 11 Sep 2025 12:27:29 -0700 (PDT) +X-Received: by 2002:a05:6602:36ce:b0:889:b536:779b with SMTP id ca18e2360f4ac-8903378d714mr78653239f.7.1757618849269; + Thu, 11 Sep 2025 12:27:29 -0700 (PDT) +ARC-Seal: i=1; a=rsa-sha256; t=1757618849; cv=none; + d=google.com; s=arc-20240605; + b=Ln2bufZfSNhR/NmMPrG2QFdtvupjJtLDQnFvsL8HTPn+Dlrt5ff+6k6Wpupab/5mS7 + hXjtVD0jnryGUiM5h+SNjxwzNPM3PBoueTpAzzBkjHQqMxJVpspgsGJUVOWAVRBWtWo + 39qFyoP0vhzGRWDAuAFV+4VDhsvH7GL8lTrZCSMzrngTadmEdJ5haUIQOa50KFUn5HrK + 1r12gayb+TaGaWfQfDo0Me689T8MQnS0ITUuzgvFxfgHZBz3h+IPnC0hrlhdziGovETo + GvHzgCCtiVzu6rop6VMLjLuAYmmT9+jZ3GjSRb+078C9cJR17YpguOC14Cyv4od1Tf7y + RFiQ==; + dara=google.com +ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; + h=to:from:subject:date:message-id:auto-submitted:sender:reply-to + :mime-version:dkim-signature:dkim-signature; + bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=; + fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=; + b=JRkHr3CKSkCrafdLzBRtaBOGNl3/0ZSTtgubaNXtvhAiIqRqiQYocfLnVM6N/9sH7O + byTXYaRoaRLw/35WM+QTFGP3zUGRkM3eO4UVS/utVIss1IVLDjfmZHalqLYl8RokW5br + 89Z/xYIyjTE7WUdy6uMSrExCNm5VWjO/qcMKsE5s5oDbXdSLaUYxLTurICM3LQksGkCY + wiAWaDDqK14+uhEhW5AyEnebDSYhL9U8UadIv+eK6Ng9q1kwOUzxICRQXEyUtnKhaDKJ + eZ1Qe1mp1CjCulr+I15fz3VwUJ6W1cv6cytcxPbu4p5GPn2gb2hS1eR81HVTL6V1Sp5G + NdDQ==; + dara=google.com +ARC-Authentication-Results: i=1; mx.google.com; + dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd; + spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) + by mx.google.com with SMTPS id ca18e2360f4ac-88f2ea1122asor117632339f.3.2025.09.11.12.27.29 + for + (Google Transport Security); + Thu, 11 Sep 2025 12:27:29 -0700 (PDT) +Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; +Authentication-Results: mx.google.com; + dkim=pass header.i=@google.com header.s=20230601 header.b=dc+iKaXd; + dkim=pass header.i=@gmail.com header.s=20230601 header.b=kf8o8wAd; + spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com; + dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; + dara=pass header.i=@gmail.com +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20230601; t=1757618849; x=1758223649; dara=google.com; + h=to:from:subject:date:message-id:auto-submitted:sender:reply-to + :mime-version:from:to:cc:subject:date:message-id:reply-to; + bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=; + b=dc+iKaXdFyqu6K0MIgk848QuwpQXvwzwlEVkxmjuCWvn9DzanMbYn5QJRyRTKilRna + BZ7gJSPriHUHcJd4fVKgGuCaQg0TxenCwm+0R64oB1xcDLfonayo/nCrFqEcCLHNmi7x + lTyWGJ0rLw6nKazxtcCdIbDhVgiE7/fXNI89w6XFp6pcKLl48yFIoCG1f6uY4iQ7QqNU + hLHzjmlzjTi58xFLao7SizZ0lr7E5cHXKHp1Ls/hkDzzcY0Y+O5+3r+NQw4MtpHTcY6/ + kQlg6OhyMx8PTu4cuepQKXLHV4aFaNJbDQTp8wew4xPIgi7pm2p6hb6C3GgwY6ptOvLd + wuag== +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=gmail.com; s=20230601; t=1757618849; x=1758223649; dara=google.com; + h=to:from:subject:date:message-id:auto-submitted:sender:reply-to + :mime-version:from:to:cc:subject:date:message-id:reply-to; + bh=mVNsDGUAhSGrAIoTy8PIfvCBxBB4yaBy/VZH8i3gPl4=; + b=kf8o8wAd5DSU/NC7SDiuIoohCu+/7wTjWyQqDYbBjUFGaBaYdj6aD5JWNQ1KEA2W8o + E+Qy2ymyrzodKa1eOsQX2UDAYKOKpdxMWvx1u19+SC3Dp8DP4puRMrL2ObiSEMLCuOvz + Mxmkd+ZUP72EhVuQwK1iSm04/cjQaMsSiPhvSBaxXMaaarwlKeOoCoIo+qC/Z9emiBBv + Gk0sQcLA+CByvsxuvD9GInSA0rdoZ0ijhSb0Y475Hieam1QQqy/fhe8lgujzhXNFoIbR + 5EA9GE0VV9PDoNanaT+u954YeOFBL2YZ5gm2gHltw8tBI98LKnC42Pa3qyMznBa2dI2Q + A0RQ== +X-Google-Smtp-Source: AGHT+IGmC5/03nTVMeYJBoq1R/BiA19iH0DFaZyyImB3W8mtgjdn+XqIFK1fC8aTwWRXQmsr71Xo0cmkgx6hjPvicQ/d +MIME-Version: 1.0 +X-Received: by 2002:a05:6602:380d:b0:887:4c93:f12c with SMTP id + ca18e2360f4ac-8903596aca3mr58994639f.17.1757618848817; Thu, 11 Sep 2025 + 12:27:28 -0700 (PDT) +Reply-To: tconvertino@gmail.com +Sender: Google Calendar +Auto-Submitted: auto-generated +Message-ID: +Date: Thu, 11 Sep 2025 19:27:28 +0000 +Subject: Canceled event: Scout Babysits @ Thu Sep 11, 2025 6pm - 9pm (PDT) (Family) +From: tconvertino@gmail.com +To: couchmoney@gmail.com +Content-Type: multipart/mixed; boundary="000000000000226b77063e8b878d" + +--000000000000226b77063e8b878d +Content-Type: text/calendar; charset="UTF-8"; method=CANCEL +Content-Transfer-Encoding: 7bit + +BEGIN:VCALENDAR +PRODID:-//Google Inc//Google Calendar 70.9054//EN +VERSION:2.0 +CALSCALE:GREGORIAN +METHOD:CANCEL +X-GOOGLE-CALID:g66m0feuqsao8l1c767pvvcg4k@group.calendar.google.com +BEGIN:VEVENT +DTSTART:20250912T010000Z +DTEND:20250912T040000Z +DTSTAMP:20250911T192728Z +UID:4ang6172d1t7782sn2hmi30fgi@google.com +CREATED:20250901T224707Z +DESCRIPTION: +LAST-MODIFIED:20250911T192728Z +LOCATION: +SEQUENCE:1 +STATUS:CANCELLED +SUMMARY:Scout Babysits +TRANSP:OPAQUE +END:VEVENT +END:VCALENDAR + +--000000000000226b77063e8b878d--