aboutsummaryrefslogtreecommitdiffstats
path: root/commands/account/compose.go
diff options
context:
space:
mode:
authorRobin Jarry <robin@jarry.cc>2023-07-04 12:18:55 +0200
committerRobin Jarry <robin@jarry.cc>2023-07-17 10:23:36 +0200
commit624fb681a8ceeceecb898627503bf6cf73c2c6e8 (patch)
tree68cc73e04e0c2100795b9bfb0720bbc8f28f431f /commands/account/compose.go
parent21f14c550a44a4b9207ca27b81976f92a7d26784 (diff)
downloadaerc-624fb681a8ceeceecb898627503bf6cf73c2c6e8.tar.gz
compose: only allow setting content at creation
Add a parameter for the initial value of the body to be inserted *before* the signature when composing a message. Make AppendContents and SetContents private methods to ensure there is no other way to change the composer contents from the outside after creation. Signed-off-by: Robin Jarry <robin@jarry.cc> Tested-by: Bence Ferdinandy <bence@ferdinandy.com> Tested-by: Koni Marti <koni.marti@gmail.com>
Diffstat (limited to 'commands/account/compose.go')
-rw-r--r--commands/account/compose.go8
1 files changed, 1 insertions, 7 deletions
diff --git a/commands/account/compose.go b/commands/account/compose.go
index a8b16791..3c603f34 100644
--- a/commands/account/compose.go
+++ b/commands/account/compose.go
@@ -11,7 +11,6 @@ import (
"github.com/emersion/go-message/mail"
"git.sr.ht/~rjarry/aerc/config"
- "git.sr.ht/~rjarry/aerc/log"
"git.sr.ht/~rjarry/aerc/widgets"
"git.sr.ht/~sircmpwn/getopt"
)
@@ -53,16 +52,11 @@ func (Compose) Execute(aerc *widgets.Aerc, args []string) error {
composer, err := widgets.NewComposer(aerc, acct,
acct.AccountConfig(), acct.Worker(),
- template, &headers, nil)
+ template, &headers, nil, msg.Body)
if err != nil {
return err
}
composer.Tab = aerc.NewTab(composer, "New email")
- go func() {
- defer log.PanicHandler()
-
- composer.AppendContents(msg.Body)
- }()
return nil
}