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

fix(sub): drive display remarks from the template and split multi-host subpage links

Browse Source 
Unify remark generation around the Remark Template. Display contexts (Clients-page QR/Info modals and the HTML sub info page) now render the template name-only client/identity part instead of a hardcoded fallback; the subscription body keeps the full template on a client first link and name-only thereafter. The default template gains the email token so the client email shows by default again (#5532).

BuildPageData now splits each multi-link entry (one link per host of an inbound) into a separate row, so the sub page no longer collapses several host links onto a single mangled line. QR captions on the Clients QR modal and the sub page reuse the link fragment remark.
This commit is contained in:
MHSanaei
2026-06-24 16:45:23 +02:00
parent 5dbd5b1d12
commit b0c1156dd6
8 changed files with 97 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/sub/service.go
+20 -6
View File
@@ -1634,11 +1634,12 @@ func cloneStringMap(source map[string]string) map[string]string {
}
// genRemark builds the remark for a non-host link (raw default / legacy
// externalProxy / synthetic JSON-Clash entry). In the subscription body a set
// remark template takes over; otherwise (and in every display context) the
// remark is just the config name (inbound remark, then extra).
// externalProxy / synthetic JSON-Clash entry). A set remark template drives it
// in both the body and display contexts (genTemplatedRemark renders the
// name-only part on displays); with no template it falls back to the inbound
// remark, extra and email joined by "-".
func (s *SubService) genRemark(inbound *model.Inbound, email string, extra string, transport string) string {
if s.remarkTemplate != "" && s.subscriptionBody {
if s.remarkTemplate != "" {
return s.genTemplatedRemark(inbound, s.lookupClient(inbound, email), extra, transport)
}
return fallbackRemark(inbound.Remark, extra, email)
@@ -2336,6 +2337,19 @@ func (s *SubService) BuildPageData(subId string, hostHeader string, traffic xray
datepicker = "gregorian"
}
pageLinks := make([]string, 0, len(subs))
pageEmails := make([]string, 0, len(subs))
for i, sub := range subs {
email := ""
if i < len(emails) {
email = emails[i]
}
for _, link := range splitLinkLines(sub) {
pageLinks = append(pageLinks, link)
pageEmails = append(pageEmails, email)
}
}
return PageData{
Host: hostHeader,
BasePath: basePath,
@@ -2357,8 +2371,8 @@ func (s *SubService) BuildPageData(subId string, hostHeader string, traffic xray
SubClashUrl: subClashURL,
SubTitle: subTitle,
SubSupportUrl: subSupportUrl,
Result: subs,
Emails: emails,
Result: pageLinks,
Emails: pageEmails,
}
}