From e386077b96cb8e4d472fd5db7a324a9c317b5731 Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Fri, 20 Dec 2024 18:15:47 -0500
Subject: [PATCH] refactor: move token retrieval login to run.go

---
 cmd/run.go | 13 +++++++++++++
 main.go    | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cmd/run.go b/cmd/run.go
index ec27df3..56c4524 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -1,8 +1,11 @@
 package cmd
 
 import (
+	"log/slog"
+
 	"github.com/ayn2op/discordo/internal/config"
 	"github.com/ayn2op/discordo/internal/logger"
+	"github.com/zalando/go-keyring"
 )
 
 var (
@@ -15,6 +18,16 @@ func Run(token string) error {
 		return err
 	}
 
+	// If no token was provided, look it up in the keyring.
+	if token == "" {
+		tok, err := keyring.Get(config.Name, "token")
+		if err != nil {
+			slog.Info("failed to get token from keyring", "err", err)
+		} else {
+			token = tok
+		}
+	}
+
 	cfg, err := config.Load()
 	if err != nil {
 		return err
diff --git a/main.go b/main.go
index 38db2ed..251f9af 100644
--- a/main.go
+++ b/main.go
@@ -5,24 +5,12 @@ import (
 	"log/slog"
 
 	"github.com/ayn2op/discordo/cmd"
-	"github.com/ayn2op/discordo/internal/config"
-	"github.com/zalando/go-keyring"
 )
 
 func main() {
 	token := flag.String("token", "", "authentication token")
 	flag.Parse()
 
-	// If no token was provided, look it up in the keyring
-	if *token == "" {
-		t, err := keyring.Get(config.Name, "token")
-		if err != nil {
-			slog.Info("failed to get token from keyring", "err", err)
-		} else {
-			*token = t
-		}
-	}
-
 	if err := cmd.Run(*token); err != nil {
 		slog.Error("failed to run", "err", err)
 	}