Merge branch 'master' into go-message

emersion · Jul 4, 2017 · 6bd6447 · 6bd6447
2 parents 40b97f8 + 9461062
commit 6bd6447
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/backend/imap/attachments.go b/backend/imap/attachments.go
@@ -37,7 +37,7 @@ func (b *Messages) ReadAttachment(user, id string) (att *backend.Attachment, out
 	}
 	defer unlock()
 
-	seqset, _ := imap.NewSeqSet("")
+	seqset := new(imap.SeqSet)
 	seqset.AddNum(uid)
 
 	items := []string{"BODY.PEEK["+partId+"]"}

diff --git a/backend/imap/events.go b/backend/imap/events.go
@@ -37,7 +37,7 @@ func (b *Events) processUpdate(u *update) error {
 	}
 
 	mailbox := c.Mailbox.Name
-	seqset, _ := imap.NewSeqSet("")
+	seqset := new(imap.SeqSet)
 	seqset.AddNum(u.seqnbr)
 
 	ch := make(chan *imap.Message, 1)

diff --git a/backend/imap/messages.go b/backend/imap/messages.go
@@ -41,7 +41,7 @@ func (be *Messages) GetMessage(user, id string) (msg *backend.Message, err error
 	}
 	defer unlock()
 
-	seqset, _ := imap.NewSeqSet("")
+	seqset := new(imap.SeqSet)
 	seqset.AddNum(uid)
 	items := []string{imap.FlagsMsgAttr, imap.SizeMsgAttr, imap.BodyStructureMsgAttr, "RFC822.HEADER"}
 
@@ -161,7 +161,7 @@ func (b *Messages) ListMessages(user string, filter *backend.MessagesFilter) (ms
 		return
 	}
 
-	set, _ := imap.NewSeqSet("")
+	set := new(imap.SeqSet)
 	if filter.Limit > 0 && filter.Page >= 0 {
 		from := filter.Limit * filter.Page
 		to := filter.Limit * (filter.Page + 1)
@@ -398,7 +398,7 @@ func (be *Messages) UpdateMessage(user string, update *backend.MessageUpdate) (m
 		return
 	}
 
-	seqset, _ := imap.NewSeqSet("")
+	seqset := new(imap.SeqSet)
 	seqset.AddNum(uid)
 
 	msg, err = be.GetMessage(user, update.Message.ID)
@@ -545,7 +545,7 @@ func (b *Messages) DeleteMessage(user, id string) (err error) {
 		return
 	}
 
-	seqset, _ := imap.NewSeqSet("")
+	seqset := new(imap.SeqSet)
 	seqset.AddNum(uid)
 
 	err = b.deleteMessages(user, seqset)