Update vendor/

vendor/github.com/emersion/go-imap/commands/fetch.go

@@ -10,21 +10,21 @@ import (
 // Fetch is a FETCH command, as defined in RFC 3501 section 6.4.5.
 type Fetch struct {
 	SeqSet *imap.SeqSet
-	Items  []string
+	Items  []imap.FetchItem
 }
 
 func (cmd *Fetch) Command() *imap.Command {
 	items := make([]interface{}, len(cmd.Items))
 	for i, item := range cmd.Items {
-		if section, err := imap.NewBodySectionName(item); err == nil {
+		if section, err := imap.ParseBodySectionName(item); err == nil {
 			items[i] = section
 		} else {
-			items[i] = item
+			items[i] = string(item)
 		}
 	}
 
 	return &imap.Command{
-		Name:      imap.Fetch,
+		Name:      "FETCH",
 		Arguments: []interface{}{cmd.SeqSet, items},
 	}
 }
@@ -34,33 +34,22 @@ func (cmd *Fetch) Parse(fields []interface{}) error {
 		return errors.New("No enough arguments")
 	}
 
-	seqset, ok := fields[0].(string)
-	if !ok {
-		return errors.New("Sequence set must be a string")
-	}
-
 	var err error
-	if cmd.SeqSet, err = imap.NewSeqSet(seqset); err != nil {
+	if seqset, ok := fields[0].(string); !ok {
+		return errors.New("Sequence set must be an atom")
+	} else if cmd.SeqSet, err = imap.ParseSeqSet(seqset); err != nil {
 		return err
 	}
 
 	switch items := fields[1].(type) {
 	case string: // A macro or a single item
-		switch strings.ToUpper(items) {
-		case "ALL":
-			cmd.Items = []string{"FLAGS", "INTERNALDATE", "RFC822.SIZE", "ENVELOPE"}
-		case "FAST":
-			cmd.Items = []string{"FLAGS", "INTERNALDATE", "RFC822.SIZE"}
-		case "FULL":
-			cmd.Items = []string{"FLAGS", "INTERNALDATE", "RFC822.SIZE", "ENVELOPE", "BODY"}
-		default:
-			cmd.Items = []string{strings.ToUpper(items)}
-		}
+		cmd.Items = imap.FetchItem(strings.ToUpper(items)).Expand()
 	case []interface{}: // A list of items
-		cmd.Items = make([]string, len(items))
-		for i, v := range items {
-			item, _ := v.(string)
-			cmd.Items[i] = strings.ToUpper(item)
+		cmd.Items = make([]imap.FetchItem, 0, len(items))
+		for _, v := range items {
+			itemStr, _ := v.(string)
+			item := imap.FetchItem(strings.ToUpper(itemStr))
+			cmd.Items = append(cmd.Items, item.Expand()...)
 		}
 	default:
 		return errors.New("Items must be either a string or a list")