postpone: change recall/postpone logic for custom folders

Change `:recall -f` behavior so it remembers the source folder the
message is taken from and the further `:postpone` call can save it back
to that folder.

Change the `:recall` tab closing behavior, so it no longer asks if the
recalled message needs to be deleted. This is now done automatically.

Add an optional `-t <folder>` parameter to `:postpone`, so the message
can be saved in a different folder.

Change `:postpone` behavior, so it checks if the message was
force-recalled from a different folder, and then it saves the message
there.

The "breaking" change is made to the closing handler of the recalled
message tab. There was a confirmation dialog that asked if the recalled
message needs to be deleted. This is now removed and replaced with a
pretty simple logic: if the recalled message is either sent or
re-postponed - it is safe to delete the original. Otherwise (if the
recalled message editing is discarded, any other reasons?) the message
is left intact, there is no need to ask for deleting it. If the user
don't need that message - they can delete it manually.

Another "breaking" change to the same handler is that it always works
this way regardless of the curently selected folder. There was an `if`
that checked that, but as the recalled messages are now only deleted if
they are re-sent or re-postponed, it seems that there is no need to
check the current folder anymore.

Signed-off-by: Vitaly Ovchinnikov <v@postbox.nz>
Acked-by: Robin Jarry <robin@jarry.cc>

2 files changed, 44 insertions, 27 deletions

diff --git a/commands/compose/postpone.go b/commands/compose/postpone.go
index dad76877..9cb337bc 100644
--- a/commands/compose/postpone.go
+++ b/commands/compose/postpone.go
@@ -7,6 +7,9 @@ import (
 	"github.com/miolini/datacounter"
 	"github.com/pkg/errors"
 
+	"git.sr.ht/~sircmpwn/getopt"
+
+	"git.sr.ht/~rjarry/aerc/commands"
 	"git.sr.ht/~rjarry/aerc/log"
 	"git.sr.ht/~rjarry/aerc/models"
 	"git.sr.ht/~rjarry/aerc/widgets"
@@ -23,14 +26,28 @@ func (Postpone) Aliases() []string {
 	return []string{"postpone"}
 }
 
+func (Postpone) Options() string {
+	return "t:"
+}
+
+func (Postpone) CompleteOption(aerc *widgets.Aerc, r rune, arg string) []string {
+	var valid []string
+	if r == 't' {
+		valid = commands.GetFolders(aerc, []string{arg})
+	}
+	return commands.CompletionFromList(aerc, valid, []string{arg})
+}
+
 func (Postpone) Complete(aerc *widgets.Aerc, args []string) []string {
 	return nil
 }
 
-func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
-	if len(args) != 1 {
-		return errors.New("Usage: postpone")
+func (p Postpone) Execute(aerc *widgets.Aerc, args []string) error {
+	opts, optind, err := getopt.Getopts(args, p.Options())
+	if err != nil {
+		return err
 	}
+
 	acct := aerc.SelectedAccount()
 	if acct == nil {
 		return errors.New("No account selected")
@@ -43,7 +60,21 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 	config := composer.Config()
 	tabName := tab.Name
 
-	if config.Postpone == "" {
+	targetFolder := config.Postpone
+	if composer.RecalledFrom() != "" {
+		targetFolder = composer.RecalledFrom()
+	}
+	for _, opt := range opts {
+		if opt.Option == 't' {
+			targetFolder = opt.Value
+		}
+	}
+	args = args[optind:]
+
+	if len(args) != 0 {
+		return errors.New("Usage: postpone [-t <folder>]")
+	}
+	if targetFolder == "" {
 		return errors.New("No Postpone location configured")
 	}
 
@@ -59,7 +90,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 	dirs := acct.Directories().List()
 	alreadyCreated := false
 	for _, dir := range dirs {
-		if dir == config.Postpone {
+		if dir == targetFolder {
 			alreadyCreated = true
 			break
 		}
@@ -94,7 +125,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 		}
 		nbytes := int(ctr.Count())
 		worker.PostAction(&types.AppendMessage{
-			Destination: config.Postpone,
+			Destination: targetFolder,
 			Flags:       models.SeenFlag,
 			Date:        time.Now(),
 			Reader:      &buf,
@@ -103,6 +134,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 			switch msg := msg.(type) {
 			case *types.Done:
 				aerc.PushStatus("Message postponed.", 10*time.Second)
+				composer.SetPostponed()
 				composer.Close()
 			case *types.Error:
 				handleErr(msg.Error)
@@ -113,7 +145,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
 	if !alreadyCreated {
 		// to synchronise the creating of the directory
 		worker.PostAction(&types.CreateDirectory{
-			Directory: config.Postpone,
+			Directory: targetFolder,
 		}, func(msg types.WorkerMessage) {
 			switch msg := msg.(type) {
 			case *types.Done:
diff --git a/commands/msg/recall.go b/commands/msg/recall.go
index c095caf1..e7579ca1 100644
--- a/commands/msg/recall.go
+++ b/commands/msg/recall.go
@@ -84,10 +84,6 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
 			worker := composer.Worker()
 			uids := []uint32{msgInfo.Uid}
 
-			if acct.SelectedDirectory() != acct.AccountConfig().Postpone {
-				return
-			}
-
 			deleteMessage := func() {
 				worker.PostAction(&types.DeleteMessages{
 					Uids: uids,
@@ -101,23 +97,8 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
 				})
 			}
 
-			if composer.Sent() {
+			if composer.Sent() || composer.Postponed() {
 				deleteMessage()
-			} else {
-				confirm := widgets.NewSelectorDialog(
-					"Delete recalled message?",
-					"If you proceed, the recalled message will be deleted.",
-					[]string{"Cancel", "Proceed"}, 0, aerc.SelectedAccountUiConfig(),
-					func(option string, err error) {
-						aerc.CloseDialog()
-						switch option {
-						case "Proceed":
-							deleteMessage()
-						default:
-						}
-					},
-				)
-				aerc.AddDialog(confirm)
 			}
 		})
 	}
@@ -183,6 +164,10 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
 					})
 				}
 
+				if force {
+					composer.SetRecalledFrom(acct.SelectedDirectory())
+				}
+
 				// focus the terminal since the header fields are likely already done
 				composer.FocusTerminal()
 				addTab(composer)