aboutsummaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
Diffstat (limited to 'commands')
-rw-r--r--commands/account/rmdir.go1
-rw-r--r--commands/compose/send.go36
-rw-r--r--commands/help.go1
3 files changed, 36 insertions, 2 deletions
diff --git a/commands/account/rmdir.go b/commands/account/rmdir.go
index e45a7a7a..9f6fedeb 100644
--- a/commands/account/rmdir.go
+++ b/commands/account/rmdir.go
@@ -80,6 +80,7 @@ func (RemoveDir) Execute(aerc *widgets.Aerc, args []string) error {
acct.Worker().PostAction(&types.RemoveDirectory{
Directory: curDir,
+ Quiet: force,
}, func(msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
diff --git a/commands/compose/send.go b/commands/compose/send.go
index eeea96cd..7eeb124c 100644
--- a/commands/compose/send.go
+++ b/commands/compose/send.go
@@ -174,6 +174,8 @@ func send(aerc *widgets.Aerc, composer *widgets.Composer, ctx sendCtx,
fallthrough
case "smtps":
sender, err = newSmtpSender(ctx)
+ case "jmap":
+ sender, err = newJmapSender(composer, header, ctx)
case "":
sender, err = newSendmailSender(ctx)
default:
@@ -186,7 +188,7 @@ func send(aerc *widgets.Aerc, composer *widgets.Composer, ctx sendCtx,
var writer io.Writer = sender
- if config.CopyTo != "" {
+ if config.CopyTo != "" && ctx.scheme != "jmap" {
writer = io.MultiWriter(writer, &copyBuf)
}
err = composer.WriteMessage(header, writer)
@@ -210,7 +212,7 @@ func send(aerc *widgets.Aerc, composer *widgets.Composer, ctx sendCtx,
aerc.NewTab(composer, tabName)
return
}
- if config.CopyTo != "" {
+ if config.CopyTo != "" && ctx.scheme != "jmap" {
aerc.PushStatus("Copying to "+config.CopyTo, 10*time.Second)
errch := copyToSent(composer.Worker(), config.CopyTo,
copyBuf.Len(), &copyBuf)
@@ -512,6 +514,36 @@ func connectSmtps(host string) (*smtp.Client, error) {
return conn, nil
}
+func newJmapSender(
+ composer *widgets.Composer, header *mail.Header, ctx sendCtx,
+) (io.WriteCloser, error) {
+ var writer io.WriteCloser
+ done := make(chan error)
+
+ composer.Worker().PostAction(
+ &types.StartSendingMessage{Header: header},
+ func(msg types.WorkerMessage) {
+ switch msg := msg.(type) {
+ case *types.Done:
+ return
+ case *types.Unsupported:
+ done <- fmt.Errorf("unsupported by worker")
+ case *types.Error:
+ done <- msg.Error
+ case *types.MessageWriter:
+ writer = msg.Writer
+ default:
+ done <- fmt.Errorf("unexpected worker message: %#v", msg)
+ }
+ close(done)
+ },
+ )
+
+ err := <-done
+
+ return writer, err
+}
+
func copyToSent(worker *types.Worker, dest string,
n int, msg io.Reader,
) <-chan error {
diff --git a/commands/help.go b/commands/help.go
index b09e1143..b2654ab5 100644
--- a/commands/help.go
+++ b/commands/help.go
@@ -14,6 +14,7 @@ var pages = []string{
"binds",
"config",
"imap",
+ "jmap",
"notmuch",
"search",
"sendmail",