Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Prefer the plan on the subscription over the one on the usage (#31127)

Browse source 
This PR makes it so we always prefer the plan on the subscription.

The plan stored on the subscription usage is informational only.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-05-21 18:00:19 -04:00 • committed by GitHub
parent ffa8310d04
commit b829f72c17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/collab/src/api/billing.rs
View file

@ -1293,15 +1293,10 @@ async fn get_current_usage(
.get_subscription_usage_for_period(user.id, period_start_at, period_end_at) .get_subscription_usage_for_period(user.id, period_start_at, period_end_at)
.await?; .await?;
let plan = usage let plan = subscription
.as_ref() .kind
.map(|usage| usage.plan.into()) .map(Into::into)
.unwrap_or_else(|| { .unwrap_or(zed_llm_client::Plan::ZedFree);
subscription
.kind
.map(Into::into)
.unwrap_or(zed_llm_client::Plan::ZedFree)
});
let model_requests_limit = match plan.model_requests_limit() { let model_requests_limit = match plan.model_requests_limit() {
zed_llm_client::UsageLimit::Limited(limit) => { zed_llm_client::UsageLimit::Limited(limit) => {