From 545591700a2014dabe41210a3bb04b7590f6d4b3 Mon Sep 17 00:00:00 2001
From: Daniel Tam <daniel@danieltam.net>
Date: Sat, 6 Jun 2020 19:50:55 -0500
Subject: [PATCH] moved authentication parsing to seperate file; created struct
 for authentication tokens

---
 auth.go     | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 bunnybot.go | 26 ++++++++++----------------
 2 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 auth.go

diff --git a/auth.go b/auth.go
new file mode 100644
index 0000000..cef3abd
--- /dev/null
+++ b/auth.go
@@ -0,0 +1,51 @@
+/*
+Functions and struct for the authentication tokens
+*/
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"github.com/buger/jsonparser"
+)
+
+type Auth struct {
+	discord string
+	imgur string
+	wolfram string
+}
+
+// build the auth struct
+func buildAuth() {
+	// read the auth json file
+	json, err := ioutil.ReadFile("auth.json")
+	if err != nil {
+		fmt.Print("Error reading auth.json file, ")
+		panic(err)
+	}
+
+	// grab the discord token
+	discord, err := jsonparser.GetString(json, "[0]", "discord")
+	if err != nil {
+		fmt.Print("Error parsing discord token, ")
+		panic(err)
+	}
+	auth.discord = discord
+
+	// grab the imgur token
+	imgur, err := jsonparser.GetString(json, "[0]", "imgur")
+	if err != nil {
+		fmt.Print("Error parsing imgur token, ")
+		panic(err)
+	}
+	auth.imgur = imgur
+
+	// grab the wolfram alpha token
+	wolfram, err := jsonparser.GetString(json, "[0]", "wolfram")
+	if err != nil {
+		fmt.Print("Error parsing wolfram token, ")
+		panic(err)
+	}
+	auth.wolfram = wolfram
+}
diff --git a/bunnybot.go b/bunnybot.go
index cfc203c..3731dde 100644
--- a/bunnybot.go
+++ b/bunnybot.go
@@ -1,33 +1,27 @@
 package main
 
 import (
-	//"flag"
 	"fmt"
 	"os"
 	"os/signal"
 	"syscall"
 	"strings"
-	"io/ioutil"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/buger/jsonparser"
 )
 
+var (
+	auth Auth
+)
+
+func init() {
+	// build the authentication struct
+	buildAuth()
+}
+
 func main() {
-	// read auth file
-	auth, err := ioutil.ReadFile("auth.json")
-	if err != nil {
-		panic(err)
-	}
-
-	// get our discord token
-	token,err := jsonparser.GetString(auth, "[0]", "token")
-	if err != nil {
-		fmt.Println(err)
-	}
-
 	// create Discord session
-	dg, err := discordgo.New("Bot " + token)
+	dg, err := discordgo.New("Bot " + auth.discord)
 	if err != nil {
 		fmt.Println("Error creating Discord session, ", err)
 		return