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/copy.go b/commands/msg/copy.go
index 3f3498a2..1a902772 100644
--- a/commands/msg/copy.go
+++ b/commands/msg/copy.go
@@ -22,11 +22,11 @@ func (Copy) Aliases() []string {
 	return []string{"cp", "copy"}
 }
 
-func (Copy) Complete(aerc *app.Aerc, args []string) []string {
-	return commands.GetFolders(aerc, args)
+func (Copy) Complete(args []string) []string {
+	return commands.GetFolders(args)
 }
 
-func (Copy) Execute(aerc *app.Aerc, args []string) error {
+func (Copy) Execute(args []string) error {
 	if len(args) == 1 {
 		return errors.New("Usage: cp [-p] <folder>")
 	}
@@ -40,7 +40,7 @@ func (Copy) Execute(aerc *app.Aerc, args []string) error {
 			createParents = true
 		}
 	}
-	h := newHelper(aerc)
+	h := newHelper()
 	uids, err := h.markedOrSelectedUids()
 	if err != nil {
 		return err
@@ -55,10 +55,10 @@ func (Copy) Execute(aerc *app.Aerc, args []string) error {
 		) {
 			switch msg := msg.(type) {
 			case *types.Done:
-				aerc.PushStatus("Messages copied.", 10*time.Second)
+				app.PushStatus("Messages copied.", 10*time.Second)
 				store.Marker().ClearVisualMark()
 			case *types.Error:
-				aerc.PushError(msg.Error.Error())
+				app.PushError(msg.Error.Error())
 			}
 		})
 	return nil