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

songquanpeng · songquanpeng · commit e123c66bc78e · 2023-05-13T22:04:36.000+08:00
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 {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func SendEmail(subject string, receiver string, content string) error {`
	`12`	`+ if SMTPFrom == "" { // for compatibility`
	`13`	`+ SMTPFrom = SMTPAccount`
	`14`	`+ }`
`12`	`15`	`encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject)))`
`13`	`16`	`mail := []byte(fmt.Sprintf("To: %s\r\n"+`
`14`	`17`	`"From: %s<%s>\r\n"+`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,6 @@ func InitOptionMap() {`
`60`	`60`	`common.SysError("Failed to update option map: " + err.Error())`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`- if common.SMTPFrom == "" { // for compatibility`
`64`		`- common.SMTPFrom = common.SMTPAccount`
`65`		`- }`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`func UpdateOption(key string, value string) error {`