pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-09-14 10:22:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(tgbot): render a disabled start-after-first-use client as days (#6500)

Browse Source 
A delayed-start expiry is stored as a negative duration, but the card checked
the disabled-client branch before the sign of that duration, so it printed the
epoch position (-2592000000 ms -> 1969-12-02) and labelled it an expire date.
The sign decides first now, which is how BuildClientDraftMessage in this file,
subscriptionExpiryFromClient and adjustTraffics already read the same value; the
Discord card is the one surface still reading it as unlimited, fixed in #6498.
This commit is contained in:
BlindMaster24
2026-09-13 20:48:14 +03:00
committed by GitHub
parent d45a09d634
commit e98be4f72a
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/web/service/tgbot/tgbot_client.go
View File

@@ -442,6 +442,11 @@ func (t *Tgbot) clientInfoMsg(
diff := traffic.ExpiryTime/1000 - now
if traffic.ExpiryTime == 0 {
expiryTime = t.I18nBot("tgbot.unlimited")
} else if traffic.ExpiryTime < 0 {
// A negative expiry counts days from first use, not a date; the disabled
// branch below would otherwise render it as a 1969 timestamp.
expiryTime = fmt.Sprintf("%d %s", traffic.ExpiryTime/-86400000, t.I18nBot("tgbot.days"))
flag = true
} else if diff > 172800 || !traffic.Enable {
expiryTime = time.Unix((traffic.ExpiryTime / 1000), 0).Format("2006-01-02 15:04:05")
if diff > 0 {
@@ -460,9 +465,6 @@ func (t *Tgbot) clientInfoMsg(
}
expiryTime += fmt.Sprintf(" (%s)", remainingTime)
}
} else if traffic.ExpiryTime < 0 {
expiryTime = fmt.Sprintf("%d %s", traffic.ExpiryTime/-86400000, t.I18nBot("tgbot.days"))
flag = true
} else {
expiryTime = fmt.Sprintf("%d %s", diff/3600, t.I18nBot("tgbot.hours"))
flag = true

58
internal/web/service/tgbot/tgbot_client_expiry_test.go Normal file
View File

@@ -0,0 +1,58 @@
package tgbot
import (
"encoding/json"
"path/filepath"
"strings"
"testing"
"github.com/mhsanaei/3x-ui/v3/internal/database"
"github.com/mhsanaei/3x-ui/v3/internal/web/locale"
"github.com/mhsanaei/3x-ui/v3/internal/xray"
"github.com/nicksnyder/go-i18n/v2/i18n"
"golang.org/x/text/language"
)
// clientInfoLocalizer renders the lines clientInfoMsg prints with the templates
// the translation files carry; without it I18n returns the bare keys.
func clientInfoLocalizer(t *testing.T) {
t.Helper()
bundle := i18n.NewBundle(language.MustParse("en-US"))
bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
_ = bundle.AddMessages(language.MustParse("en-US"),
&i18n.Message{ID: "tgbot.messages.email", Other: "Email: {{ .Email }}\r\n"},
&i18n.Message{ID: "tgbot.days", Other: "Days"},
&i18n.Message{ID: "tgbot.messages.expireIn", Other: "Expire In: {{ .Time }}\r\n"},
&i18n.Message{ID: "tgbot.messages.expire", Other: "Expire Date: {{ .Time }}\r\n"},
&i18n.Message{ID: "tgbot.wentWrong", Other: "went wrong"},
)
orig := locale.LocalizerBot
t.Cleanup(func() { locale.LocalizerBot = orig })
locale.LocalizerBot = i18n.NewLocalizer(bundle, "en-US")
}
// Regression test: a start-after-first-use client is stored as a negative duration,
// and a disabled one rendered it as a 1969 date.
func TestClientInfoShowsStartAfterFirstUseWhenDisabled(t *testing.T) {
if err := database.InitDB(filepath.Join(t.TempDir(), "x-ui.db")); err != nil {
t.Fatalf("InitDB: %v", err)
}
t.Cleanup(func() { _ = database.CloseDB() })
clientInfoLocalizer(t)
traffic := &xray.ClientTraffic{
Email: "trial@example.com",
Enable: false,
ExpiryTime: -30 * 24 * 60 * 60000,
}
out := (&Tgbot{}).clientInfoMsg(traffic, false, false, false, true, false, false)
if strings.Contains(out, "1969") {
t.Errorf("client info = %q, want the days left, not a 1969 date", out)
}
if !strings.Contains(out, "Expire In: 30 Days") {
t.Errorf("client info = %q, want it to contain %q", out, "Expire In: 30 Days")
}
}