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

create OriginalMail struct

Browse source
This commit is contained in:
Leszek Cimała 2020-01-08 21:44:14 +01:00 • committed by Drew DeVault
parent da6fb1a155
commit bf28e23933
8 changed files with 44 additions and 24 deletions
commands/msg
forward.go

10
commands/msg/forward.go
View file

@ -71,14 +71,16 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
"Subject": subject,
}
original := models.OriginalMail{}
addTab := func() (*widgets.Composer, error) {
if template != "" {
defaults["OriginalFrom"] = models.FormatAddresses(msg.Envelope.From)
defaults["OriginalDate"] = msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM")
original.From = models.FormatAddresses(msg.Envelope.From)
original.Date = msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM")
}
composer, err := widgets.NewComposer(aerc, aerc.Config(), acct.AccountConfig(),
acct.Worker(), template, defaults)
acct.Worker(), template, defaults, original)
if err != nil {
aerc.PushError("Error: " + err.Error())
return nil, err
@ -138,7 +140,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
store.FetchBodyPart(msg.Uid, msg.BodyStructure, []int{1}, func(reader io.Reader) {
buf := new(bytes.Buffer)
buf.ReadFrom(reader)
defaults["Original"] = buf.String()
original.Text = buf.String()
addTab()
})
}