_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/parse: simplify parseAddressList

This commit is contained in:
Reto Brunner 2021-02-22 11:46:58 +01:00
parent c06a2e61fc
commit fda424bebc
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worker/lib/parse.go
View File

@ -198,23 +198,15 @@ func parseReceivedHeader(h *mail.Header) (time.Time, error) {
}
func parseAddressList(h *mail.Header, key string) ([]*mail.Address, error) {
var converted []*mail.Address
addrs, err := h.AddressList(key)
if err != nil {
if hdr, err := h.Text(key); err == nil {
return []*mail.Address{&mail.Address{
Name: hdr,
}}, nil
if err == nil {
return addrs, nil
}
hdr, err := h.Text(key)
if err != nil {
return nil, err
}
for _, addr := range addrs {
converted = append(converted, &mail.Address{
Name: addr.Name,
Address: addr.Address,
})
}
return converted, nil
return []*mail.Address{{Name: hdr}}, nil
}
// RawMessage is an interface that describes a raw message