Merge pull request #100 from salmonumbrella/fix/issue-97-reminders

steipete · web-flow · commit 16cdb1491e44 · 2026-01-21T23:09:34.000Z
fix(calendar): force reminders override payload
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Keyring: persist OAuth tokens across Homebrew upgrades. (#94) — thanks @salmonumbrella.
 - Docs: update Gmail command examples in README. (#95) — thanks @chrisrodz.
 - Contacts: include birthdays in contact get output. (#102) — thanks @salmonumbrella.
+- Calendar: force custom reminders payload to send UseDefault=false. (#100) — thanks @salmonumbrella.
 
 ## 0.7.0 - 2026-01-17
 
diff --git a/internal/cmd/calendar_build.go b/internal/cmd/calendar_build.go
@@ -184,9 +184,11 @@ func buildReminders(reminders []string) (*calendar.EventReminders, error) {
 		})
 	}
 
+	// ForceSendFields ensures UseDefault=false is sent (not omitted as zero value)
 	return &calendar.EventReminders{
-		UseDefault: false,
-		Overrides:  overrides,
+		UseDefault:      false,
+		Overrides:       overrides,
+		ForceSendFields: []string{"UseDefault"},
 	}, nil
 }
 
diff --git a/internal/cmd/calendar_test.go b/internal/cmd/calendar_test.go
@@ -341,6 +341,9 @@ func TestBuildReminders(t *testing.T) {
 	if got == nil || got.UseDefault || len(got.Overrides) != 2 {
 		t.Fatalf("unexpected: %#v", got)
 	}
+	if !hasStringValue(got.ForceSendFields, "UseDefault") {
+		t.Fatalf("expected UseDefault to be force-sent, got %#v", got.ForceSendFields)
+	}
 	if got.Overrides[0].Method != "popup" || got.Overrides[0].Minutes != 30 {
 		t.Fatalf("unexpected override[0]: %#v", got.Overrides[0])
 	}
@@ -358,3 +361,12 @@ func TestBuildReminders(t *testing.T) {
 		t.Fatalf("expected error for invalid reminder")
 	}
 }
+
+func hasStringValue(values []string, value string) bool {
+	for _, v := range values {
+		if v == value {
+			return true
+		}
+	}
+	return false
+}

Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,11 @@ func buildReminders(reminders []string) (*calendar.EventReminders, error) {`
`184`	`184`	`})`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ // ForceSendFields ensures UseDefault=false is sent (not omitted as zero value)`
`187`	`188`	`return &calendar.EventReminders{`
`188`		`- UseDefault: false,`
`189`		`- Overrides: overrides,`
	`189`	`+ UseDefault: false,`
	`190`	`+ Overrides: overrides,`
	`191`	`+ ForceSendFields: []string{"UseDefault"},`
`190`	`192`	`}, nil`
`191`	`193`	`}`
`192`	`194`
Original file line number	Diff line number	Diff line change
`@@ -341,6 +341,9 @@ func TestBuildReminders(t *testing.T) {`
`341`	`341`	`if got == nil \|\| got.UseDefault \|\| len(got.Overrides) != 2 {`
`342`	`342`	`t.Fatalf("unexpected: %#v", got)`
`343`	`343`	`}`
	`344`	`+ if !hasStringValue(got.ForceSendFields, "UseDefault") {`
	`345`	`+ t.Fatalf("expected UseDefault to be force-sent, got %#v", got.ForceSendFields)`
	`346`	`+ }`
`344`	`347`	`if got.Overrides[0].Method != "popup" \|\| got.Overrides[0].Minutes != 30 {`
`345`	`348`	`t.Fatalf("unexpected override[0]: %#v", got.Overrides[0])`
`346`	`349`	`}`
`@@ -358,3 +361,12 @@ func TestBuildReminders(t *testing.T) {`
`358`	`361`	`t.Fatalf("expected error for invalid reminder")`
`359`	`362`	`}`
`360`	`363`	`}`
	`364`	`+`
	`365`	`+func hasStringValue(values []string, value string) bool {`
	`366`	`+ for _, v := range values {`
	`367`	`+ if v == value {`
	`368`	`+ return true`
	`369`	`+ }`
	`370`	`+ }`
	`371`	`+ return false`
	`372`	`+}`