fix: fix SMTPFrom not updated in some cases (close #34)

songquanpeng · May 13, 2023 · e123c66 · e123c66
1 parent 9edc82b
commit e123c66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/email.go b/common/email.go
@@ -9,6 +9,9 @@ import (
 )
 
 func SendEmail(subject string, receiver string, content string) error {
+	if SMTPFrom == "" { // for compatibility
+		SMTPFrom = SMTPAccount
+	}
 	encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject)))
 	mail := []byte(fmt.Sprintf("To: %s\r\n"+
 		"From: %s<%s>\r\n"+

diff --git a/model/option.go b/model/option.go
@@ -60,9 +60,6 @@ func InitOptionMap() {
 			common.SysError("Failed to update option map: " + err.Error())
 		}
 	}
-	if common.SMTPFrom == "" { // for compatibility
-		common.SMTPFrom = common.SMTPAccount
-	}
 }
 
 func UpdateOption(key string, value string) error {