From e123c66bc78e16ea32b94c8d0bb53141fd9bbefd Mon Sep 17 00:00:00 2001
From: JustSong <songquanpeng@foxmail.com>
Date: Sat, 13 May 2023 22:04:36 +0800
Subject: [PATCH] fix: fix SMTPFrom not updated in some cases (close #34)

---
 common/email.go | 3 +++
 model/option.go | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/email.go b/common/email.go
index bfe40f70..74f4cccd 100644
--- 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
index 87ab9196..6ca196a7 100644
--- 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 {