From a5c3df33a05e85d696a0a5b3aa785f072c4b3b59 Mon Sep 17 00:00:00 2001 From: AmoAlireza <79990596+AmoAlireza@users.noreply.github.com> Date: Wed, 6 Sep 2023 20:15:29 +0000 Subject: [PATCH] [sub] Show used traffic for unlimited users --- sub/subService.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sub/subService.go b/sub/subService.go index 4cb14030..7d48d032 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -787,20 +787,24 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin } } - // Get remained days if statsExist { if !stats.Enable { return fmt.Sprintf("⛔️N/A-%s", strings.Join(remark, "-")) } - if vol := stats.Total - (stats.Up + stats.Down); vol > 0 { - remark = append(remark, fmt.Sprintf("%s%s", common.FormatTraffic(vol), "📊")) - } - now := time.Now().Unix() - switch exp := stats.ExpiryTime / 1000; { - case exp > 0: - remark = append(remark, fmt.Sprintf("%d%s⏳", (exp-now)/86400, "Days")) - case exp < 0: - remark = append(remark, fmt.Sprintf("%d%s⏳", exp/-86400, "Days")) + if stats.ExpiryTime == 0 && stats.Total == 0 { + totalUsage := stats.Up + stats.Down + remark = append(remark, fmt.Sprintf("%s♾️", common.FormatTraffic(totalUsage))) + } else { + if vol := stats.Total - (stats.Up + stats.Down); vol > 0 { + remark = append(remark, fmt.Sprintf("%s%s", common.FormatTraffic(vol), "📊")) + } + now := time.Now().Unix() + switch exp := stats.ExpiryTime / 1000; { + case exp > 0: + remark = append(remark, fmt.Sprintf("%d%s⏳", (exp-now)/86400, "Days")) + case exp < 0: + remark = append(remark, fmt.Sprintf("%d%s⏳", exp/-86400, "Days")) + } } } }