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

models: add RFC822 headers to OriginalMail

This commit is contained in:
Reto Brunner 2020-11-03 07:39:36 +01:00
parent e7d450c61d
commit 3ad3a5ede0
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
commands/msg/forward.go
View File

@ -74,14 +74,13 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
"To": to, "To": to,
"Subject": subject, "Subject": subject,
} }
original := models.OriginalMail{} original := models.OriginalMail{
From: format.FormatAddresses(msg.Envelope.From),
addTab := func() (*widgets.Composer, error) { Date: msg.Envelope.Date,
if template != "" { RFC822Headers: msg.RFC822Headers,
original.From = format.FormatAddresses(msg.Envelope.From)
original.Date = msg.Envelope.Date
} }
addTab := func() (*widgets.Composer, error) {
composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(), composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(),
acct.Worker(), template, defaults, original) acct.Worker(), template, defaults, original)
if err != nil { if err != nil {

11
commands/msg/reply.go
View File

@ -152,14 +152,13 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
"Subject": subject, "Subject": subject,
"In-Reply-To": msg.Envelope.MessageId, "In-Reply-To": msg.Envelope.MessageId,
} }
original := models.OriginalMail{} original := models.OriginalMail{
From: format.FormatAddresses(msg.Envelope.From),
addTab := func() error { Date: msg.Envelope.Date,
if template != "" { RFC822Headers: msg.RFC822Headers,
original.From = format.FormatAddresses(msg.Envelope.From)
original.Date = msg.Envelope.Date
} }
addTab := func() error {
composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), composer, err := widgets.NewComposer(aerc, acct, aerc.Config(),
acct.AccountConfig(), acct.Worker(), template, defaults, original) acct.AccountConfig(), acct.Worker(), template, defaults, original)
if err != nil { if err != nil {

1
models/models.go
View File

@ -138,4 +138,5 @@ type OriginalMail struct {
From string From string
Text string Text string
MIMEType string MIMEType string
RFC822Headers *mail.Header
} }