From aa58ee2a8a177f01d39bde7368f017fe0fcf425a Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@mac.local>
Date: Wed, 19 Mar 2025 16:12:22 -0400
Subject: [PATCH] Revert "refactor(state): rename openState to newState &
 return *state.State instead of modifying discordState in-place"

This reverts commit b784d6ccb0f5c139dfa2f9795e9f2b375e03f8c3.
---
 cmd/app.go   |  4 +---
 cmd/state.go | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/cmd/app.go b/cmd/app.go
index b7db88f..b03d05b 100644
--- a/cmd/app.go
+++ b/cmd/app.go
@@ -52,9 +52,7 @@ func (app *App) show(token string) error {
 
 		app.SetRoot(loginForm, true)
 	} else {
-		var err error
-		discordState, err = newState(token)
-		if err != nil {
+		if err := openState(token); err != nil {
 			return err
 		}
 
diff --git a/cmd/state.go b/cmd/state.go
index ba5775d..eaf3582 100644
--- a/cmd/state.go
+++ b/cmd/state.go
@@ -19,7 +19,7 @@ type State struct {
 	*ningen.State
 }
 
-func newState(token string) (*State, error) {
+func openState(token string) error {
 	api.UserAgent = app.cfg.UserAgent
 	gateway.DefaultIdentity = gateway.IdentifyProperties{
 		OS:     runtime.GOOS,
@@ -34,19 +34,17 @@ func newState(token string) (*State, error) {
 		Status: app.cfg.Status,
 	}
 
-	s := &State{State: ningen.New(token)}
-
-	// Handlers
-	s.AddHandler(s.onReady)
-	s.AddHandler(s.onMessageCreate)
-	s.AddHandler(s.onMessageDelete)
-	s.OnRequest = append(s.OnRequest, s.onRequest)
-
-	if err := s.Open(context.TODO()); err != nil {
-		return nil, err
+	discordState = &State{
+		State: ningen.New(token),
 	}
 
-	return s, nil
+	// Handlers
+	discordState.AddHandler(discordState.onReady)
+	discordState.AddHandler(discordState.onMessageCreate)
+	discordState.AddHandler(discordState.onMessageDelete)
+
+	discordState.OnRequest = append(discordState.OnRequest, discordState.onRequest)
+	return discordState.Open(context.TODO())
 }
 
 func (s *State) onRequest(r httpdriver.Request) error {