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 <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>

1 files changed, 6 insertions, 6 deletions

diff --git a/commands/msg/modify-labels.go b/commands/msg/modify-labels.go
index d61dc23b..d219a57e 100644
--- a/commands/msg/modify-labels.go
+++ b/commands/msg/modify-labels.go
@@ -19,17 +19,17 @@ func (ModifyLabels) Aliases() []string {
 	return []string{"modify-labels", "tag"}
 }
 
-func (ModifyLabels) Complete(aerc *app.Aerc, args []string) []string {
-	return commands.GetLabels(aerc, args)
+func (ModifyLabels) Complete(args []string) []string {
+	return commands.GetLabels(args)
 }
 
-func (ModifyLabels) Execute(aerc *app.Aerc, args []string) error {
+func (ModifyLabels) Execute(args []string) error {
 	changes := args[1:]
 	if len(changes) == 0 {
 		return errors.New("Usage: modify-labels <[+-]label> ...")
 	}
 
-	h := newHelper(aerc)
+	h := newHelper()
 	store, err := h.store()
 	if err != nil {
 		return err
@@ -56,10 +56,10 @@ func (ModifyLabels) Execute(aerc *app.Aerc, args []string) error {
 	) {
 		switch msg := msg.(type) {
 		case *types.Done:
-			aerc.PushStatus("labels updated", 10*time.Second)
+			app.PushStatus("labels updated", 10*time.Second)
 			store.Marker().ClearVisualMark()
 		case *types.Error:
-			aerc.PushError(msg.Error.Error())
+			app.PushError(msg.Error.Error())
 		}
 	})
 	return nil