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

Use SetAddressList for From header

This commit is contained in:
Drew DeVault 2019-06-05 13:58:07 -04:00
parent 6c6bb4c893
commit 92dc31bad0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/compose.go
View File

@ -217,8 +217,16 @@ func (c *Composer) PrepareHeader() (*mail.Header, []string, error) {
if date, err := header.Date(); err != nil || date == (time.Time{}) { if date, err := header.Date(); err != nil || date == (time.Time{}) {
header.SetDate(time.Now()) header.SetDate(time.Now())
} }
if from, _ := mhdr.Text("From"); from == "" { from := c.headers.from.input.String()
mhdr.SetText("From", c.headers.from.input.String()) from_addrs, err := gomail.ParseAddressList(from)
if err != nil {
return nil, nil, errors.Wrapf(err, "ParseAddressList(%s)", from)
} else {
var simon_from []*mail.Address
for _, addr := range from_addrs {
simon_from = append(simon_from, (*mail.Address)(addr))
}
header.SetAddressList("From", simon_from)
} }
if to := c.headers.to.input.String(); to != "" { if to := c.headers.to.input.String(); to != "" {
// Dammit Simon, this branch is 3x as long as it ought to be because // Dammit Simon, this branch is 3x as long as it ought to be because