send: add option to send&archive

Add `:send -a flat|month|year` to send, which archives the message being
replied to. Extract most of archive logic into a separate function to
make sure it behaves as manual archiving.

Signed-off-by: Bence Ferdinandy <bence@ferdinandy.com>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 11 insertions, 5 deletions

diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index 149d7a5f..aeb65738 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -39,29 +39,35 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
 		return errors.New("Usage: archive <flat|year|month>")
 	}
 	h := newHelper(aerc)
-	acct, err := h.account()
+	msgs, err := h.messages()
 	if err != nil {
 		return err
 	}
-	store, err := h.store()
+	err = archive(aerc, msgs, args[1])
+	return err
+}
+
+func archive(aerc *widgets.Aerc, msgs []*models.MessageInfo, archiveType string) error {
+	h := newHelper(aerc)
+	acct, err := h.account()
 	if err != nil {
 		return err
 	}
-	msgs, err := h.messages()
+	store, err := h.store()
 	if err != nil {
 		return err
 	}
-	archiveDir := acct.AccountConfig().Archive
 	var uids []uint32
 	for _, msg := range msgs {
 		uids = append(uids, msg.Uid)
 	}
+	archiveDir := acct.AccountConfig().Archive
 	marker := store.Marker()
 	marker.ClearVisualMark()
 	next := findNextNonDeleted(uids, store)
 
 	var uidMap map[string][]uint32
-	switch args[1] {
+	switch archiveType {
 	case ARCHIVE_MONTH:
 		uidMap = groupBy(msgs, func(msg *models.MessageInfo) string {
 			dir := path.Join(archiveDir,