aboutsummaryrefslogtreecommitdiffstats
path: root/commands/account
diff options
context:
space:
mode:
Diffstat (limited to 'commands/account')
-rw-r--r--commands/account/recover.go10
-rw-r--r--commands/account/sort.go7
2 files changed, 4 insertions, 13 deletions
diff --git a/commands/account/recover.go b/commands/account/recover.go
index 855d9846..8158af61 100644
--- a/commands/account/recover.go
+++ b/commands/account/recover.go
@@ -24,11 +24,6 @@ func (Recover) Aliases() []string {
}
func (Recover) Complete(aerc *widgets.Aerc, args []string) []string {
- acct := aerc.SelectedAccount()
- if acct == nil {
- return make([]string, 0)
- }
-
// file name of temp file is hard-coded in the NewComposer() function
files, err := filepath.Glob(
filepath.Join(os.TempDir(), "aerc-compose-*.eml"),
@@ -50,11 +45,12 @@ func (Recover) Complete(aerc *widgets.Aerc, args []string) []string {
return files
} else {
// only accepts one file to recover
- return commands.FilterList(files, args[1], args[0]+" ", acct.UiConfig().FuzzyComplete)
+ return commands.FilterList(files, args[1], args[0]+" ",
+ aerc.SelectedAccountUiConfig().FuzzyComplete)
}
} else {
// only accepts one file to recover
- return commands.FilterList(files, args[0], "", acct.UiConfig().FuzzyComplete)
+ return commands.FilterList(files, args[0], "", aerc.SelectedAccountUiConfig().FuzzyComplete)
}
}
diff --git a/commands/account/sort.go b/commands/account/sort.go
index 15ecbc0c..ad1a402d 100644
--- a/commands/account/sort.go
+++ b/commands/account/sort.go
@@ -20,11 +20,6 @@ func (Sort) Aliases() []string {
}
func (Sort) Complete(aerc *widgets.Aerc, args []string) []string {
- acct := aerc.SelectedAccount()
- if acct == nil {
- return make([]string, 0)
- }
-
supportedCriteria := []string{
"arrival",
"cc",
@@ -61,7 +56,7 @@ func (Sort) Complete(aerc *widgets.Aerc, args []string) []string {
}
// the last item is not complete
completions = commands.FilterList(supportedCriteria, last, currentPrefix,
- acct.UiConfig().FuzzyComplete)
+ aerc.SelectedAccountUiConfig().FuzzyComplete)
return completions
}