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 |
|---|---|---|
| .. | ||
| audio.go | Loading commit data... | |
| channel_settings.go | Loading commit data... | |
| claude.go | Loading commit data... | |
| embedding.go | Loading commit data... | |
| error.go | Loading commit data... | |
| gemini.go | Loading commit data... | |
| gemini_generation_config_test.go | Loading commit data... | |
| midjourney.go | Loading commit data... | |
| notify.go | Loading commit data... | |
| openai_compaction.go | Loading commit data... | |
| openai_image.go | Loading commit data... | |
| openai_request.go | Loading commit data... | |
| openai_request_zero_value_test.go | Loading commit data... | |
| openai_response.go | Loading commit data... | |
| openai_responses_compaction_request.go | Loading commit data... | |
| openai_video.go | Loading commit data... | |
| playground.go | Loading commit data... | |
| pricing.go | Loading commit data... | |
| ratio_sync.go | Loading commit data... | |
| realtime.go | Loading commit data... | |
| request_common.go | Loading commit data... | |
| rerank.go | Loading commit data... | |
| sensitive.go | Loading commit data... | |
| suno.go | Loading commit data... | |
| task.go | Loading commit data... | |
| user_settings.go | Loading commit data... | |
| values.go | Loading commit data... | |
| video.go | Loading commit data... |