mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-08 01:17:09 +08:00
* feat(i18n): translate web console messages in the frontend and AI-client errors in the backend
Chinese text was hard-coded in API messages, stored log content, emails and
server logs, so it reached users of every interface language.
Text is now translated where its reader is:
- Web console APIs return the English source text as message_key with
message_params, and the web console translates it in all seven languages.
message keeps the English text for other API callers.
- Errors returned to AI clients, emails and notifications are translated by
the backend (en, zh-CN, zh-TW) in the language saved on the account, then
the language of the request's Accept-Language header.
- A reader who states no language still gets the original Chinese text of the
messages that were Chinese before, word for word. Gateways that use another
new-api as their upstream match that text, for example to disable a channel
whose account ran out of quota.
- Usage, top-up and system log content is stored as content_parts (key and
params) and rendered in the viewer's language. Task fail reasons and refund
reasons written by the gateway are English keys. Rows written earlier are
shown as before.
- Server logs are English.
Also:
- The saved interface language zhTW, and zh-HK, zh-MO and zh-Hant, now select
Traditional Chinese in the backend instead of Simplified Chinese.
- The built-in group descriptions are translated; descriptions an
administrator saved are shown as written.
- .agents/rules/i18n.md records the conventions. Tests in i18n/ fail on a
non-English string literal, on a web console message without translations
and on a locale key without a constant.
* feat(i18n): print server logs in Chinese when LOG_LANGUAGE asks for it
Server log lines are English by default. With LOG_LANGUAGE=zh-CN, the lines
that were Chinese before print their original Chinese text.
common.LogText formats a log line from its English format, which is also the
key of its Chinese text in common/log_text.zh-CN.json. A line without an entry
prints in English. go vet checks the arguments of every call, and
TestServerLogTexts checks that each entry still matches a call and has the
same verbs as its key.
* docs: list LOG_LANGUAGE in the docker compose example
* feat(i18n): translate every server log line and add DEFAULT_LANGUAGE
Every line the gateway prints goes through common.LogText. With
DEFAULT_LANGUAGE=zh-CN, the lines that have a Chinese text in
common/log_text.zh-CN.json print it and the others print English.
DEFAULT_LANGUAGE replaces LOG_LANGUAGE. It also sets the language of
backend messages, emails and notifications for a reader who states no
language: en, zh-CN or zh-TW, English when unset. The list of messages
that stayed Chinese for such readers is removed.
Review fixes:
- Channel test logs store the token name "Model test"; the console shows
it in the interface language.
- Task fail reasons written by the gateway are fixed sentences the console
translates. The HTTP status and the upstream detail go to the server log
when a polled task is failed.
- The auto-disable reason of a slow channel is written in DEFAULT_LANGUAGE.
Also:
- Drop the repository-scanning lint tests, the i18n rules file and its
read gate. AGENTS.md keeps the conventions in four lines.
- Payment error toasts keep their previous text and only add the
translated message key.
- Remove guards and helpers that no caller needs.
* fix(i18n): address review on language lookup, notices and error responses
- Relay requests no longer load the user a second time to find the
language: the settings TokenAuth put into the request are used as they
are, also when they hold no language.
- Upstream model update notices are rendered in each recipient's saved
language, DEFAULT_LANGUAGE when none.
- /api/usage/token and /api/log/token answer with backend-translated
messages again, with the keys and status codes used before this PR.
Their callers are scripts, not the web console.
- Webhook notifications fill {{value}} placeholders like the other
senders. Running the rendered text through Sprintf appended
%!(EXTRA ...) and broke %2F in links.
- RootUserLanguage reads the setting of the root user it already loaded.
- zh_TW and zh_HK are read as Traditional Chinese.
- Add common.ApiErrorStatus for error responses under another HTTP status
and use it where those responses were built by hand.
- Remove middleware.GetLanguage, which had no callers.
255 lines
7.3 KiB
Go
255 lines
7.3 KiB
Go
package model
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/logger"
|
|
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
type Redemption struct {
|
|
Id int `json:"id"`
|
|
UserId int `json:"user_id"`
|
|
Key string `json:"key" gorm:"type:char(32);uniqueIndex"`
|
|
Status int `json:"status" gorm:"default:1"`
|
|
Name string `json:"name" gorm:"index"`
|
|
Quota int `json:"quota" gorm:"default:100"`
|
|
CreatedTime int64 `json:"created_time" gorm:"bigint"`
|
|
RedeemedTime int64 `json:"redeemed_time" gorm:"bigint"`
|
|
Count int `json:"count" gorm:"-:all"` // only for api request
|
|
UsedUserId int `json:"used_user_id"`
|
|
DeletedAt gorm.DeletedAt `gorm:"index"`
|
|
ExpiredTime int64 `json:"expired_time" gorm:"bigint"` // 过期时间,0 表示不过期
|
|
}
|
|
|
|
func GetAllRedemptions(startIdx int, num int) (redemptions []*Redemption, total int64, err error) {
|
|
// 开始事务
|
|
tx := DB.Begin()
|
|
if tx.Error != nil {
|
|
return nil, 0, tx.Error
|
|
}
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
tx.Rollback()
|
|
}
|
|
}()
|
|
|
|
// 获取总数
|
|
err = tx.Model(&Redemption{}).Count(&total).Error
|
|
if err != nil {
|
|
tx.Rollback()
|
|
return nil, 0, err
|
|
}
|
|
|
|
// 获取分页数据
|
|
err = tx.Order("id desc").Limit(num).Offset(startIdx).Find(&redemptions).Error
|
|
if err != nil {
|
|
tx.Rollback()
|
|
return nil, 0, err
|
|
}
|
|
|
|
// 提交事务
|
|
if err = tx.Commit().Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
return redemptions, total, nil
|
|
}
|
|
|
|
func SearchRedemptions(keyword string, status string, startIdx int, num int) (redemptions []*Redemption, total int64, err error) {
|
|
tx := DB.Begin()
|
|
if tx.Error != nil {
|
|
return nil, 0, tx.Error
|
|
}
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
tx.Rollback()
|
|
}
|
|
}()
|
|
|
|
query := tx.Model(&Redemption{})
|
|
|
|
if keyword != "" {
|
|
if id, err := strconv.Atoi(keyword); err == nil {
|
|
query = query.Where("id = ? OR name LIKE ?", id, keyword+"%")
|
|
} else {
|
|
query = query.Where("name LIKE ?", keyword+"%")
|
|
}
|
|
}
|
|
|
|
if status != "" {
|
|
now := common.GetTimestamp()
|
|
switch status {
|
|
case "expired":
|
|
query = query.Where(
|
|
"status = ? AND expired_time != 0 AND expired_time < ?",
|
|
common.RedemptionCodeStatusEnabled,
|
|
now,
|
|
)
|
|
case strconv.Itoa(common.RedemptionCodeStatusEnabled):
|
|
query = query.Where(
|
|
"status = ? AND (expired_time = 0 OR expired_time >= ?)",
|
|
common.RedemptionCodeStatusEnabled,
|
|
now,
|
|
)
|
|
case strconv.Itoa(common.RedemptionCodeStatusDisabled):
|
|
query = query.Where("status = ?", common.RedemptionCodeStatusDisabled)
|
|
case strconv.Itoa(common.RedemptionCodeStatusUsed):
|
|
query = query.Where("status = ?", common.RedemptionCodeStatusUsed)
|
|
}
|
|
}
|
|
|
|
// Get total count
|
|
err = query.Count(&total).Error
|
|
if err != nil {
|
|
tx.Rollback()
|
|
return nil, 0, err
|
|
}
|
|
|
|
// Get paginated data
|
|
err = query.Order("id desc").Limit(num).Offset(startIdx).Find(&redemptions).Error
|
|
if err != nil {
|
|
tx.Rollback()
|
|
return nil, 0, err
|
|
}
|
|
|
|
if err = tx.Commit().Error; err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
return redemptions, total, nil
|
|
}
|
|
|
|
func GetRedemptionById(id int) (*Redemption, error) {
|
|
if id == 0 {
|
|
return nil, common.NewMessage("ID is empty")
|
|
}
|
|
redemption := Redemption{Id: id}
|
|
var err error = nil
|
|
err = DB.First(&redemption, "id = ?", id).Error
|
|
return &redemption, err
|
|
}
|
|
|
|
func Redeem(key string, userId int) (quota int, err error) {
|
|
if key == "" {
|
|
return 0, errors.New("redemption code not provided")
|
|
}
|
|
if userId == 0 {
|
|
return 0, errors.New("invalid user id")
|
|
}
|
|
redemption := &Redemption{}
|
|
|
|
keyCol := "`key`"
|
|
if common.UsingMainDatabase(common.DatabaseTypePostgreSQL) {
|
|
keyCol = `"key"`
|
|
}
|
|
common.RandomSleep()
|
|
err = DB.Transaction(func(tx *gorm.DB) error {
|
|
err := lockForUpdate(tx).Where(keyCol+" = ?", key).First(redemption).Error
|
|
if err != nil {
|
|
return errors.New("invalid redemption code")
|
|
}
|
|
if redemption.Status != common.RedemptionCodeStatusEnabled {
|
|
return errors.New("redemption code already used")
|
|
}
|
|
if redemption.ExpiredTime != 0 && redemption.ExpiredTime < common.GetTimestamp() {
|
|
return errors.New("redemption code expired")
|
|
}
|
|
// Compare-and-swap on status: only the transaction that flips
|
|
// enabled -> used may credit quota, so a concurrent redeem of the
|
|
// same code loses here even without a row lock (e.g. on SQLite).
|
|
result := tx.Model(&Redemption{}).
|
|
Where("id = ? AND status = ?", redemption.Id, common.RedemptionCodeStatusEnabled).
|
|
Updates(map[string]any{
|
|
"redeemed_time": common.GetTimestamp(),
|
|
"status": common.RedemptionCodeStatusUsed,
|
|
"used_user_id": userId,
|
|
})
|
|
if result.Error != nil {
|
|
return result.Error
|
|
}
|
|
if result.RowsAffected == 0 {
|
|
return errors.New("redemption code already used")
|
|
}
|
|
return creditTopUpQuota(tx, userId, redemption.Quota, nil)
|
|
})
|
|
if err != nil {
|
|
common.SysError(common.LogText("redemption failed: %s", err.Error()))
|
|
return 0, ErrRedeemFailed
|
|
}
|
|
syncCreditUserQuotaCache(userId, redemption.Quota, common.LogText("redemption"))
|
|
RecordLog(userId, LogTypeTopup, common.NewMessage("Topped up {{quota}} with a redemption code, code ID {{id}}", map[string]any{"quota": logger.FormatQuota(redemption.Quota), "id": redemption.Id}))
|
|
return redemption.Quota, nil
|
|
}
|
|
|
|
func (redemption *Redemption) Insert() error {
|
|
if redemption.Quota <= 0 {
|
|
return errors.New("redemption quota must be positive")
|
|
}
|
|
if err := common.ValidateWalletQuota(redemption.Quota); err != nil {
|
|
return err
|
|
}
|
|
var err error
|
|
err = DB.Create(redemption).Error
|
|
return err
|
|
}
|
|
|
|
func (redemption *Redemption) SelectUpdate() error {
|
|
// This can update zero values
|
|
return DB.Model(redemption).Select("redeemed_time", "status").Updates(redemption).Error
|
|
}
|
|
|
|
// Update Make sure your token's fields is completed, because this will update non-zero values
|
|
func (redemption *Redemption) Update() error {
|
|
if redemption.Quota <= 0 {
|
|
return errors.New("redemption quota must be positive")
|
|
}
|
|
if err := common.ValidateWalletQuota(redemption.Quota); err != nil {
|
|
return err
|
|
}
|
|
var err error
|
|
err = DB.Model(redemption).Select("name", "status", "quota", "redeemed_time", "expired_time").Updates(redemption).Error
|
|
return err
|
|
}
|
|
|
|
func (redemption *Redemption) Delete() error {
|
|
var err error
|
|
err = DB.Delete(redemption).Error
|
|
return err
|
|
}
|
|
|
|
func DeleteRedemptionById(id int) (err error) {
|
|
if id == 0 {
|
|
return common.NewMessage("ID is empty")
|
|
}
|
|
redemption := Redemption{Id: id}
|
|
err = DB.Where(redemption).First(&redemption).Error
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return redemption.Delete()
|
|
}
|
|
|
|
func DeleteInvalidRedemptions() (int64, error) {
|
|
now := common.GetTimestamp()
|
|
result := DB.Where("status IN ? OR (status = ? AND expired_time != 0 AND expired_time < ?)", []int{common.RedemptionCodeStatusUsed, common.RedemptionCodeStatusDisabled}, common.RedemptionCodeStatusEnabled, now).Delete(&Redemption{})
|
|
return result.RowsAffected, result.Error
|
|
}
|
|
|
|
// BatchDeleteRedemptions soft-deletes the selected codes in one statement.
|
|
func BatchDeleteRedemptions(ids []int) (int64, error) {
|
|
if len(ids) == 0 || len(ids) > 1000 {
|
|
return 0, errors.New("select between 1 and 1000 redemption codes")
|
|
}
|
|
for _, id := range ids {
|
|
if id <= 0 {
|
|
return 0, errors.New("redemption IDs must be positive")
|
|
}
|
|
}
|
|
result := DB.Where("id IN ?", ids).Delete(&Redemption{})
|
|
return result.RowsAffected, result.Error
|
|
}
|