mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-09-16 15:17:14 +00:00
2fcd28c1bc
* refactor(tgbot): make the add-client expiry presets say what they do The wizard's "Add N days" buttons were a copy of the renewal handler, whose accumulate branch they cleared two lines later: the branch tested a value the line above had just set to zero, so it was dead and only the "set N days from first use" path was reachable. That reads as an accident, and the automated review of #6499 flagged it twice. The wizard keeps the term it sets, which is now the code: a create flow has no expiry to add to, the custom keypad lands in this same case, and a corrected number has to replace the one it follows. 0 stays the Unlimited button. The renewal handler (reset_exp_c) genuinely adds to the client's remaining time and is unchanged. * refactor(tgbot): fold in the review of the expiry-preset change The test now starts every row from a term a preset could have left, so each row fails on its own under the accumulate semantics rather than depending on the row before it, and it reuses the package's draft helpers instead of a second copy. The wizard presets drop the "Add" verb they never honoured; the renewal keyboard keeps it, where reset_exp_c really does add to the remaining time.
112 lines
3.5 KiB
Go
112 lines
3.5 KiB
Go
package tgbot
|
|
|
|
import (
|
|
"encoding/json"
|
|
"html"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/internal/web/locale"
|
|
|
|
"github.com/mymmrac/telego"
|
|
"github.com/nicksnyder/go-i18n/v2/i18n"
|
|
"golang.org/x/text/language"
|
|
)
|
|
|
|
// clientDraftTestChatID is a chat id no other test drives, so the draft this
|
|
// test fills cannot leak into them.
|
|
const clientDraftTestChatID = -9001
|
|
|
|
// Regression test: the draft is sent with ParseMode HTML, so Markdown markers
|
|
// were rendered literally and an unescaped value could break the whole message.
|
|
func TestClientDraftMessageRendersHTML(t *testing.T) {
|
|
draft := addClientDrafts.forChat(clientDraftTestChatID)
|
|
t.Cleanup(func() { addClientDrafts.reset(clientDraftTestChatID) })
|
|
|
|
draft.email = "a@b.c"
|
|
draft.comment = "<b>promo</b> & <10 GB>"
|
|
draft.tgID = "42"
|
|
draft.totalGB, draft.limitIP, draft.expiryTime = 0, 0, 0
|
|
draft.receiverInboundIDs = nil
|
|
|
|
out := (&Tgbot{}).BuildClientDraftMessage(draft)
|
|
|
|
if !strings.Contains(out, "<b>New client draft</b>") {
|
|
t.Errorf("draft title is not HTML markup: %q", out)
|
|
}
|
|
if strings.Contains(out, "*New client draft*") || strings.Contains(out, "`") {
|
|
t.Errorf("draft still carries Markdown markers: %q", out)
|
|
}
|
|
if strings.Contains(out, "<b>promo</b>") {
|
|
t.Errorf("raw comment markup reached the message: %q", out)
|
|
}
|
|
if !strings.Contains(out, html.EscapeString(draft.comment)) {
|
|
t.Errorf("comment is not HTML-escaped: %q", out)
|
|
}
|
|
}
|
|
|
|
// draftLocalizer registers only the messages a wizard test drives, with the
|
|
// templates the translation files carry; without it I18n returns the bare key.
|
|
func draftLocalizer(t *testing.T, msgs ...*i18n.Message) {
|
|
t.Helper()
|
|
bundle := i18n.NewBundle(language.MustParse("en-US"))
|
|
bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
|
|
_ = bundle.AddMessages(language.MustParse("en-US"), msgs...)
|
|
orig := locale.LocalizerBot
|
|
t.Cleanup(func() { locale.LocalizerBot = orig })
|
|
locale.LocalizerBot = i18n.NewLocalizer(bundle, "en-US")
|
|
}
|
|
|
|
// Regression test: the wizard's own prompts are HTML-parsed as well, so the
|
|
// draft value they echo has to be escaped exactly like the draft card.
|
|
func TestAddClientPromptsEscapeDraftValues(t *testing.T) {
|
|
draftLocalizer(t,
|
|
&i18n.Message{ID: "tgbot.messages.email_prompt", Other: "📧 Default Email: {{ .ClientEmail }}\n\nEnter your email."},
|
|
&i18n.Message{ID: "tgbot.messages.comment_prompt", Other: "💬 Default Comment: {{ .ClientComment }}\n\nEnter your comment."},
|
|
)
|
|
url, texts := draftTexts(t)
|
|
swapTestBot(t, url)
|
|
|
|
draft := addClientDrafts.forChat(1)
|
|
origRunning := isRunning
|
|
t.Cleanup(func() {
|
|
addClientDrafts.reset(1)
|
|
isRunning = origRunning
|
|
})
|
|
isRunning = true
|
|
|
|
cases := []struct {
|
|
name string
|
|
data string
|
|
value string
|
|
}{
|
|
{"email prompt", "add_client_ch_default_email", "long<name>@example.com"},
|
|
{"comment prompt", "add_client_ch_default_comment", "promo <b>tag</b>"},
|
|
}
|
|
tb := &Tgbot{}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
draft.email, draft.comment = tc.value, tc.value
|
|
|
|
tb.answerCallback(&telego.CallbackQuery{
|
|
ID: "q1",
|
|
From: telego.User{ID: 1},
|
|
Data: tc.data,
|
|
Message: &telego.Message{Chat: telego.Chat{ID: 1}},
|
|
}, true) // admin
|
|
|
|
sent := texts(1)
|
|
if len(sent) == 0 {
|
|
t.Fatalf("no prompt was sent for %s", tc.data)
|
|
}
|
|
got := sent[len(sent)-1]
|
|
if strings.Contains(got, tc.value) {
|
|
t.Errorf("prompt = %q, want the draft value escaped", got)
|
|
}
|
|
if !strings.Contains(got, html.EscapeString(tc.value)) {
|
|
t.Errorf("prompt = %q, want it to contain %q", got, html.EscapeString(tc.value))
|
|
}
|
|
})
|
|
}
|
|
}
|