Revert "Remove duration from the status methods"

This reverts commit f06d683688e3d2139b14f67b7e349089e7200bf4.

10 files changed, 32 insertions, 22 deletions

diff --git a/commands/msg/archive.go b/commands/msg/archive.go
index afd0d55e..ba7e1f7f 100644
--- a/commands/msg/archive.go
+++ b/commands/msg/archive.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"path"
 	"sync"
+	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/commands"
 	"git.sr.ht/~sircmpwn/aerc/models"
@@ -85,7 +86,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
 			case *types.Done:
 				wg.Done()
 			case *types.Error:
-				aerc.PushError(" " + msg.Error.Error())
+				aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 				success = false
 				wg.Done()
 			}
@@ -95,7 +96,7 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
 	go func() {
 		wg.Wait()
 		if success {
-			aerc.PushStatus("Messages archived.")
+			aerc.PushStatus("Messages archived.", 10*time.Second)
 		}
 	}()
 	return nil
diff --git a/commands/msg/copy.go b/commands/msg/copy.go
index 9a8bcb83..e822c5c1 100644
--- a/commands/msg/copy.go
+++ b/commands/msg/copy.go
@@ -3,6 +3,7 @@ package msg
 import (
 	"errors"
 	"strings"
+	"time"
 
 	"git.sr.ht/~sircmpwn/getopt"
 
@@ -57,9 +58,9 @@ func (Copy) Execute(aerc *widgets.Aerc, args []string) error {
 
 			switch msg := msg.(type) {
 			case *types.Done:
-				aerc.PushStatus("Messages copied.")
+				aerc.PushStatus("Messages copied.", 10*time.Second)
 			case *types.Error:
-				aerc.PushError(" " + msg.Error.Error())
+				aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 			}
 		})
 	return nil
diff --git a/commands/msg/delete.go b/commands/msg/delete.go
index 46633838..482b60c1 100644
--- a/commands/msg/delete.go
+++ b/commands/msg/delete.go
@@ -2,6 +2,7 @@ package msg
 
 import (
 	"errors"
+	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/lib"
 	"git.sr.ht/~sircmpwn/aerc/models"
@@ -44,9 +45,9 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
 	store.Delete(uids, func(msg types.WorkerMessage) {
 		switch msg := msg.(type) {
 		case *types.Done:
-			aerc.PushStatus("Messages deleted.")
+			aerc.PushStatus("Messages deleted.", 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 		}
 	})
 
@@ -67,7 +68,7 @@ func (Delete) Execute(aerc *widgets.Aerc, args []string) error {
 			lib.NewMessageStoreView(next, store, aerc.DecryptKeys,
 				func(view lib.MessageView, err error) {
 					if err != nil {
-						aerc.PushError(err.Error())
+						aerc.PushError(err.Error(), 10*time.Second)
 						return
 					}
 					nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view)
diff --git a/commands/msg/forward.go b/commands/msg/forward.go
index 28abbed1..5dd51b29 100644
--- a/commands/msg/forward.go
+++ b/commands/msg/forward.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path"
 	"strings"
+	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/models"
 	"git.sr.ht/~sircmpwn/aerc/widgets"
@@ -83,7 +84,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error {
 		composer, err := widgets.NewComposer(aerc, acct, aerc.Config(), acct.AccountConfig(),
 			acct.Worker(), template, defaults, original)
 		if err != nil {
-			aerc.PushError("Error: " + err.Error())
+			aerc.PushError("Error: "+err.Error(), 10*time.Second)
 			return nil, err
 		}
 
diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
index 02e64786..d74aece5 100644
--- a/commands/msg/modify-labels.go
+++ b/commands/msg/modify-labels.go
@@ -2,6 +2,7 @@ package msg
 
 import (
 	"errors"
+	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/commands"
 	"git.sr.ht/~sircmpwn/aerc/widgets"
@@ -55,9 +56,9 @@ func (ModifyLabels) Execute(aerc *widgets.Aerc, args []string) error {
 
 		switch msg := msg.(type) {
 		case *types.Done:
-			aerc.PushStatus("labels updated")
+			aerc.PushStatus("labels updated", 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 		}
 	})
 	return nil
diff --git a/commands/msg/move.go b/commands/msg/move.go
index 504beda9..a19194ee 100644
--- a/commands/msg/move.go
+++ b/commands/msg/move.go
@@ -3,6 +3,7 @@ package msg
 import (
 	"errors"
 	"strings"
+	"time"
 
 	"git.sr.ht/~sircmpwn/getopt"
 
@@ -68,9 +69,9 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error {
 
 		switch msg := msg.(type) {
 		case *types.Done:
-			aerc.PushStatus("Message moved to " + joinedArgs)
+			aerc.PushStatus("Message moved to "+joinedArgs, 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 		}
 	})
 	return nil
diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go
index 15e0fdab..15b8c52a 100644
--- a/commands/msg/pipe.go
+++ b/commands/msg/pipe.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os/exec"
+	"time"
 
 	"git.sr.ht/~sircmpwn/aerc/commands"
 	"git.sr.ht/~sircmpwn/aerc/widgets"
@@ -74,7 +75,7 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
 	doTerm := func(reader io.Reader, name string) {
 		term, err := commands.QuickTerm(aerc, cmd, reader)
 		if err != nil {
-			aerc.PushError(" " + err.Error())
+			aerc.PushError(" "+err.Error(), 10*time.Second)
 			return
 		}
 		aerc.NewTab(term, name)
@@ -92,16 +93,16 @@ func (Pipe) Execute(aerc *widgets.Aerc, args []string) error {
 		}()
 		err = ecmd.Run()
 		if err != nil {
-			aerc.PushError(" " + err.Error())
+			aerc.PushError(" "+err.Error(), 10*time.Second)
 		} else {
 			if ecmd.ProcessState.ExitCode() != 0 {
 				aerc.PushError(fmt.Sprintf(
 					"%s: completed with status %d", cmd[0],
-					ecmd.ProcessState.ExitCode()))
+					ecmd.ProcessState.ExitCode()), 10*time.Second)
 			} else {
 				aerc.PushStatus(fmt.Sprintf(
 					"%s: completed with status %d", cmd[0],
-					ecmd.ProcessState.ExitCode()))
+					ecmd.ProcessState.ExitCode()), 10*time.Second)
 			}
 		}
 	}
diff --git a/commands/msg/read.go b/commands/msg/read.go
index a08b8074..e27f7433 100644
--- a/commands/msg/read.go
+++ b/commands/msg/read.go
@@ -3,6 +3,7 @@ package msg
 import (
 	"errors"
 	"sync"
+	"time"
 
 	"git.sr.ht/~sircmpwn/getopt"
 
@@ -90,9 +91,9 @@ func submitReadChange(aerc *widgets.Aerc, store *lib.MessageStore,
 	store.Read(uids, newState, func(msg types.WorkerMessage) {
 		switch msg := msg.(type) {
 		case *types.Done:
-			aerc.PushStatus(msg_success)
+			aerc.PushStatus(msg_success, 10*time.Second)
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 		}
 	})
 }
@@ -105,7 +106,7 @@ func submitReadChangeWg(aerc *widgets.Aerc, store *lib.MessageStore,
 		case *types.Done:
 			wg.Done()
 		case *types.Error:
-			aerc.PushError(" " + msg.Error.Error())
+			aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 			*success = false
 			wg.Done()
 		}
@@ -135,7 +136,7 @@ func submitToggle(aerc *widgets.Aerc, store *lib.MessageStore, h *helper) error
 	go func() {
 		wg.Wait()
 		if success {
-			aerc.PushStatus(msg_success)
+			aerc.PushStatus(msg_success, 10*time.Second)
 		}
 	}()
 	return nil
diff --git a/commands/msg/recall.go b/commands/msg/recall.go
index 7c9ac193..6c5e9736 100644
--- a/commands/msg/recall.go
+++ b/commands/msg/recall.go
@@ -2,6 +2,7 @@ package msg
 
 import (
 	"io"
+	"time"
 
 	"github.com/emersion/go-message"
 	_ "github.com/emersion/go-message/charset"
@@ -91,7 +92,7 @@ func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
 			}, func(msg types.WorkerMessage) {
 				switch msg := msg.(type) {
 				case *types.Error:
-					aerc.PushError(" " + msg.Error.Error())
+					aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
 					composer.Close()
 				}
 			})
diff --git a/commands/msg/reply.go b/commands/msg/reply.go
index 28ce245d..455c7ca5 100644
--- a/commands/msg/reply.go
+++ b/commands/msg/reply.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	gomail "net/mail"
 	"strings"
+	"time"
 
 	"git.sr.ht/~sircmpwn/getopt"
 
@@ -139,7 +140,7 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error {
 		composer, err := widgets.NewComposer(aerc, acct, aerc.Config(),
 			acct.AccountConfig(), acct.Worker(), template, defaults, original)
 		if err != nil {
-			aerc.PushError("Error: " + err.Error())
+			aerc.PushError("Error: "+err.Error(), 10*time.Second)
 			return err
 		}