ui: correct some push status messages

Upon success, commands :delete, :copy, :archive and :move show "Messages deleted/copied/archived/moved" in the status bar, which is obviously wrong if they are acting upon only one message. Make the success notification for those commands explicitly agree with the actual number of messages. Signed-Off-By: inwit <[email protected]> Acked-by: Robin Jarry <[email protected]>
rjarry · Nov 12, 2023 · 2d58976 · 2d58976
1 parent c13df79
commit 2d58976
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/commands/msg/archive.go b/commands/msg/archive.go
@@ -126,7 +126,13 @@ func archive(msgs []*models.MessageInfo, archiveType string) error {
 
 		wg.Wait()
 		if success {
-			handleDone(acct, next, "Messages archived.", store)
+			var s string
+			if len(uids) > 1 {
+				s = "%d messages archived to %s"
+			} else {
+				s = "%d message archived to %s"
+			}
+			handleDone(acct, next, fmt.Sprintf(s, len(uids), archiveDir), store)
 		}
 	}()
 	return nil

diff --git a/commands/msg/copy.go b/commands/msg/copy.go
@@ -1,6 +1,7 @@
 package msg
 
 import (
+	"fmt"
 	"time"
 
 	"git.sr.ht/~rjarry/aerc/app"
@@ -41,7 +42,13 @@ func (c Copy) Execute(args []string) error {
 		) {
 			switch msg := msg.(type) {
 			case *types.Done:
-				app.PushStatus("Messages copied.", 10*time.Second)
+				var s string
+				if len(uids) > 1 {
+					s = "%d messages copied to %s"
+				} else {
+					s = "%d message copied to %s"
+				}
+				app.PushStatus(fmt.Sprintf(s, len(uids), c.Folder), 10*time.Second)
 				store.Marker().ClearVisualMark()
 			case *types.Error:
 				app.PushError(msg.Error.Error())

diff --git a/commands/msg/delete.go b/commands/msg/delete.go
@@ -1,6 +1,7 @@
 package msg
 
 import (
+	"fmt"
 	"time"
 
 	"git.sr.ht/~rjarry/aerc/app"
@@ -43,7 +44,13 @@ func (Delete) Execute(args []string) error {
 	store.Delete(uids, func(msg types.WorkerMessage) {
 		switch msg := msg.(type) {
 		case *types.Done:
-			app.PushStatus("Messages deleted.", 10*time.Second)
+			var s string
+			if len(uids) > 1 {
+				s = "%d messages deleted"
+			} else {
+				s = "%d message deleted"
+			}
+			app.PushStatus(fmt.Sprintf(s, len(uids)), 10*time.Second)
 			mv, isMsgView := h.msgProvider.(*app.MessageViewer)
 			if isMsgView {
 				if !config.Ui.NextMessageOnDelete {

diff --git a/commands/msg/move.go b/commands/msg/move.go
@@ -1,6 +1,7 @@
 package msg
 
 import (
+	"fmt"
 	"time"
 
 	"git.sr.ht/~rjarry/aerc/app"
@@ -56,7 +57,13 @@ func (m Move) Execute(args []string) error {
 	) {
 		switch msg := msg.(type) {
 		case *types.Done:
-			handleDone(acct, next, "Messages moved to "+m.Folder, store)
+			var s string
+			if len(uids) > 1 {
+				s = "%d messages moved to %s"
+			} else {
+				s = "%d message moved to %s"
+			}
+			handleDone(acct, next, fmt.Sprintf(s, len(uids), m.Folder), store)
 		case *types.Error:
 			app.PushError(msg.Error.Error())
 			marker.Remark()