diff options
| author | Reto Brunner <reto@labrat.space> | 2020-05-27 07:52:13 +0200 |
|---|---|---|
| committer | Reto Brunner <reto@labrat.space> | 2020-05-27 08:11:40 +0200 |
| commit | f06d683688e3d2139b14f67b7e349089e7200bf4 (patch) | |
| tree | eee331112cbcfeafdb8cd6ba126d9e51ed72b10a /commands/msgview | |
| parent | 0f78f06610c0e8887aba2ae50e99b86477a384b3 (diff) | |
| download | aerc-f06d683688e3d2139b14f67b7e349089e7200bf4.tar.gz | |
Remove duration from the status methods
We always set 10 seconds anyhow, might as well do that without repeating ourselfs.
Diffstat (limited to 'commands/msgview')
| -rw-r--r-- | commands/msgview/next.go | 4 | ||||
| -rw-r--r-- | commands/msgview/open.go | 9 | ||||
| -rw-r--r-- | commands/msgview/save.go | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/commands/msgview/next.go b/commands/msgview/next.go index f9fb3d7..978cf10 100644 --- a/commands/msgview/next.go +++ b/commands/msgview/next.go @@ -1,8 +1,6 @@ package msgview import ( - "time" - "git.sr.ht/~sircmpwn/aerc/commands/account" "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -42,7 +40,7 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { lib.NewMessageStoreView(nextMsg, store, aerc.DecryptKeys, func(view lib.MessageView, err error) { if err != nil { - aerc.PushError(err.Error(), 10*time.Second) + aerc.PushError(err.Error()) return } nextMv := widgets.NewMessageViewer(acct, aerc.Config(), view) diff --git a/commands/msgview/open.go b/commands/msgview/open.go index 7f26542..e2545e3 100644 --- a/commands/msgview/open.go +++ b/commands/msgview/open.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "mime" "os" - "time" "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/widgets" @@ -49,23 +48,23 @@ func (Open) Execute(aerc *widgets.Aerc, args []string) error { tmpFile, err := ioutil.TempFile(os.TempDir(), "aerc-*"+extension) if err != nil { - aerc.PushError(" "+err.Error(), 10*time.Second) + aerc.PushError(" " + err.Error()) return } defer tmpFile.Close() _, err = io.Copy(tmpFile, reader) if err != nil { - aerc.PushError(" "+err.Error(), 10*time.Second) + aerc.PushError(" " + err.Error()) return } err = lib.OpenFile(tmpFile.Name()) if err != nil { - aerc.PushError(" "+err.Error(), 10*time.Second) + aerc.PushError(" " + err.Error()) } - aerc.PushStatus("Opened", 10*time.Second) + aerc.PushStatus("Opened") }) return nil diff --git a/commands/msgview/save.go b/commands/msgview/save.go index ea1b8f3..7dbb0df 100644 --- a/commands/msgview/save.go +++ b/commands/msgview/save.go @@ -128,10 +128,10 @@ func (Save) Execute(aerc *widgets.Aerc, args []string) error { go func() { err := <-ch if err != nil { - aerc.PushError(fmt.Sprintf("Save failed: %v", err), 10*time.Second) + aerc.PushError(fmt.Sprintf("Save failed: %v", err)) return } - aerc.PushStatus("Saved to "+path, 10*time.Second) + aerc.PushStatus("Saved to " + path) }() return nil } |