From f3224ee0eb4d5def781f5e77121a405df054bfba Mon Sep 17 00:00:00 2001
From: Nathan Perry <avaglir@gmail.com>
Date: Wed, 26 Jul 2017 20:00:31 -0400
Subject: restructure to cmd

---
 thulani.go | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

(limited to 'thulani.go')

diff --git a/thulani.go b/thulani.go
index 9ed8f18..d64cb7c 100644
--- a/thulani.go
+++ b/thulani.go
@@ -1,45 +1,27 @@
-package main
+package thulani
 
 import (
-	"encoding/json"
-	"log"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/bwmarrin/discordgo"
 )
 
-type config struct {
-	Trigger      string `json:"trigger"`
-	QueueSize    uint   `json:"queue_size"`
-	Admin        string `json:"admin"`
-	OpRole       string `json:"op_role"`
-	Server       string `json:"server"`
-	VoiceChannel string `json:"voice_channel"`
-	Token        string `json:"token"`
-}
-
-func (c *config) UnmarshalYAML(unmarshal func(interface{}) error) error {
-
-	return nil
-}
-
-func main() {
-	file, err := os.Open("config.json")
+func Run(conf *Config) {
+	dg, err := discordgo.New("Bot " + conf.Token)
 	handle(err)
 
-	var conf config
-	handle(json.NewDecoder(file).Decode(&conf))
-
-	dg, err := discordgo.New()
-	handle(err)
+	dg.AddHandler(onReady)
+	dg.Open()
 
-	app := &discordgo.Application{}
-	app.Name = "Thulani"
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+	<-sc
 
+	dg.Close()
 }
 
-func handle(err error) {
-	if err != nil {
-		log.Fatal(err)
-	}
+func onReady(s *discordgo.Session, m *discordgo.Ready) {
+	log.Debugf("Logged in as %v (%v)", m.User.Username, m.User.ID)
 }
-- 
cgit v1.3.1