From 35db30626dcda1082dfea4cce8bc745c12623306 Mon Sep 17 00:00:00 2001
From: kageru <kageru@encode.moe>
Date: Sun, 10 Jun 2018 21:32:06 +0200
Subject: [PATCH] =?UTF-8?q?I=20can=E2=80=99t=20into=20json=20:selphyDerp:?=
 =?UTF-8?q?=20(actually=20fix=20#2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.json |  6 +++---
 main.go     | 32 +++++++++++++++-----------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/config.json b/config.json
index e0ba6a7..18de41e 100644
--- a/config.json
+++ b/config.json
@@ -1,9 +1,9 @@
 {
     "Token": "your login token",
-    "Admins": {
+    "Admins": [
         "your user ID",
         "another admin ID"
-    },
+    ],
     "ServerID": "the server the bot will be running on",
     "RequireAccept": false,
     "LockedRoleID": "the role to be given to locked users (readme)",
@@ -22,7 +22,7 @@
         "QuestionsTitle": "__Questions__",
         "QuestionsText": "pls ask the mods. kthxbye",
         "BugsTitle": "__Bugs__",
-        "BugsText": "please ask <@%s>. (this will be formatted with the AdminID above",
+        "BugsText": "please ask <@%s>. (this will be formatted with Admins[0] above",
         "Image": "https://static-cdn.jtvnw.net/emoticons/v1/970966/3.0"
     }
 }
diff --git a/main.go b/main.go
index 12423ad..aad8de3 100644
--- a/main.go
+++ b/main.go
@@ -18,29 +18,32 @@ func main() {
         fmt.Println("error: ", err)
         return
     }
-
+    /*
     dg.AddHandler(evaluateMessage)
     dg.AddHandler(onJoin)
     err = dg.Open()
     if err != nil {
-        fmt.Println("no connection, ", err)
+        fmt.Println("No connection:\n", err)
         return
     }
-
+    */
     f, err := os.OpenFile("selphybot.log", os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
     if err != nil {
-        fmt.Println("error opening log file: %v", err)
+        fmt.Println("Error opening log file:\n", err)
     }
     defer f.Close()
     log.SetOutput(f)
-
     addCommands()
 
-    fmt.Println("bot running. selphyWoo")
+    fmt.Println("Bot running. selphyWoo")
+    log.Println("Bot running. selphyWoo")
     sc := make(chan os.Signal, 1)
     signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
     <-sc
 
+    fmt.Println("Exiting...")
+    log.Println("Exiting...")
+
     dg.Close()
 }
 
@@ -59,23 +62,18 @@ func addCommands() {
     registerCommand(Command{Trigger: "o/", Output: "\\o", Type: CommandTypeFullMatch, Cooldown: 10})
     registerCommand(Command{Trigger: "\\o", Output: "o/", Type: CommandTypeFullMatch, Cooldown: 10})
     registerCommand(Command{Trigger: "\\o/", Output: "/o\\", Type: CommandTypeFullMatch, Cooldown: 10})
-    registerCommand(Command{Trigger: "<:selphyDango:441001954542616576>", Output: ":notes: Dango, Dango, Dango, Dango, Dango Daikazoku :notes:", Type: CommandTypeFullMatch, Cooldown: 1200})
-    registerCommand(Command{Trigger: "praise the sun", Output: "If only I could be so grossly incandescent \\\\[T]/", Type: CommandTypeContains, IgnoreCase: true, Cooldown: 30})
+    registerCommand(Command{Trigger: "<:selphyDango:441001954542616576>", Output: ":notes: Dango, Dango, Dango, Dango, Dango Daikazoku :notes:", Type: CommandTypeFullMatch, Cooldown: 85600})
+    registerCommand(Command{Trigger: "praise the sun", Output: "If only I could be so grossly incandescent \\\\[T]/", Type: CommandTypeContains, IgnoreCase: true, Cooldown: 85600})
 
     // Information
     registerCommand(Command{Trigger: "!welcome", OutputEmbed: getWelcomeEmbed(), Type: CommandTypeFullMatch, DMOnly: true})
 
-    // Admin
+    // Admin and/or debug
     registerCommand(Command{Trigger: "<@%s> <3", Output: "<@%s> <3", Type: CommandTypeFullMatch, AdminOnly: true, OutputIsReply: true, RequiresMention: true})
+    registerCommand(Command{Trigger: "echo", Type: CommandTypePrefix, Function: echoMessage, AdminOnly: true})
 
-    // Debug
-    // registerCommand(Command{Trigger: "echo", Type: CommandTypePrefix, Function: echoMessage})
+    fmt.Printf("Successfully initialized %d commands\n", len(commands))
+    log.Printf("Successfully initialized %d commands", len(commands))
 
 }
 
-/*func undelete(s *discordgo.Session, m *discordgo.MessageDelete) {
-    channel, _ := s.State.Channel(m.ChannelID)
-    message, _ := s.State.Message(m.ChannelID, m.ID)
-    log.Println(fmt.Sprintf("Someone deleted a message in %s: “%s”", channel.Name, messageToString(message)))
-}*/
-