Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-12 13:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update subService.go

Browse source
This commit is contained in:
samvel2406 2025-03-02 02:05:38 +03:00 committed by GitHub
parent ea19fb8ff6
commit 497b43fc41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sub/subService.go
View file

@ -868,7 +868,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
'o': "", 'o': "",
} }
if len(email) > 0 { if len(email) > 0 {
orders['e'] = email orders['e'] = "🇷🇺 Москва - 🇩🇪 Германия"
} }
if len(inbound.Remark) > 0 { if len(inbound.Remark) > 0 {
orders['i'] = inbound.Remark orders['i'] = inbound.Remark
@ -900,7 +900,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
// Get remained days // Get remained days
if statsExist { if statsExist {
if !stats.Enable { if !stats.Enable {
return fmt.Sprintf("⛔️N/A%s%s", separationChar, strings.Join(remark, separationChar)) return "Срок действия подписки истёк ⛔️"
} }
if vol := stats.Total - (stats.Up + stats.Down); vol > 0 { if vol := stats.Total - (stats.Up + stats.Down); vol > 0 {
remark = append(remark, fmt.Sprintf("%s%s", common.FormatTraffic(vol), "📊")) remark = append(remark, fmt.Sprintf("%s%s", common.FormatTraffic(vol), "📊"))
@ -912,32 +912,12 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
days := remainingSeconds / 86400 days := remainingSeconds / 86400
hours := (remainingSeconds % 86400) / 3600 hours := (remainingSeconds % 86400) / 3600
minutes := (remainingSeconds % 3600) / 60 minutes := (remainingSeconds % 3600) / 60
if days > 0 { remark = append(remark, fmt.Sprintf("%dд.,%dч., %dм. ⏳", days, hours, minutes))
if hours > 0 {
remark = append(remark, fmt.Sprintf("%dD,%dH⏳", days, hours))
} else {
remark = append(remark, fmt.Sprintf("%dD⏳", days))
}
} else if hours > 0 {
remark = append(remark, fmt.Sprintf("%dH⏳", hours))
} else {
remark = append(remark, fmt.Sprintf("%dM⏳", minutes))
}
case exp < 0: case exp < 0:
days := exp / -86400 days := exp / -86400
hours := (exp % -86400) / 3600 hours := (exp % -86400) / 3600
minutes := (exp % -3600) / 60 minutes := (exp % -3600) / 60
if days > 0 { remark = append(remark, fmt.Sprintf("%dд.,%dч., %dм. ⏳", days, hours, minutes))
if hours > 0 {
remark = append(remark, fmt.Sprintf("%dD,%dH⏳", days, hours))
} else {
remark = append(remark, fmt.Sprintf("%dD⏳", days))
}
} else if hours > 0 {
remark = append(remark, fmt.Sprintf("%dH⏳", hours))
} else {
remark = append(remark, fmt.Sprintf("%dM⏳", minutes))
}
} }
} }
} }