Skip to content

th booking calendars: rename blocking → conflict#168

Merged
brentrager merged 1 commit into
mainfrom
booking-conflict-rename
Jul 4, 2026
Merged

th booking calendars: rename blocking → conflict#168
brentrager merged 1 commit into
mainfrom
booking-conflict-rename

Conversation

@brentrager

Copy link
Copy Markdown
Contributor

What

Standardize the multi-account calendar vocabulary from "blocking" to "conflict" (matches the platform's conflictCalendarIds), per follow-up to #167.

  • th booking calendars connect now sends purpose=conflict (was purpose=blocking) on the Google authorize call.
  • Help text and doc comments say "conflict calendar".
  • calendars list renders the API's role value verbatim, so no hardcoded label to change — 'conflict' vs 'primary' flows straight through.
  • Untouched: th booking block add/list/rm (the separate manual-blocks feature) stays "block".

Corrected the wording in the still-unreleased booking-cli.md changeset rather than adding a new one — the feature hasn't shipped, so a "renamed X→Y" changelog entry for something users never saw as "blocking" would be noise.

Verification

cargo fmt --check clean, cargo clippy -p smooai-smooth-cli 0 errors, cargo test -p smooai-smooth-cli298 passed, 0 failed.

Note (carried from #167)

The platform authorize route only threads tier through OAuth state today; purpose (now conflict) is ignored until the platform side lands it. Renaming the value keeps us aligned with that work.

🤖 Generated with Claude Code

https://claude.ai/code/session_01AvDLZSkQDEEJC3PA6ULtwN

Standardize the multi-account calendar vocabulary on "conflict" (matches
the platform's conflictCalendarIds). `calendars connect` now sends
`purpose=conflict` on the Google authorize call; help text and doc comments
say "conflict calendar". The separate manual-blocks feature
(`th booking block …`) is unchanged.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AvDLZSkQDEEJC3PA6ULtwN
@changeset-bot

changeset-bot Bot commented Jul 4, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: e4760c2

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes changesets to release 1 package
Name Type
@smooai/smooth Minor

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@brentrager brentrager merged commit 22ca212 into main Jul 4, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant