From bc176bd61ba726351a489cabf4da16a47dc5ec3b Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Tue, 10 Oct 2023 00:08:31 +0200 Subject: app: export global functions The single Aerc object is passed around in almost all command functions. This hinders readability. Store the single Aerc instance as a global variable. Export public functions from the app package to access methods of that object. Remove all explicit references to *app.Aerc and replace them with calls to these functions. For references to private/unexported fields and functions from within the app package, directly access the global aerc object. Signed-off-by: Robin Jarry Acked-by: Moritz Poldrack --- commands/account/next-folder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'commands/account/next-folder.go') diff --git a/commands/account/next-folder.go b/commands/account/next-folder.go index b0657ff1..2b23e6da 100644 --- a/commands/account/next-folder.go +++ b/commands/account/next-folder.go @@ -18,11 +18,11 @@ func (NextPrevFolder) Aliases() []string { return []string{"next-folder", "prev-folder"} } -func (NextPrevFolder) Complete(aerc *app.Aerc, args []string) []string { +func (NextPrevFolder) Complete(args []string) []string { return nil } -func (NextPrevFolder) Execute(aerc *app.Aerc, args []string) error { +func (NextPrevFolder) Execute(args []string) error { if len(args) > 2 { return nextPrevFolderUsage(args[0]) } @@ -36,7 +36,7 @@ func (NextPrevFolder) Execute(aerc *app.Aerc, args []string) error { return nextPrevFolderUsage(args[0]) } } - acct := aerc.SelectedAccount() + acct := app.SelectedAccount() if acct == nil { return errors.New("No account selected") } -- cgit