Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys
Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| billing_setting | Loading commit data... | |
| config | Loading commit data... | |
| console_setting | Loading commit data... | |
| model_setting | Loading commit data... | |
| operation_setting | Loading commit data... | |
| performance_setting | Loading commit data... | |
| ratio_setting | Loading commit data... | |
| reasoning | Loading commit data... | |
| system_setting | Loading commit data... | |
| auto_group.go | Loading commit data... | |
| chat.go | Loading commit data... | |
| midjourney.go | Loading commit data... | |
| payment_creem.go | Loading commit data... | |
| payment_stripe.go | Loading commit data... | |
| payment_waffo.go | Loading commit data... | |
| rate_limit.go | Loading commit data... | |
| sensitive.go | Loading commit data... | |
| user_usable_group.go | Loading commit data... |