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

fix(sub): render the full remark once per subscription, not once per credential (#6198)

Browse Source 
* fix(sub): scope full remarks to subscription identity

* fix(sub): preserve configured remark whitespace

---------

Co-authored-by: n0ctal <293235942+n0ctal@users.noreply.github.com>
This commit is contained in:
n0ctal
2026-08-14 23:00:51 +05:00
committed by GitHub
parent 0496c23a26
commit 3b19091547
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/remark_vars_test.go
+25 -2
View File
@@ -649,7 +649,6 @@ func TestUsageOnFirstLinkOnly_SingleBracket(t *testing.T) {
}
client := model.Client{Email: "alice@x"}
first := s.genTemplatedRemark(inbound, client, "", "ws")
s.usageShown["alice@x"] = true
second := s.genTemplatedRemark(inbound, client, "", "ws")
if !strings.Contains(first, "📊") {
t.Fatalf("first link should carry usage: %q", first)
@@ -675,7 +674,6 @@ func TestEmailOnFirstLinkOnly(t *testing.T) {
}
client := model.Client{Email: "alice@x"}
first := s.genTemplatedRemark(inbound, client, "", "ws")
s.usageShown["alice@x"] = true
second := s.genTemplatedRemark(inbound, client, "", "ws")
if !strings.Contains(first, "alice@x") {
t.Fatalf("first link should carry email: %q", first)
@@ -724,3 +722,28 @@ func TestIdentityOnAllLinks(t *testing.T) {
})
}
}
func TestSharedSubIDRemark_FullInfoOncePerSubscription(t *testing.T) {
const tmpl = "{{INBOUND}}-{{EMAIL}}"
s := &SubService{
remarkTemplate: tmpl,
subscriptionBody: true,
usageShown: map[string]bool{},
}
first := model.Client{Email: "first@example", SubID: "shared-sub"}
second := model.Client{Email: "second@example", SubID: "shared-sub"}
if got := s.genTemplatedRemark(&model.Inbound{Remark: "DE"}, first, "", "tcp"); got != "DE-first@example" {
t.Fatalf("first credential remark = %q", got)
}
if got := s.genTemplatedRemark(&model.Inbound{Remark: "FI"}, second, "", "tcp"); got != "FI" {
t.Fatalf("second credential with shared subId remark = %q, want identity suppressed", got)
}
}
func TestGenTemplatedRemarkPreservesConfiguredOuterWhitespace(t *testing.T) {
s := &SubService{remarkTemplate: " {{INBOUND}} ", subscriptionBody: true, usageShown: map[string]bool{}}
got := s.genTemplatedRemark(&model.Inbound{Remark: "DE"}, model.Client{Email: "user@example.test"}, "", "tcp")
if got != " DE " {
t.Fatalf("remark = %q, want configured outer whitespace preserved", got)
}
}