From 903d436ab8c3a83ebd3972650312b9b72e1d49bc Mon Sep 17 00:00:00 2001 From: Koni Marti Date: Wed, 27 Jul 2022 13:34:46 +0200 Subject: mailto: add account query parameter Specify an account parameter in the mailto argument. If not specified, the selected account is used as default. Example: $ aerc 'mailto:user@host?account=Fastmail' Suggested-by: staceee Signed-off-by: Koni Marti Acked-by: Robin Jarry --- widgets/aerc.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'widgets/aerc.go') diff --git a/widgets/aerc.go b/widgets/aerc.go index 90e7a9e5..fb80c391 100644 --- a/widgets/aerc.go +++ b/widgets/aerc.go @@ -532,13 +532,9 @@ func (aerc *Aerc) RegisterChoices(choices []Choice) { } func (aerc *Aerc) Mailto(addr *url.URL) error { - acct := aerc.SelectedAccount() - if acct == nil { - return errors.New("No account selected") - } - var subject string var body string + var acctName string h := &mail.Header{} to, err := mail.ParseAddressList(addr.Opaque) if err != nil && addr.Opaque != "" { @@ -547,6 +543,8 @@ func (aerc *Aerc) Mailto(addr *url.URL) error { h.SetAddressList("to", to) for key, vals := range addr.Query() { switch strings.ToLower(key) { + case "account": + acctName = strings.Join(vals, "") case "bcc": list, err := mail.ParseAddressList(strings.Join(vals, ",")) if err != nil { @@ -578,6 +576,17 @@ func (aerc *Aerc) Mailto(addr *url.URL) error { } } + acct := aerc.SelectedAccount() + if acctName != "" { + if a, ok := aerc.accounts[acctName]; ok && a != nil { + acct = a + } + } + + if acct == nil { + return errors.New("No account selected") + } + composer, err := NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(), acct.Worker(), "", h, models.OriginalMail{}) if err != nil { -- cgit