mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-26 06:16:12 +00:00
feat(sub): add dynamic remark variables with Jalali date, transport, and status tokens (#5430)
* feat(sub): implement dynamic single-bracket remark variables with timezone-aware inline Jalali conversion
* Update .gitignore
* Update .gitignore
* merge: bring in origin/main commits to resolve conflict base
* fix(sub): address review issues in dynamic remark variables
- Add TIME_LEFT to unlimitedDropTokens so segments containing only
{TIME_LEFT} are dropped for unlimited clients (same as DAYS_LEFT)
- Remove dead uiSingleBraceRe variable (translateUISingleBrackets uses
a character scanner, not this regex)
- Change expireDateLabel to use time.Local instead of UTC, consistent
with jalaliExpireDateLabel
Co-authored-by: Sanaei <MHSanaei@users.noreply.github.com>
* fix
* fix
---------
Co-authored-by: MHSanaei <MHSanaei@users.noreply.github.com>
This commit is contained in:
@@ -103,7 +103,7 @@ func (s *SubService) buildEndpointLinks(
|
||||
}
|
||||
|
||||
// buildEndpointVmessLinks renders one VMess base64-JSON link per endpoint.
|
||||
func (s *SubService) buildEndpointVmessLinks(eps []ShareEndpoint, baseObj map[string]any, inbound *model.Inbound, email string) string {
|
||||
func (s *SubService) buildEndpointVmessLinks(eps []ShareEndpoint, baseObj map[string]any, inbound *model.Inbound, email string, transport string) string {
|
||||
var links strings.Builder
|
||||
for index, e := range eps {
|
||||
securityToApply, _ := baseObj["tls"].(string)
|
||||
@@ -111,7 +111,7 @@ func (s *SubService) buildEndpointVmessLinks(eps []ShareEndpoint, baseObj map[st
|
||||
securityToApply = e.ForceTls
|
||||
}
|
||||
newObj := cloneVmessShareObj(baseObj, e.ForceTls)
|
||||
newObj["ps"] = s.endpointRemark(inbound, email, e.ep)
|
||||
newObj["ps"] = s.endpointRemark(inbound, email, e.ep, transport)
|
||||
newObj["add"] = e.Address
|
||||
newObj["port"] = e.Port
|
||||
if e.ForceTls != "same" {
|
||||
|
||||
Reference in New Issue
Block a user