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 |
|---|---|---|
| .. | ||
| channel_affinity_setting.go | Loading commit data... | |
| checkin_setting.go | Loading commit data... | |
| general_setting.go | Loading commit data... | |
| monitor_setting.go | Loading commit data... | |
| operation_setting.go | Loading commit data... | |
| payment_setting.go | Loading commit data... | |
| payment_setting_old.go | Loading commit data... | |
| quota_setting.go | Loading commit data... | |
| status_code_ranges.go | Loading commit data... | |
| status_code_ranges_test.go | Loading commit data... | |
| token_setting.go | Loading commit data... | |
| tools.go | Loading commit data... |