From d00525e8873049191fe415180c6f8817994278e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E5=A3=AB=E6=B6=B5?= <630892807@qq.com>
Date: Sat, 16 May 2020 10:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/imap.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/imap.go b/tools/imap.go
index 7a5e28c..a224ffd 100644
--- a/tools/imap.go
+++ b/tools/imap.go
@@ -181,8 +181,9 @@ func GetMessage(server string, email string, password string,folder string,id ui
 	// Create a new mail reader
 	mr, err := mail.CreateReader(r)
 	if err != nil {
-		log.Fatal(err)
+		//log.Fatal(err)
 	}
+
 	var mailitem =new(MailItem)
 
 	// Print some info about the message
@@ -197,7 +198,8 @@ func GetMessage(server string, email string, password string,folder string,id ui
 	if from, err := header.AddressList("From"); err == nil {
 		log.Println("From:", from)
 		for _,address:=range from{
-			temp,_:=dec.DecodeHeader(address.String())
+			fromStr:=strings.ToLower(address.String())
+			temp,_:=dec.DecodeHeader(fromStr)
 			f+=" "+temp
 		}
 	}
@@ -206,12 +208,15 @@ func GetMessage(server string, email string, password string,folder string,id ui
 	if to, err := header.AddressList("To"); err == nil {
 		log.Println("To:", to)
 		for _,address:=range to{
-			temp,_:=dec.DecodeHeader(address.String())
+			toStr:=strings.ToLower(address.String())
+			temp,_:=dec.DecodeHeader(toStr)
 			t+=" "+temp
 		}
 	}
 	mailitem.To=t
+
 	if subject, err := header.Subject(); err == nil {
+		subject=strings.ToLower(subject)
 		s,err:=dec.Decode(subject)
 		if err!=nil{
 			s,_=dec.DecodeHeader(subject)
@@ -233,7 +238,6 @@ func GetMessage(server string, email string, password string,folder string,id ui
 			b, _ := ioutil.ReadAll(p.Body)
 			mailitem.Body+=string(b)
 			//body,_:=dec.Decode(string(b))
-			log.Println("Got text: ", string(b))
 		case *mail.AttachmentHeader:
 			// This is an attachment
 			filename, _ := h.Filename()
@@ -246,6 +250,7 @@ func GetMessage(server string, email string, password string,folder string,id ui
 func GetDecoder()*mime.WordDecoder{
 	dec :=new(mime.WordDecoder)
 	dec.CharsetReader= func(charset string, input io.Reader) (io.Reader, error) {
+		charset=strings.ToLower(charset)
 		switch charset {
 		case "gb2312":
 			content, err := ioutil.ReadAll(input)