CaIon 35d0704640 Merge branch 'origin/main' into nightly ...

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

2026-04-02 00:39:13 +08:00

..

ability.go

feat: add special user usable group setting

2025-10-28 23:25:43 +08:00

channel_cache.go

refactor(channel_cache): improve channel selection logic by handling zero total weight and removing unnecessary variable

2025-10-29 21:49:06 +08:00

channel_satisfy.go

feat: channel affinity (#2669)

2026-01-26 19:57:41 +08:00

channel.go

feat(channel): add error handling for SaveWithoutKey when channel ID is 0

2025-12-20 13:26:40 +08:00

checkin.go

feat(checkin): add check-in functionality with status retrieval and user quota rewards

2026-01-02 23:00:33 +08:00

custom_oauth_provider.go

imporve oauth provider UI/UX (#2983)

2026-02-22 15:41:29 +08:00

db_time.go

✨ feat: add subscription billing system (#2808)

2026-02-03 17:40:43 +08:00

log.go

feat: record stream interruption reasons via StreamStatus

2026-03-31 16:54:39 +08:00

main.go

fix: enhance migrateTokenModelLimitsToText function to return errors and improve migration checks

2026-02-28 19:08:03 +08:00

midjourney.go

refactor(task): enhance UpdateWithStatus for CAS updates and add integration tests

2026-02-22 16:01:19 +08:00

missing_models.go

🖼️ chore: format code file

2025-08-10 12:11:31 +08:00

model_extra.go

🚀 perf: optimize model management APIs, unify pricing types as array, and remove redundancies

2025-08-11 14:40:01 +08:00

model_meta.go

fix(model): 解决模型创建和更新时零值字段被默认值覆盖的问题

2026-02-03 13:32:14 +08:00

option.go

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

passkey.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

prefill_group.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

pricing_default.go

✨ feat(pricing): add default vendor icons with LobeHub color support

2025-08-29 23:42:33 +08:00

pricing_refresh.go

🖼️ chore: format code file

2025-08-10 12:11:31 +08:00

pricing.go

feat: enhance tiered billing functionality and UI components

2026-03-17 16:59:25 +08:00

redemption.go

fix(i18n): add missing translations and improve language fallback

2026-02-05 00:16:17 +08:00

setup.go

✨ feat: Implement system setup functionality

2025-04-03 18:57:15 +08:00

subscription.go

✨ chore: Improve subscription billing fallback and UI states

2026-02-07 00:57:36 +08:00

task_cas_test.go

refactor(task): enhance UpdateWithStatus for CAS updates and add integration tests

2026-02-22 16:01:19 +08:00

task.go

fix: support vertex multi-key task fetch in content proxy

2026-02-27 17:07:10 +08:00

token_cache.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

token.go

feat: implement token key fetching and masking in API responses

2026-03-08 22:40:40 +08:00

topup.go

feat(waffo): Waffo payment gateway integration with configurable methods

2026-03-17 18:04:58 +08:00

twofa.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

usedata.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

user_cache.go

fix(i18n): prioritize user settings over Accept-Language header

2026-02-05 00:37:18 +08:00

user_oauth_binding.go

fix(oauth): enhance error handling and transaction management for OAuth user creation and binding

2026-02-05 21:48:05 +08:00

user.go

fix: handle nil setting in user retrieval from database

2026-02-24 23:46:46 +08:00

utils.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00

vendor_meta.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00