From 652083ad942b01ca948c521363682b98f9febb17 Mon Sep 17 00:00:00 2001
From: ayn2op <ayn2op@gmail.com>
Date: Fri, 27 Jan 2023 15:00:49 +0530
Subject: [PATCH] Assign to discordState directly from openState func

---
 login_form.go |  3 +--
 main.go       |  3 +--
 state.go      | 18 +++++++-----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/login_form.go b/login_form.go
index f724d3e..871b372 100644
--- a/login_form.go
+++ b/login_form.go
@@ -66,8 +66,7 @@ func (lf *LoginForm) onLoginButtonSelected() {
 	mainFlex = newMainFlex()
 
 	// We got the token, return with a new Session.
-	discordState, err = openState(l.Token)
-	if err != nil {
+	if err = openState(l.Token); err != nil {
 		log.Fatal(err)
 	}
 
diff --git a/main.go b/main.go
index a2ac586..3c8e2bc 100644
--- a/main.go
+++ b/main.go
@@ -67,8 +67,7 @@ func main() {
 	} else {
 		mainFlex = newMainFlex()
 
-		discordState, err = openState(token)
-		if err != nil {
+		if err = openState(token); err != nil {
 			log.Fatal(err)
 		}
 
diff --git a/state.go b/state.go
index acd0533..bc6d009 100644
--- a/state.go
+++ b/state.go
@@ -27,22 +27,18 @@ type State struct {
 	*state.State
 }
 
-func openState(token string) (*State, error) {
-	s := &State{
+func openState(token string) error {
+	discordState = &State{
 		State: state.New(token),
 	}
 
 	// Handlers
-	s.AddHandler(s.onReady)
-	s.AddHandler(s.onMessageCreate)
-	s.StateLog = s.onLog
-	s.OnRequest = append(s.Client.OnRequest, s.onRequest)
+	discordState.AddHandler(discordState.onReady)
+	discordState.AddHandler(discordState.onMessageCreate)
+	discordState.StateLog = discordState.onLog
+	discordState.OnRequest = append(discordState.Client.OnRequest, discordState.onRequest)
 
-	if err := s.Open(context.TODO()); err != nil {
-		return nil, err
-	}
-
-	return s, nil
+	return discordState.Open(context.TODO())
 }
 
 func (s *State) onLog(err error) {