From 8378925f2697509aeb391b8def993e9c3300c01f Mon Sep 17 00:00:00 2001
From: Vladislav Kasperov <Kasp42@users.noreply.github.com>
Date: Sun, 3 May 2026 13:43:04 +0300
Subject: [PATCH] Optimize subEmailInRemark setting lookup

---
 sub/subService.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/sub/subService.go b/sub/subService.go
index b7edd7a1..4e6e9a5d 100644
--- a/sub/subService.go
+++ b/sub/subService.go
@@ -28,6 +28,7 @@ type SubService struct {
 	showInfo       bool
 	remarkModel    string
 	datepicker     string
+	emailInRemark  bool
 	inboundService service.InboundService
 	settingService service.SettingService
 }
@@ -35,8 +36,9 @@ type SubService struct {
 // NewSubService creates a new subscription service with the given configuration.
 func NewSubService(showInfo bool, remarkModel string) *SubService {
 	return &SubService{
-		showInfo:    showInfo,
-		remarkModel: remarkModel,
+		showInfo:      showInfo,
+		remarkModel:   remarkModel,
+		emailInRemark: true,
 	}
 }
 
@@ -60,6 +62,11 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, int64, xray.C
 	if err != nil {
 		s.datepicker = "gregorian"
 	}
+
+	s.emailInRemark, err = s.settingService.GetSubEmailInRemark()
+	if err != nil {
+		s.emailInRemark = true
+	}
 	for _, inbound := range inbounds {
 		clients, err := s.inboundService.GetClients(inbound)
 		if err != nil {
@@ -825,11 +832,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin
 		'e': "",
 		'o': "",
 	}
-	emailInRemark, err := s.settingService.GetSubEmailInRemark()
-	if err != nil {
-		emailInRemark = true
-	}
-	if len(email) > 0 && emailInRemark {
+	if len(email) > 0 && s.emailInRemark {
 		orders['e'] = email
 	}
 	if len(inbound.Remark) > 0 {