blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

format: remove parse methods, use the one from go-message

Browse source
This commit is contained in:
Reto Brunner 2020-11-10 20:35:47 +01:00
parent 20ec2c8eeb
commit 24f1c575ae
3 changed files with 9 additions and 38 deletions
commands
compose
send.go
msg
reply.go

3
commands/compose/send.go
View file

@ -16,7 +16,6 @@ import (
"github.com/pkg/errors"
"git.sr.ht/~sircmpwn/aerc/lib"
"git.sr.ht/~sircmpwn/aerc/lib/format"
"git.sr.ht/~sircmpwn/aerc/models"
"git.sr.ht/~sircmpwn/aerc/widgets"
"git.sr.ht/~sircmpwn/aerc/worker/types"
@ -84,7 +83,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
if config.From == "" {
return errors.New("No 'From' configured for this account")
}
from, err := format.ParseAddress(config.From)
from, err := mail.ParseAddress(config.From)
if err != nil {
return errors.Wrap(err, "ParseAddress(config.From)")
}

11
commands/msg/reply.go
View file

@ -61,13 +61,16 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
return errors.New("No account selected")
}
conf := acct.AccountConfig()
from, err := format.ParseAddress(conf.From)
from, err := mail.ParseAddress(conf.From)
if err != nil {
return err
}
aliases, err := format.ParseAddressList(conf.Aliases)
if err != nil {
return err
var aliases []*mail.Address
if conf.Aliases != "" {
aliases, err = mail.ParseAddressList(conf.Aliases)
if err != nil {
return err
}
}
store := widget.Store()