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/compose/sign.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'commands/compose/sign.go') diff --git a/commands/compose/sign.go b/commands/compose/sign.go index f44c33ec..ae7c3417 100644 --- a/commands/compose/sign.go +++ b/commands/compose/sign.go @@ -17,16 +17,16 @@ func (Sign) Aliases() []string { return []string{"sign"} } -func (Sign) Complete(aerc *app.Aerc, args []string) []string { +func (Sign) Complete(args []string) []string { return nil } -func (Sign) Execute(aerc *app.Aerc, args []string) error { +func (Sign) Execute(args []string) error { if len(args) != 1 { return errors.New("Usage: sign") } - composer, _ := aerc.SelectedTabContent().(*app.Composer) + composer, _ := app.SelectedTabContent().(*app.Composer) err := composer.SetSign(!composer.Sign()) if err != nil { @@ -41,7 +41,7 @@ func (Sign) Execute(aerc *app.Aerc, args []string) error { statusline = "Message will not be signed." } - aerc.PushStatus(statusline, 10*time.Second) + app.PushStatus(statusline, 10*time.Second) return nil } -- cgit