configs/config.json

@@ -1,4 +1,4 @@
 {
-    "channels": ["karaokards"],
+    "channels": ["iMartynOnTwitch"],
     "externalUrl": "karaokards.ing.martyn.berlin"
 }

deployments/kubernetes/deploy.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     run: kardbot
   name: kardbot
+  namespace: karaokards
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
@@ -69,4 +70,4 @@ spec:
         name: config
       - name: data
         persistentVolumeClaim: 
-          claimName: kkard-data
+          claimName: kkard-data

deployments/kubernetes/ing.yaml

@@ -6,16 +6,20 @@ metadata:
   name: karaokards
 spec:
   rules:
-  - host: karaokards-dev.ing.martyn.berlin
+  - host: karaokards.ing.martyn.berlin
     http:
       paths:
+      - backend:
+          serviceName: karaokards
+          servicePort: 80
+        path: /nope
       - backend:
           serviceName: karaokards
           servicePort: 80
         path: /
   tls:
   - hosts:
-    - karaokards-dev.ing.martyn.berlin
+    - karaokards.ing.martyn.berlin
-    secretName: karaokards-dev-cert
+    secretName: karaokards-cert
 status:
   loadBalancer: {}

internal/irc/irc.go

@@ -2,8 +2,8 @@ package irc
 
 import (
 	"bufio"
-	"encoding/base64"
 	"encoding/json"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
@@ -16,23 +16,17 @@ import (
 	"time"
 
 	rgb "github.com/foresthoffman/rgblog"
-	uuid "github.com/google/uuid"
 	scribble "github.com/nanobox-io/golang-scribble"
+	uuid "github.com/google/uuid"
 )
 
-const UTCFormat = "Jan 2 15:04:05 UTC"
+const PSTFormat = "Jan 2 15:04:05 PST"
-
-// Regex for parsing connection messages
-//
-// First matched group is our real username - twitch doesn't complain at using NICK command but doesn't honor it.
-var ConnectRegex *regexp.Regexp = regexp.MustCompile(`^:tmi.twitch.tv 001 ([^ ]+) .*`)
 
 // Regex for parsing PRIVMSG strings.
 //
 // First matched group is the user's name, second is the channel? and the third matched group is the content of the
 // user's message.
 var MsgRegex *regexp.Regexp = regexp.MustCompile(`^:(\w+)!\w+@\w+\.tmi\.twitch\.tv (PRIVMSG) #(\w+)(?: :(.*))?$`)
-var DirectMsgRegex *regexp.Regexp = regexp.MustCompile(`^:(\w+)!\w+@\w+\.tmi\.twitch\.tv (PRIVMSG) (\w+)(?: :(.*))?$`)
 
 // Regex for parsing user commands, from already parsed PRIVMSG strings.
 //
@@ -49,41 +43,27 @@ type OAuthCred struct {
 	ClientID string `json:"client_id,omitempty"`
 }
 
-type ConfigStruct struct {
-	InitialChannels []string `json:"channels"`
-	IrcOAuthPath    string   `json:"ircoauthpath,omitempty"`
-	StringPath      string   `json:"authpath,omitempty"`
-	DataPath        string   `json:"datapath,omitempty"`
-	ExternalUrl     string   `json:"externalurl,omitempty"`
-	AppOAuthPath    string   `json:"appoauthpath,omitempty"`
-}
-
 type KardBot struct {
 	Channel     string
 	conn        net.Conn
-	IrcCredentials *OAuthCred
+	Credentials *OAuthCred
-	AppCredentials *OAuthCred
 	MsgRate     time.Duration
 	Name        string
 	Port        string
-	IrcPrivatePath string
+	PrivatePath string
-	AppPrivatePath string
 	Server      string
 	startTime   time.Time
 	Prompts     []string
-	Database    scribble.Driver
+	Database	scribble.Driver
-	ChannelData map[string]ChannelData
+	channelData map[string]ChannelData
-	Config      ConfigStruct
 }
 
 type ChannelData struct {
-	Name           string    `json:"name"`
+	Name          string `json:"name"`
-	AdminKey       string    `json:"value,omitempty"`
+	AdminKey	  string `json:"value,omitempty"`
-	Command        string    `json:"customcommand,omitempty"`
+	CustomCommand string `json:"customcommand,omitempty"`
-	ExtraStrings   string    `json:"extrastrings,omitempty"`
+	ExtraStrings  string `json:"extrastrings,omitempty"`
-	JoinTime       time.Time `json:"jointime"`
+	JoinTime      time.Time `json:"jointime"`
-	ControlChannel bool
-	HasLeft        bool      `json:"hasleft"`
 }
 
 // Connects the bot to the Twitch IRC server. The bot will continue to try to connect until it
@@ -110,17 +90,6 @@ func (bb *KardBot) Disconnect() {
 	rgb.YPrintf("[%s] Closed connection from %s! | Live for: %fs\n", TimeStamp(), bb.Server, upTime)
 }
 
-// Look at the channels I'm actually in
-func (bb *KardBot) ActiveChannels() int {
-	count := 0
-	for _, channel := range bb.ChannelData {
-		if !channel.HasLeft {
-			count = count + 1
-		}
-	}
-	return count
-}
-
 // Listens for and logs messages from chat. Responds to commands from the channel owner. The bot
 // continues until it gets disconnected, told to shutdown, or forcefully shutdown.
 func (bb *KardBot) HandleChat() error {
@@ -149,29 +118,9 @@ func (bb *KardBot) HandleChat() error {
 			bb.conn.Write([]byte("PONG :tmi.twitch.tv\r\n"))
 			continue
 		} else {
-			matches := ConnectRegex.FindStringSubmatch(line)
-			if nil != matches {
-				realUserName := matches[1]
-				if bb.ChannelData[realUserName].Name == "" {
-					record := ChannelData{Name: realUserName, JoinTime: time.Now(), Command: "card", ControlChannel: true}
-					bb.Database.Write("channelData", realUserName, record)
-					bb.ChannelData[realUserName] = record
-				}
-				bb.JoinChannel(realUserName)
-			}
-
-			matches = DirectMsgRegex.FindStringSubmatch(line)
-			if nil != matches {
-				userName := matches[1]
-//				msgType := matches[2]
-//				channel := matches[3]
-				msg := matches[4]
-				rgb.GPrintf("[%s] Direct message %s: %s\n", TimeStamp(), userName, msg)
-
-			}
 
 			// handle a PRIVMSG message
-			matches = MsgRegex.FindStringSubmatch(line)
+			matches := MsgRegex.FindStringSubmatch(line)
 			if nil != matches {
 				userName := matches[1]
 				msgType := matches[2]
@@ -187,22 +136,11 @@ func (bb *KardBot) HandleChat() error {
 					if nil != cmdMatches {
 						cmd := cmdMatches[1]
 
-						rgb.YPrintf("[%s] Checking cmd %s against %s\n", TimeStamp(), cmd, bb.ChannelData[channel].Command)
 						switch cmd {
-						case bb.ChannelData[channel].Command:
+						case "card":
 							rgb.CPrintf("[%s] Card asked for by %s on %s' channel!\n", TimeStamp(), userName, channel)
 
 							bb.Say("Your prompt is : "+bb.Prompts[rand.Intn(len(bb.Prompts))], channel)
-						case "join":
-							if bb.ChannelData[channel].ControlChannel {
-								rgb.CPrintf("[%s] Join asked for by %s on %s' channel!\n", TimeStamp(), userName, channel)
-								if bb.ChannelData[userName].Name == "" {
-									record := ChannelData{Name: userName, JoinTime: time.Now(), Command: "card", ControlChannel: true}
-									bb.Database.Write("channelData", userName, record)
-									bb.ChannelData[userName] = record
-								}
-								bb.JoinChannel(userName)
-							}
 						}
 
 						// channel-owner specific commands
@@ -216,17 +154,13 @@ func (bb *KardBot) HandleChat() error {
 
 								bb.Disconnect()
 								return nil
-							case "kcardadmin":
+							case "wat":
-								magicCode := bb.ReadOrCreateChannelKey(channel)
+								magicCode := bb.readOrCreateChannelKey(channel)
 								rgb.CPrintf(
 									"[%s] Magic code is %s - https://karaokards.ing.martyn.berlin/admin/%s/%s\n",
 									TimeStamp(),
 									magicCode, userName, magicCode,
 								)
-								err := bb.Msg("Welcome to Karaokards, your admin panel is https://karaokards.ing.martyn.berlin/admin/"+userName+"/"+magicCode, userName)
-								if err != nil {
-									rgb.RPrintf("[%s] ERROR %s\n",err)
-								}
 								bb.Say("Ack.")
 							default:
 								// do nothing
@@ -246,18 +180,10 @@ func (bb *KardBot) HandleChat() error {
 // Login to the IRC server
 func (bb *KardBot) Login() {
 	rgb.YPrintf("[%s] Logging into #%s...\n", TimeStamp(), bb.Channel)
-	bb.conn.Write([]byte("PASS " + bb.IrcCredentials.Password + "\r\n"))
+	bb.conn.Write([]byte("PASS " + bb.Credentials.Password + "\r\n"))
 	bb.conn.Write([]byte("NICK " + bb.Name + "\r\n"))
 }
 
-func (bb *KardBot) LeaveChannel(channels ...string) {
-	for _, channel := range channels {
-		rgb.YPrintf("[%s] Leaving #%s...\n", TimeStamp(), channel)
-		bb.conn.Write([]byte("PART #" + channel + "\r\n"))
-		rgb.YPrintf("[%s] Left #%s as @%s!\n", TimeStamp(), channel, bb.Name)
-	}
-}
-
 // Makes the bot join its pre-specified channel.
 func (bb *KardBot) JoinChannel(channels ...string) {
 	if len(channels) == 0 {
@@ -271,59 +197,23 @@ func (bb *KardBot) JoinChannel(channels ...string) {
 	}
 }
 
-// Reads from the private credentials file and stores the data in the bot's appropriate Credentials field.
+// Reads from the private credentials file and stores the data in the bot's Credentials field.
-func (bb *KardBot) ReadCredentials(credType string) error {
+func (bb *KardBot) ReadCredentials() error {
 
-	var err error
-    var credFile []byte
 	// reads from the file
-	if credType == "IRC" {
+	credFile, err := ioutil.ReadFile(bb.PrivatePath)
-		credFile, err = ioutil.ReadFile(bb.IrcPrivatePath)
-	} else {
-		credFile, err = ioutil.ReadFile(bb.AppPrivatePath)
-	}
 	if nil != err {
 		return err
 	}
 
+	bb.Credentials = &OAuthCred{}
+
 	// parses the file contents
-	var creds OAuthCred
 	dec := json.NewDecoder(strings.NewReader(string(credFile)))
-	if err = dec.Decode(&creds); nil != err && io.EOF != err {
+	if err = dec.Decode(bb.Credentials); nil != err && io.EOF != err {
 		return err
 	}
 
-	if credType == "IRC" {
-		bb.IrcCredentials = &creds
-	} else {
-		bb.AppCredentials = &creds
-	}
-
-	return nil
-}
-
-func (bb *KardBot) Msg(msg string, users ...string) error {
-	if "" == msg {
-		return errors.New("BasicBot.Say: msg was empty.")
-	}
-
-	// check if message is too large for IRC
-	if len(msg) > 512 {
-		return errors.New("BasicBot.Say: msg exceeded 512 bytes")
-	}
-
-	if len(users) == 0 {
-		return errors.New("BasicBot.Say: users was empty.")
-	}
-
-	rgb.YPrintf("[%s] sending %s to users %v as @%s!\n", TimeStamp(), msg, users, bb.Name)
-	for _, channel := range users {
-		_, err := bb.conn.Write([]byte(fmt.Sprintf("PRIVMSG %s :%s\r\n", channel, msg)))
-		rgb.YPrintf("[%s] PRIVMSG %s :%s\r\n", TimeStamp(), channel, msg)
-		if nil != err {
-			return err
-		}
-	}
 	return nil
 }
 
@@ -357,20 +247,13 @@ func (bb *KardBot) Say(msg string, channels ...string) error {
 // pre-specified channel, and then handle the chat. It will attempt to reconnect until it is told to
 // shut down, or is forcefully shutdown.
 func (bb *KardBot) Start() {
-	err := bb.ReadCredentials("IRC")
+	err := bb.ReadCredentials()
 	if nil != err {
 		fmt.Println(err)
 		fmt.Println("Aborting!")
 		return
 	}
-
+	
-	err = bb.ReadCredentials("App")
-	if nil != err {
-		fmt.Println(err)
-		fmt.Println("Aborting!")
-		return
-	}
-
 	err = bb.readChannelData()
 	if nil != err {
 		fmt.Println(err)
@@ -381,11 +264,9 @@ func (bb *KardBot) Start() {
 	for {
 		bb.Connect()
 		bb.Login()
-		if len(bb.ChannelData) > 0 {
+		if len(bb.channelData) > 0 {
-			for channelName,channelData := range bb.ChannelData {
+			for channelName := range(bb.channelData) {
-				if !channelData.HasLeft {
+				bb.JoinChannel(channelName)
-					bb.JoinChannel(channelName)
-				}
 			}
 		} else {
 			bb.JoinChannel()
@@ -407,65 +288,43 @@ func (bb *KardBot) readChannelData() error {
 	records, err := bb.Database.ReadAll("channelData")
 	if err != nil {
 		// no db? initialise one?
-		record := ChannelData{Name: bb.Channel, JoinTime: time.Now(), Command: "card"}
+		record := ChannelData{Name: bb.Channel, JoinTime: time.Now()}
-		rgb.YPrintf("[%s] No channel table for #%s exists, creating...\n", TimeStamp(), bb.Channel)
+		rgb.YPrintf("[%s] No channel data for #%s exists, creating...\n", TimeStamp(), bb.Channel)
 		if err := bb.Database.Write("channelData", bb.Channel, record); err != nil {
 			return err
 		}
-		bb.ChannelData = make(map[string]ChannelData)
+		bb.channelData = make(map[string]ChannelData)
-		bb.ChannelData[bb.Channel] = record
+		bb.channelData[bb.Channel] = record;
 	} else {
-		bb.ChannelData = make(map[string]ChannelData)
+		bb.channelData = make(map[string]ChannelData)
 	}
 	for _, data := range records {
 		record := ChannelData{}
-		err := json.Unmarshal([]byte(data), &record)
+		err := json.Unmarshal([]byte(data), &record);
 		if err != nil {
 			return err
 		}
-		if record.Name != "" {
+		bb.channelData[record.Name] = record
-			if record.Command == "" {
-				record.Command = "card"
-
-				rgb.YPrintf("[%s] Rewriting data for #%s...\n", TimeStamp(), bb.Channel)
-				if err := bb.Database.Write("channelData", record.Name, record); err != nil {
-					return err
-				}
-			}
-			bb.ChannelData[record.Name] = record
-		}
 	}
-	// Managed to leave the main channel!?
-	if bb.ChannelData[bb.Channel].Name == "" {
-		rgb.YPrintf("[%s] No channel data for #%s exists, creating...\n", TimeStamp(), bb.Channel)
-		record := ChannelData{Name: bb.Channel, JoinTime: time.Now(), Command: "card"}
-		bb.ChannelData[bb.Channel] = record
-		if err := bb.Database.Write("channelData", bb.Channel, record); err != nil {
-			return err
-		}
-		records, err = bb.Database.ReadAll("channelData")
-	}
-	rgb.YPrintf("[%s] Read channel data for %d channels\n", TimeStamp(), len(bb.ChannelData))
 	return nil
 }
 
-func (bb *KardBot) ReadOrCreateChannelKey(channel string) string {
+func (bb *KardBot) readOrCreateChannelKey(channel string) string {
 	magicCode := ""
 	var err error
 	var record ChannelData
-	if record, ok := bb.ChannelData[channel]; !ok {
+	if record, ok := bb.channelData[channel]; !ok {
 		rgb.YPrintf("[%s] No channel data for #%s exists, creating\n", TimeStamp(), channel)
-		err = bb.Database.Read("channelData", channel, &record)
+		err = bb.Database.Read("channelData", channel, &record);
 		if err == nil {
-			bb.ChannelData[channel] = record
+			bb.channelData[channel] = record
 		}
 	}
-	record = bb.ChannelData[channel]
+	record = bb.channelData[channel]
 	if err != nil || record.AdminKey == "" {
 		rgb.YPrintf("[%s] No channel key for #%s exists, creating one\n", TimeStamp(), channel)
 		newuu, _ := uuid.NewRandom()
 		magicCode = base64.StdEncoding.EncodeToString([]byte(newuu.String()))
-		record.HasLeft = true
 		record.AdminKey = magicCode
 		if record.Name == "" {
 			record.Name = channel
@@ -473,7 +332,7 @@ func (bb *KardBot) ReadOrCreateChannelKey(channel string) string {
 		if err := bb.Database.Write("channelData", channel, record); err != nil {
 			rgb.RPrintf("[%s] Error writing channel data for #%s\n", TimeStamp(), channel)
 		}
-		bb.ChannelData[record.Name] = record
+		bb.channelData[record.Name] = record
 		rgb.YPrintf("[%s] Cached channel key for #%s\n", TimeStamp(), record.Name)
 	} else {
 		magicCode = record.AdminKey
@@ -483,9 +342,9 @@ func (bb *KardBot) ReadOrCreateChannelKey(channel string) string {
 }
 
 func TimeStamp() string {
-	return TimeStampFmt(UTCFormat)
+	return TimeStampFmt(PSTFormat)
 }
 
 func TimeStampFmt(format string) string {
 	return time.Now().Format(format)
-}
+}

internal/webserver/webserver.go

@@ -10,41 +10,14 @@ import (
 	"fmt"
 	"html/template"
 	"net/http"
-	"net/url"
 	"os"
 	"strings"
 	"time"
-	"encoding/json"
-	"io/ioutil"
 )
 
 //var store = sessions.NewCookieStore(os.Getenv("SESSION_KEY"))
 
-type twitchauthresponse struct {
+var ircBot irc.KardBot
-	Access_token string `json: "access_token"`
-	Expires_in int `json: "expires_in"`
-	Refresh_token string `json: "refresh_token"`
-	Scope []string `json: "scope"`
-	Token_type string `json: "token_type"`
-}
-
-type twitchUser struct {
-	Id string `json: "id"`
-	Login string `json: "login"`
-	Display_name string `json: "display_name"`
-	Type string `json: "type"`
-	Broadcaster_type string `json: "affiliate"`
-	Description string `json: "description"`
-	Profile_image_url string `json: "profile_image_url"`
-	Offline_image_url string `json: "offline_image_url"`
-	View_count int `json: "view_count"`
-}
-
-type twitchUsersBigResponse struct {
-	Data []twitchUser `json:"data"`
-}
-
-var ircBot *irc.KardBot
 
 func HealthHandler(response http.ResponseWriter, request *http.Request) {
 	response.Header().Add("Content-type", "text/plain")
@@ -76,8 +49,6 @@ func TemplateHandler(response http.ResponseWriter, request *http.Request) {
 		AvailCount   int
 		ChannelCount int
 		MessageCount int
-		ClientID     string
-		BaseURI      string
 	}
 	// tmpl, err := template.New("html"+request.URL.Path).Funcs(template.FuncMap{
 	// 	"ToUpper": strings.ToUpper,
@@ -102,7 +73,7 @@ func TemplateHandler(response http.ResponseWriter, request *http.Request) {
 		// NotFoundHandler(response, request)
 		// return
 	}
-	var td = TemplateData{ircBot.Prompts[rand.Intn(len(ircBot.Prompts))], len(ircBot.Prompts), ircBot.ActiveChannels(), 0, ircBot.AppCredentials.ClientID, "https://"+ircBot.Config.ExternalUrl}
+	var td = TemplateData{ircBot.Prompts[rand.Intn(len(ircBot.Prompts))], len(ircBot.Prompts), 0, 0}
 	err = tmpl.Execute(response, td)
 	if err != nil {
 		http.Error(response, err.Error(), http.StatusInternalServerError)
@@ -110,238 +81,21 @@ func TemplateHandler(response http.ResponseWriter, request *http.Request) {
 	}
 }
 
-func LeaveHandler(response http.ResponseWriter, request *http.Request) {
+func AdminHandler(response http.ResponseWriter, request *http.Request) {
-	request.URL.Path = "/bye.html"
+	request.URL.Path = "/index.html"
 	TemplateHandler(response, request)
 }
 
-func AdminHandler(response http.ResponseWriter, request *http.Request) {
+func HandleHTTP(passedIrcBot irc.KardBot) {
-	vars := mux.Vars(request)
-	if vars["key"] != ircBot.ChannelData[vars["channel"]].AdminKey {
-		UnauthorizedHandler(response, request)
-		return
-	}
-	type TemplateData struct {
-		Channel      string
-		Command      string
-		ExtraStrings string
-		SinceTime    time.Time
-		SinceTimeUTC string
-		Leaving      bool
-		HasLeft      bool
-	}
-	channelData := ircBot.ChannelData[vars["channel"]]
-	var td = TemplateData{channelData.Name, channelData.Command, channelData.ExtraStrings, channelData.JoinTime, channelData.JoinTime.Format(irc.UTCFormat), false, channelData.HasLeft}
-
-	if request.Method == "POST" {
-		request.ParseForm()
-		if strings.Join(request.PostForm["leave"], ",") == "Leave twitch channel" {
-			td.Leaving = true
-		} else if strings.Join(request.PostForm["reallyleave"], ",") == "Really leave twitch channel" {
-			record := ircBot.ChannelData[vars["channel"]]
-			record.HasLeft = true
-			ircBot.ChannelData[vars["channel"]] = record
-			ircBot.LeaveChannel(vars["channel"])
-			ircBot.Database.Write("channelData", vars["channel"], record)
-			LeaveHandler(response, request)
-			return
-		}
-		if strings.Join(request.PostForm["join"], ",") == "Come on in" {
-			record := ircBot.ChannelData[vars["channel"]]
-			td.HasLeft = false
-			record.Name = vars["channel"]
-			record.JoinTime = time.Now()
-			record.HasLeft = false
-			if record.Command == "" {
-				record.Command = "card"
-			}
-			ircBot.Database.Write("channelData", vars["channel"], record)
-			ircBot.ChannelData[vars["channel"]] = record
-			td = TemplateData{record.Name, record.Command, record.ExtraStrings, record.JoinTime, record.JoinTime.Format(irc.UTCFormat), false, record.HasLeft}
-			ircBot.JoinChannel(record.Name)
-		}
-		sourceData := ircBot.ChannelData[vars["channel"]]
-		if strings.Join(request.PostForm["Command"], ",") != "" {
-			sourceData.Command = strings.Join(request.PostForm["Command"], ",")
-			td.Command = sourceData.Command
-			ircBot.ChannelData[vars["channel"]] = sourceData
-		}
-		if strings.Join(request.PostForm["ExtraStrings"], ",") != sourceData.ExtraStrings {
-			sourceData.ExtraStrings = strings.Join(request.PostForm["ExtraStrings"], ",")
-			td.ExtraStrings = sourceData.ExtraStrings
-			ircBot.ChannelData[vars["channel"]] = sourceData
-		}
-		ircBot.Database.Write("channelData", vars["channel"], sourceData)
-	}
-	tmpl := template.Must(template.ParseFiles("web/admin.html"))
-	tmpl.Execute(response, td)
-}
-
-func UnauthorizedHandler(response http.ResponseWriter, request *http.Request) {
-	response.Header().Add("X-Template-File", "html"+request.URL.Path)
-	response.WriteHeader(401)
-	tmpl := template.Must(template.ParseFiles("web/401.html"))
-	tmpl.Execute(response, nil)
-}
-
-func twitchHTTPClient(call string, bearer string) (string,error) {
-	url := "https://api.twitch.tv/helix/" + call
-	var bearerHeader = "Bearer " + bearer
-
-    req, err := http.NewRequest("GET", url, nil)
-    req.Header.Add("Authorization", bearerHeader)
-
-    client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return "",err
-	}
-	defer resp.Body.Close()
-
-	body, _ := ioutil.ReadAll(resp.Body)
-    return string([]byte(body)), nil
-}
-
-func TwitchAdminHandler(response http.ResponseWriter, request *http.Request) {
-	
-	vars := mux.Vars(request)
-	if (vars["code"] != "") {
-		response.Header().Add("Content-type", "text/plain")
-		resp, err := http.PostForm(
-			"https://id.twitch.tv/oauth2/token", 
-			url.Values{
-				"client_id": {ircBot.AppCredentials.ClientID},
-				"client_secret": {ircBot.AppCredentials.Password},
-				"code": {vars["code"]},
-				"grant_type": {"authorization_code"},
-				"redirect_uri": {"https://"+ircBot.Config.ExternalUrl+"/twitchadmin"}})
-		if err != nil {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-			return
-		}
-
-		defer resp.Body.Close()
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-			return
-		}
-
-		var oauthResponse twitchauthresponse
-		err = json.Unmarshal(body, &oauthResponse)
-		if err != nil {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-			return
-		}
-
-		usersResponse, err := twitchHTTPClient("users", oauthResponse.Access_token)
-		if err != nil {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-			return
-		}
-
-		var usersObject twitchUsersBigResponse
-		err = json.Unmarshal([]byte(usersResponse), &usersObject)
-		if err != nil {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-			return
-		}
-
-		if len(usersObject.Data) != 1 {
-			response.WriteHeader(500)
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: Twitch returned not 1 user for the request!")
-			return
-		}
-
-		user := usersObject.Data[0]
-		
-		magicCode := ircBot.ReadOrCreateChannelKey(user.Login)
-		url := "https://"+ircBot.Config.ExternalUrl+"/admin/"+user.Login+"/"+magicCode
-        http.Redirect(response, request, url, http.StatusFound)
-
-
-	} else {
-		
-		fmt.Fprintf(response, "I'm not okay jack! %v \n", vars)
-		for key, val := range(vars) {
-			fmt.Fprint(response, "%s = %s\n", key, val)
-		}
-	}
-}
-
-func TwitchBackendHandler(response http.ResponseWriter, request *http.Request){
-	response.Header().Add("Content-type", "text/plain")
-	vars := mux.Vars(request)
-	// fmt.Fprintf(response, "I'm okay jack! %v \n", vars)
-	// for key, val := range(vars) {
-	// 	fmt.Fprint(response, "%s = %s\n", key, val)
-	// }
-	
-	if (vars["code"] != "") {
-		// https://id.twitch.tv/oauth2/token
-		// ?client_id=<your client ID>
-        // &client_secret=<your client secret>
-        // &code=<authorization code received above>
-        // &grant_type=authorization_code
-		// &redirect_uri=<your registered redirect URI>
-		
-		// ircBot.AppCredentials.ClientID
-		// ircBot.AppCredentials.Password
-		// vars["oauthtoken"]
-		// authorization_code
-		// "https://"+ircBot.Config.ExternalUrl+/twitchadmin
-		fmt.Println("Asking twitch for more...")
-		resp, err := http.PostForm(
-			"https://id.twitch.tv/oauth2/token", 
-			url.Values{
-				"client_id": {ircBot.AppCredentials.ClientID},
-				"client_secret": {ircBot.AppCredentials.Password},
-				"code": {vars["code"]},
-				"grant_type": {"authorization_code"},
-				"redirect_uri": {"https://"+ircBot.Config.ExternalUrl+"/twitchadmin"}})
-		if err != nil {
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-		}
-		defer resp.Body.Close()
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			response.Header().Add("Content-type", "text/plain")
-			fmt.Fprint(response, "ERROR: "+err.Error())
-		}
-		response.Header().Add("Content-type", "text/plain")
-		fmt.Fprint(response, string(body))
-	} else {
-		UnauthorizedHandler(response, request)
-	}
-}
-
-func HandleHTTP(passedIrcBot *irc.KardBot) {
 	ircBot = passedIrcBot
 	r := mux.NewRouter()
 	loggedRouter := handlers.LoggingHandler(os.Stdout, r)
 	r.NotFoundHandler = http.HandlerFunc(NotFoundHandler)
 	r.HandleFunc("/", RootHandler)
 	r.HandleFunc("/healthz", HealthHandler)
-	r.HandleFunc("/web/{.*}", TemplateHandler)
+	r.HandleFunc("/example/{.*}", TemplateHandler)
-	r.PathPrefix("/static/").Handler(http.FileServer(http.Dir("./web/")))
 	r.HandleFunc("/cover.css", CSSHandler)
 	r.HandleFunc("/admin/{channel}/{key}", AdminHandler)
-	//r.HandleFunc("/twitchadmin", TwitchAdminHandler)
-	//r.HandleFunc("/twitchtobackend", TwitchBackendHandler)
-	r.Path("/twitchtobackend").Queries("access_token","{access_token}","scope","{scope}","token_type","{token_type}").HandlerFunc(TwitchBackendHandler)
-	r.Path("/twitchadmin").Queries("code","{code}","scope","{scope}").HandlerFunc(TwitchAdminHandler)
 	http.Handle("/", r)
 	srv := &http.Server{
 		Handler:      loggedRouter,

main.go

@@ -1,236 +1,214 @@
-package main
+package main
-
+
-import (
+import (
-	"encoding/json"
+	"encoding/json"
-	"io/ioutil"
+	"io/ioutil"
-	"math/rand"
+	"math/rand"
-	"os"
+	"os"
-	"path/filepath"
+	"path/filepath"
-	"time"
+	"time"
-
+
-	builtins "git.martyn.berlin/martyn/karaokards/internal/builtins"
+	builtins "git.martyn.berlin/martyn/karaokards/internal/builtins"
-	irc "git.martyn.berlin/martyn/karaokards/internal/irc"
+	irc "git.martyn.berlin/martyn/karaokards/internal/irc"
-	webserver "git.martyn.berlin/martyn/karaokards/internal/webserver"
+	webserver "git.martyn.berlin/martyn/karaokards/internal/webserver"
-	rgb "github.com/foresthoffman/rgblog"
+	rgb "github.com/foresthoffman/rgblog"
-	scribble "github.com/nanobox-io/golang-scribble"
+	scribble "github.com/nanobox-io/golang-scribble"
-)
+)
-
+
-type customStringsStruct struct {
+type configStruct struct {
-	Strings []string `json:"strings,omitempty"`
+	InitialChannels []string `json:"channels"`
-}
+	OAuthPath       string   `json:"oauthpath,omitempty"`
-
+	StringPath      string   `json:"authpath,omitempty"`
-var selectablePrompts []string
+	DataPath        string   `json:"datapath,omitempty"`
-
+}
-var customStrings customStringsStruct
+
-
+type customStringsStruct struct {
-var config irc.ConfigStruct
+	Strings []string `json:"strings,omitempty"`
-
+}
-func readConfig() {
+
-	var data []byte
+var selectablePrompts []string
-	var err error
+
-	configFile := ""
+var customStrings customStringsStruct
-	if os.Getenv("KARAOKARDS_CONFIGFILE") != "" {
+
-		if _, err := os.Stat(os.Getenv("KARAOKARDS_CONFIGFILE")); os.IsNotExist(err) {
+var config configStruct
-			rgb.RPrintf("[%s] Error, KARAOKARDS_CONFIGFILE env var set and '%s' doesn't exist!\n", irc.TimeStamp(), os.Getenv("KARAOKARDS_CONFIGFILE"))
+
-			os.Exit(1)
+func readConfig() {
-		}
+	var data []byte
-		configFile = os.Getenv("KARAOKARDS_CONFIGFILE")
+	var err error
-	} else {
+	configFile := ""
-		ex, err := os.Executable()
+	if os.Getenv("KARAOKARDS_CONFIGFILE") != "" {
-		if err != nil {
+		if _, err := os.Stat(os.Getenv("KARAOKARDS_CONFIGFILE")); os.IsNotExist(err) {
-			rgb.YPrintf("[%s] Warning, KARAOKARDS_CONFIGFILE env var unset and cannot find executable!\n", irc.TimeStamp())
+			rgb.RPrintf("[%s] Error, KARAOKARDS_CONFIGFILE env var set and '%s' doesn't exist!\n", irc.TimeStamp(), os.Getenv("KARAOKARDS_CONFIGFILE"))
-		}
+			os.Exit(1)
-		exPath := filepath.Dir(ex)
+		}
-		if _, err := os.Stat(exPath + "/config.json"); os.IsNotExist(err) {
+		configFile = os.Getenv("KARAOKARDS_CONFIGFILE")
-			rgb.YPrintf("[%s] Warning, KARAOKARDS_CONFIGFILE env var unset and `config.json` not alongside executable!\n", irc.TimeStamp())
+	} else {
-			if _, err := os.Stat("/etc/karaokards/config.json"); os.IsNotExist(err) {
+		ex, err := os.Executable()
-				rgb.RPrintf("[%s] Error, KARAOKARDS_CONFIGFILE env var unset and neither '%s' nor '%s' exist!\n", irc.TimeStamp(), exPath+"/config.json", "/etc/karaokards/config.json")
+		if err != nil {
-				os.Exit(1)
+			rgb.YPrintf("[%s] Warning, KARAOKARDS_CONFIGFILE env var unset and cannot find executable!\n", irc.TimeStamp())
-			} else {
+		}
-				configFile = "/etc/karaokards/config.json"
+		exPath := filepath.Dir(ex)
-			}
+		if _, err := os.Stat(exPath + "/config.json"); os.IsNotExist(err) {
-		} else {
+			rgb.YPrintf("[%s] Warning, KARAOKARDS_CONFIGFILE env var unset and `config.json` not alongside executable!\n", irc.TimeStamp())
-			configFile = exPath + "/config.json"
+			if _, err := os.Stat("/etc/karaokards/config.json"); os.IsNotExist(err) {
-		}
+				rgb.RPrintf("[%s] Error, KARAOKARDS_CONFIGFILE env var unset and neither '%s' nor '%s' exist!\n", irc.TimeStamp(), exPath + "/config.json", "/etc/karaokards/config.json")
-	}
+				os.Exit(1)
-	data, err = ioutil.ReadFile(configFile)
+			} else {
-	if err != nil {
+				configFile = "/etc/karaokards/config.json"
-		rgb.RPrintf("[%s] Could not read `%s`. File reading error: %s\n", irc.TimeStamp(), configFile, err)
+			}
-		os.Exit(1)
+		} else {
-	}
+			configFile = exPath + "/config.json"
-	err = json.Unmarshal(data, &config)
+		}
-	if err != nil {
+	}
-		rgb.RPrintf("[%s] Could not unmarshal `%s`. Unmarshal error: %s\n", irc.TimeStamp(), configFile, err)
+	data, err = ioutil.ReadFile(configFile)
-		os.Exit(1)
+	if err != nil {
-	}
+		rgb.RPrintf("[%s] Could not read `%s`. File reading error: %s\n", irc.TimeStamp(), configFile, err)
-	rgb.YPrintf("[%s] Read config file from `%s`\n", irc.TimeStamp(), configFile)
+		os.Exit(1)
-	rgb.YPrintf("[%s] config %v\n", irc.TimeStamp(), config)
+	}
-	return
+	err = json.Unmarshal(data, &customStrings)
-}
+	if err != nil {
-
+		rgb.RPrintf("[%s] Could not unmarshal `%s`. Unmarshal error: %s\n", irc.TimeStamp(), configFile, err)
-//openDatabase "database" in this sense being a scribble db
+		os.Exit(1)
-func openDatabase() *scribble.Driver {
+	}
-	dataPath := ""
+	rgb.YPrintf("[%s] Read config file from `%s`\n", irc.TimeStamp(), configFile)
-	if config.DataPath == "" {
+	return
-		if os.Getenv("KARAOKARDS_DATA_FOLDER") != "" {
+}
-			if _, err := os.Stat(os.Getenv("KARAOKARDS_DATA_FOLDER")); os.IsNotExist(err) {
+
-				rgb.RPrintf("[%s] Error, KARAOKARDS_DATA_FOLDER env var set and '%s' doesn't exist!\n", irc.TimeStamp(), os.Getenv("KARAOKARDS_DATA_FOLDER"))
+//openDatabase "database" in this sense being a scribble db
-				os.Exit(1)
+func openDatabase() *scribble.Driver {
-			}
+	dataPath := ""
-			dataPath = os.Getenv("KARAOKARDS_DATA_FOLDER")
+	if config.DataPath == "" {
-		} else {
+		if os.Getenv("KARAOKARDS_DATA_FOLDER") != "" {
-			ex, err := os.Executable()
+			if _, err := os.Stat(os.Getenv("KARAOKARDS_DATA_FOLDER")); os.IsNotExist(err) {
-			if err != nil {
+				rgb.RPrintf("[%s] Error, KARAOKARDS_DATA_FOLDER env var set and '%s' doesn't exist!\n", irc.TimeStamp(), os.Getenv("KARAOKARDS_DATA_FOLDER"))
-				rgb.RPrintf("[%s] Error, KARAOKARDS_DATA_FOLDER env var unset and cannot find executable!\n", irc.TimeStamp())
+				os.Exit(1)
-				os.Exit(1)
+			}
-			}
+			dataPath = os.Getenv("KARAOKARDS_DATA_FOLDER")
-			exPath := filepath.Dir(ex)
+		} else {
-			if _, err := os.Stat(exPath + "/data"); os.IsNotExist(err) {
+			ex, err := os.Executable()
-				rgb.YPrintf("[%s] Warning %s doesn't exist, trying to create it.\n", irc.TimeStamp(), exPath+"/data")
+			if err != nil {
-				err = os.Mkdir(exPath+"/data", 0770)
+				rgb.RPrintf("[%s] Error, KARAOKARDS_DATA_FOLDER env var unset and cannot find executable!\n", irc.TimeStamp())
-				if err != nil {
+				os.Exit(1)
-					rgb.RPrintf("[%s] Error cannot create %s: %s!\n", irc.TimeStamp(), exPath+"/data", err)
+			}
-					os.Exit(1)
+			exPath := filepath.Dir(ex)
-				}
+			if _, err := os.Stat(exPath + "/data"); os.IsNotExist(err) {
-			}
+				rgb.YPrintf("[%s] Warning %s doesn't exist, trying to create it.\n", irc.TimeStamp(), exPath + "/data")
-			dataPath = exPath + "/data"
+				err = os.Mkdir(exPath + "/data", 0770)
-		}
+				if err != nil {
-	} else {
+					rgb.RPrintf("[%s] Error cannot create %s: %s!\n", irc.TimeStamp(), exPath + "/data", err)
-		if _, err := os.Stat(config.DataPath); os.IsNotExist(err) {
+					os.Exit(1)
-			rgb.RPrintf("[%s] Error, config-specified path '%s' doesn't exist!\n", irc.TimeStamp(), config.DataPath)
+				}
-			os.Exit(1)
+			}
-		}
+			dataPath = exPath + "/data"
-		dataPath = config.DataPath
+		}
-	}
+	} else {
-	db, err := scribble.New(dataPath, nil)
+		if _, err := os.Stat(config.OAuthPath); os.IsNotExist(err) {
-	if err != nil {
+			rgb.RPrintf("[%s] Error, config-specified path '%s' doesn't exist!\n", irc.TimeStamp(), os.Getenv("KARAOKARDS_DATA_FOLDER"))
-		rgb.RPrintf("[%s] Error opening database in '%s' : %s\n", irc.TimeStamp(), dataPath, err)
+			os.Exit(1)
-		os.Exit(1)
+		}
-	}
+		dataPath = config.DataPath
-	return db
+	}
-}
+	db, err := scribble.New(dataPath, nil)
-
+	if err != nil {
-func readBonusStrings() []string {
+		rgb.RPrintf("[%s] Error opening database in '%s' : %s\n", irc.TimeStamp(), dataPath, err)
-	var data []byte
+		os.Exit(1)
-	var err error
+	}
-	if config.StringPath == "" {
+	return db
-		ex, err := os.Executable()
+}
-		if err != nil {
+
-			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
+func readBonusStrings() []string {
-			return []string{}
+	var data []byte
-		}
+	var err error
-		exPath := filepath.Dir(ex)
+	if config.StringPath == "" {
-		data, err = ioutil.ReadFile(exPath + "/strings.json")
+		ex, err := os.Executable()
-		if err != nil {
+		if err != nil {
-			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
+			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
-			return []string{}
+			return []string{}
-		}
+		}
-	} else {
+		exPath := filepath.Dir(ex)
-		data, err = ioutil.ReadFile(config.StringPath)
+		data, err = ioutil.ReadFile(exPath + "/strings.json")
-		if err != nil {
+		if err != nil {
-			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
+			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
-			return []string{}
+			return []string{}
-		}
+		}
-	}
+	} else {
-	err = json.Unmarshal(data, &customStrings)
+		data, err = ioutil.ReadFile(config.StringPath)
-	if err != nil {
+		if err != nil {
-		rgb.YPrintf("[%s] Could not unmarshal `strings.json`, will only have builtin prompts. Unmarshal error: %s\n", irc.TimeStamp(), err)
+			rgb.YPrintf("[%s] Could not read `strings.json`, will only have builtin prompts. File reading error: %s\n", irc.TimeStamp(), err)
-		return []string{}
+			return []string{}
-	}
+		}
-	rgb.YPrintf("[%s] Read %d prompts from `strings.json`\n", irc.TimeStamp(), len(customStrings.Strings))
+	}
-	return customStrings.Strings
+	err = json.Unmarshal(data, &customStrings)
-}
+	if err != nil {
-
+		rgb.YPrintf("[%s] Could not unmarshal `strings.json`, will only have builtin prompts. Unmarshal error: %s\n", irc.TimeStamp(), err)
-var buildDate string
+		return []string{}
-
+	}
-func main() {
+	rgb.YPrintf("[%s] Read %d prompts from `strings.json`\n", irc.TimeStamp(), len(customStrings.Strings))
-	rgb.YPrintf("[%s] starting karaokard bot build %s\n", irc.TimeStamp(), buildDate)
+	return customStrings.Strings
-	readConfig()
+}
-	rand.Seed(time.Now().UnixNano())
+
-	for _, val := range builtins.Karaokards {
+var buildDate string
-		selectablePrompts = append(selectablePrompts, val)
+
-	}
+func main() {
-	for _, val := range readBonusStrings() {
+	rgb.YPrintf("[%s] starting karaokard bot build %s\n", irc.TimeStamp(), buildDate)
-		selectablePrompts = append(selectablePrompts, val)
+	readConfig()
-	}
+	rand.Seed(time.Now().UnixNano())
-	persistentData := openDatabase()
+	for _, val := range builtins.Karaokards {
-	var dbGlobalPrompts []string
+		selectablePrompts = append(selectablePrompts, val)
-	if err := persistentData.Read("prompts", "global", &dbGlobalPrompts); err != nil {
+	}
-		persistentData.Write("prompts", "common", dbGlobalPrompts)
+	for _, val := range readBonusStrings() {
-	}
+		selectablePrompts = append(selectablePrompts, val)
-	selectablePrompts := append(selectablePrompts, dbGlobalPrompts...)
+	}
-
+	persistentData := openDatabase()
-	rgb.YPrintf("[%s] %d prompts available.\n", irc.TimeStamp(), len(selectablePrompts))
+	var dbGlobalPrompts []string
-	ircOauthPath := ""
+	if err := persistentData.Read("prompts", "global", &dbGlobalPrompts); err != nil {
-	if config.IrcOAuthPath == "" {
+		persistentData.Write("prompts", "common", dbGlobalPrompts)
-		if os.Getenv("TWITCH_OAUTH_JSON") != "" {
+	}
-			if _, err := os.Stat(os.Getenv("TWITCH_OAUTH_JSON")); os.IsNotExist(err) {
+	selectablePrompts := append(selectablePrompts, dbGlobalPrompts...)
-				os.Exit(1)
+
-			}
+	rgb.YPrintf("[%s] %d prompts available.\n", irc.TimeStamp(), len(selectablePrompts))
-			ircOauthPath = os.Getenv("TWITCH_OAUTH_JSON")
+	oauthPath := ""
-		} else {
+	if config.OAuthPath == "" {
-			if _, err := os.Stat(os.Getenv("HOME") + "/.twitch/ircoauth.json"); os.IsNotExist(err) {
+		if os.Getenv("TWITCH_OAUTH_JSON") != "" {
-				rgb.YPrintf("[%s] Warning %s doesn't exist, trying %s next!\n", irc.TimeStamp(), os.Getenv("HOME")+"/.twitch/ircoauth.json", "/etc/twitch/ircoauth.json")
+			if _, err := os.Stat(os.Getenv("TWITCH_OAUTH_JSON")); os.IsNotExist(err) {
-				if _, err := os.Stat("/etc/twitch/ircoauth.json"); os.IsNotExist(err) {
+				os.Exit(1)
-					rgb.YPrintf("[%s] Error %s doesn't exist either, bailing!\n", irc.TimeStamp(), "/etc/twitch/ircoauth.json")
+			}
-					os.Exit(1)
+			oauthPath = os.Getenv("TWITCH_OAUTH_JSON")
-				}
+		} else {
-				ircOauthPath = "/etc/twitch/ircoauth.json"
+			if _, err := os.Stat(os.Getenv("HOME") + "/.twitch/oauth.json"); os.IsNotExist(err) {
-			} else {
+				rgb.YPrintf("[%s] Warning %s doesn't exist, trying %s next!\n", irc.TimeStamp(), os.Getenv("HOME")+"/.twitch/oauth.json", "/etc/twitch/oauth.json")
-				ircOauthPath = os.Getenv("HOME") + "/.twitch/ircoauth.json"
+				if _, err := os.Stat("/etc/twitch/oauth.json"); os.IsNotExist(err) {
-			}
+					rgb.YPrintf("[%s] Error %s doesn't exist either, bailing!\n", irc.TimeStamp(), "/etc/twitch/oauth.json")
-		}
+					os.Exit(1)
-	} else {
+				}
-		if _, err := os.Stat(config.IrcOAuthPath); os.IsNotExist(err) {
+				oauthPath = "/etc/twitch/oauth.json"
-			rgb.YPrintf("[%s] Error config-specified oauth file %s doesn't exist, bailing!\n", irc.TimeStamp(), config.IrcOAuthPath)
+			} else {
-			os.Exit(1)
+				oauthPath = os.Getenv("HOME") + "/.twitch/oauth.json"
-		}
+			}
-		ircOauthPath = config.IrcOAuthPath
+		}
-	}
+	} else {
-	appOauthPath := ""
+		if _, err := os.Stat(config.OAuthPath); os.IsNotExist(err) {
-	if config.AppOAuthPath == "" {
+			rgb.YPrintf("[%s] Error config-specified oauth file %s doesn't exist, bailing!\n", irc.TimeStamp(), config.OAuthPath)
-		if os.Getenv("TWITCH_OAUTH_JSON") != "" {
+			os.Exit(1)
-			if _, err := os.Stat(os.Getenv("TWITCH_OAUTH_JSON")); os.IsNotExist(err) {
+		}
-				os.Exit(1)
+		oauthPath = config.OAuthPath
-			}
+	}
-			appOauthPath = os.Getenv("TWITCH_OAUTH_JSON")
+
-		} else {
+	// Replace the channel name, bot name, and the path to the private directory with your respective
-			if _, err := os.Stat(os.Getenv("HOME") + "/.twitch/appoauth.json"); os.IsNotExist(err) {
+	// values.
-				rgb.YPrintf("[%s] Warning %s doesn't exist, trying %s next!\n", irc.TimeStamp(), os.Getenv("HOME")+"/.twitch/appoauth.json", "/etc/twitch/appoauth.json")
+	myBot := irc.KardBot{
-				if _, err := os.Stat("/etc/twitch/appoauth.json"); os.IsNotExist(err) {
+		Channel:     "imartynontwitch",
-					rgb.YPrintf("[%s] Error %s doesn't exist either, bailing!\n", irc.TimeStamp(), "/etc/twitch/appoauth.json")
+		MsgRate:     time.Duration(20/30) * time.Millisecond,
-					os.Exit(1)
+		Name:        "Karaokards",
-				}
+		Port:        "6667",
-				appOauthPath = "/etc/twitch/appoauth.json"
+		PrivatePath: oauthPath,
-			} else {
+		Server:      "irc.chat.twitch.tv",
-				appOauthPath = os.Getenv("HOME") + "/.twitch/appoauth.json"
+		Prompts:     selectablePrompts,
-			}
+		Database:    *persistentData,
-		}
+	}
-	} else {
+	go func() {
-		if _, err := os.Stat(config.AppOAuthPath); os.IsNotExist(err) {
+		rgb.YPrintf("[%s] Starting webserver on port %s\n", irc.TimeStamp(), "5353")
-			rgb.YPrintf("[%s] Error config-specified oauth file %s doesn't exist, bailing!\n", irc.TimeStamp(), config.AppOAuthPath)
+		webserver.HandleHTTP(myBot)
-			os.Exit(1)
+	}()
-		}
+	myBot.Start()
-		appOauthPath = config.AppOAuthPath
+}
-	}
-
-	// Replace the channel name, bot name, and the path to the private directory with your respective
-	// values.
-	myBot := irc.KardBot{
-		Channel:     "karaokards",
-		MsgRate:     time.Duration(20/30) * time.Millisecond,
-		Name:        "Karaokards",
-		Port:        "6667",
-		IrcPrivatePath: ircOauthPath,
-		AppPrivatePath: appOauthPath,
-		Server:      "irc.chat.twitch.tv",
-		Prompts:     selectablePrompts,
-		Database:    *persistentData,
-		Config:      config,
-	}
-	go func() {
-		rgb.YPrintf("[%s] Starting webserver on port %s\n", irc.TimeStamp(), "5353")
-		webserver.HandleHTTP(&myBot)
-	}()
-	myBot.Start()
-}

web/401.html

@@ -1,107 +0,0 @@
-      <html>
-        <!doctype html>
-        <html lang="en">
-          <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="Karaokards">
-            <meta name="author" content="Martyn Ranyard">
-            <title>The great unknown!</title>
-        
-            <!-- Bootstrap core CSS -->
-            <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-            <!-- Custom styles for this template -->
-            <link href="/cover.css" rel="stylesheet">
-        
-            <style>
-              .bd-placeholder-img {
-                font-size: 1.125rem;
-                text-anchor: middle;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-              }
-        
-              @media (min-width: 768px) {
-                .bd-placeholder-img-lg {
-                  font-size: 3.5rem;
-                }
-                    }
-                    
-                    li.match-nomatch{
-                        background-color: #1e2122;
-                    }
-                    li.match-matchtrack{
-                        background-color: #E9B000;
-                    }
-                    li.match-fullmatch{
-                        background-color: #008F95;
-                    }
-                    li.match-matchtrackfuzzt{
-                        background-color: darkgray;
-                    }
-                    li.match-fullmatchfuzzy{
-                        background-color: darkgray;
-                    }
-                    a{
-                        text-decoration-line: underline;
-                    }
-            </style>
-          </head>
-          <body class="text-center">
-                <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
-                <header class="masthead mb-auto">
-                <div class="inner">
-                  <h3 class="masthead-brand">k8s-zoo</h3>
-                  <nav class="nav nav-masthead justify-content-center">
-                    <a class="nav-link active" href="/">Home</a>
-                  </nav>
-                </div>
-                </header>
-                <main role="main" class="inner cover">
-                        <h1 class="cover-heading">Scary user alert!</h1>
-                        <img src="https://http.cat/401" alt="Cat sat outside a door that has a sign depictinging no cats allowed" />
-                        <p>It seems you've gone somewhere you shouldn't!  401 NOT AUTHORIZED!</p>
-                        <p/>
-                        <p>I'm not quite sure how you got here to be honest, if it was via a link on the site, let me know via twitch DM, if it was from someone else, let them know.</p>
-                        <p>Shameless self-promotion : Follow me on twitch - <a href="https://www.twitch.tv/iMartynOnTwitch">iMartynOnTwitch</a>, oddly enough, I do a lot of twitchsings!</p>
-                      </main>
-        <footer class="mastfoot mt-auto">
-                <div class="inner">
-                  <p>Cover template for <a href="https://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
-                </div>
-                </footer>
-                </div>
-                <script>
-                function directToResults() {
-                    var url = document.createElement('a');
-                    url.setAttribute("href", window.location.href);
-                    if ((url.port != 80) && (url.port != 443)) {
-                        customPort = ":"+url.port
-                    } else {
-                        customPort = ""
-                    }
-                    var destination = url.protocol + "//" + url.hostname + customPort + "/" + document.getElementById("mode").value + "/" + document.getElementById("spotifyid").value
-                    window.location.href = destination
-                }
-                
-                function toggleUnfound() {
-                    var unmatched = document.getElementsByClassName('match-nomatch'), i;
-                    if (document.getElementById("showhidebutton").getAttribute("tracksHidden") != "true") {
-                        document.getElementById("showhidebutton").setAttribute("tracksHidden","true")
-                        for (i = 0; i < unmatched.length; i += 1) {
-                                unmatched[i].style.display = 'none';
-                        }
-                    } else {
-                        document.getElementById("showhidebutton").setAttribute("tracksHidden","false")
-                        for (i = 0; i < unmatched.length; i += 1) {
-                                unmatched[i].style.display = 'list-item';
-                        }
-                    }
-                }
-                </script>
-                </body>
-                </html>
-    </body>
-</html>

web/admin.html

@@ -1,143 +0,0 @@
-<html>
-        <!doctype html>
-        <html lang="en">
-          <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="Karaokards bot for twitch chat">
-            <meta name="author" content="Martyn Ranyard">
-            <title>Karaokards</title>
-        
-            <!-- Bootstrap core CSS -->
-            <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-            <!-- Custom styles for this template -->
-            <link href="/cover.css" rel="stylesheet">
-        
-            <style>
-              .bd-placeholder-img {
-                font-size: 1.125rem;
-                text-anchor: middle;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-              }
-        
-              @media (min-width: 768px) {
-                .bd-placeholder-img-lg {
-                  font-size: 3.5rem;
-                }
-                    }
-                    
-                    li.match-nomatch{
-                        background-color: #1e2122;
-                    }
-                    li.match-matchtrack{
-                        background-color: #E9B000;
-                    }
-                    li.match-fullmatch{
-                        background-color: #008F95;
-                    }
-                    li.match-matchtrackfuzzt{
-                        background-color: darkgray;
-                    }
-                    li.match-fullmatchfuzzy{
-                        background-color: darkgray;
-                    }
-                    a{
-                        text-decoration-line: underline;
-                    }
-                    .displaySetting{
-                      display: inline
-                    }
-                    .hiddenDisplaySetting{
-                      display: none;
-                    }
-                    .hiddenSave {
-                      display: none;
-                    }
-                    .editSetting{
-                      display: none;
-                    }
-                    .visibleEditSetting{
-                      display: inline;
-                    }
-                    .visibleSave {
-                      display: inline;
-                    }
-        
-            </style>
-          </head>
-          <body class="text-center">
-                <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
-                <header class="masthead mb-auto">
-                <div class="inner">
-                  <h3 class="masthead-brand">Karaokards</h3>
-                  <nav class="nav nav-masthead justify-content-center">
-                    <a class="nav-link active" href="/">Home</a>
-                  </nav>
-                </div>
-                </header>
-                <main role="main" class="inner cover">
-                  
-                <script>
-                    function editMode() {
-                        var alldisps = document.getElementsByClassName("displaySetting");
-                        for (item of alldisps) {
-                          item.classList.add("hiddenDisplaySetting")
-                        }
-                        for (item of alldisps) {
-                          item.classList.remove("displaySetting")
-                        }
-                        var alldisps = document.getElementsByClassName("editSetting");
-                        for (item of alldisps) {
-                          item.classList.add("visibleEditSetting")
-                        }
-                        for (item of alldisps) {
-                          item.classList.remove("editSetting")
-                        }
-                        document.getElementById("saveButton").classList.remove("hiddenSave")
-                        document.getElementById("saveButton").classList.add("visibleSave")
-                        document.getElementById("leaveButton").classList.remove("hiddenSave")
-                        document.getElementById("leaveButton").classList.add("visibleSave")
-                        document.getElementById("yuhateme").classList.remove("hiddenSave")
-                        document.getElementById("yuhateme").classList.add("visibleSave")
-                    }
-                    </script>
-                        <h1 class="cover-heading">Karaokards admin panel for {{.Channel}}!!!</h1>
-                        <form method="POST">
-                        {{ if .HasLeft }}
-                        <h2>Not in your channel at the moment!</h2>
-                        <p>The bot is not currently in your channel, chances are you've not ever asked it to join, you asked it to leave, or something went horribly wrong.</p>
-                        <p>You can invite the bot to your channel by clicking here : <input id="joinButton" type="submit" name="join" value="Come on in"></p>
-                        {{ else }}
-                          {{ if .Leaving }}
-                          <h2>Do you really want this bot to leave your channel?</h2>
-                          <p><input id="leaveButton" type="submit" name="reallyleave" value="Really leave twitch channel"></p>
-                          {{ else }}
-                          <h2>Note you can give your moderators the url you are on right now to control this bot.  They don't have to be logged into twitch to do so.</h2>
-                          <table>
-                            <thead><tr><td>Channel Data :</td><td><input type="button" value="Edit" onclick="javascript:editMode();"></td></tr></thead>
-                            <tbody>
-                            <tr><td>Member of channel since {{.SinceTimeUTC}}</td></tr>
-                            <tr><td>Command for prompt:</td><td class="displaySetting"></tdclass>{{.Command}}</td><td class="editSetting"><input type="text" name="Command" value="{{.Command}}"></td></tr>
-                            <tr><td>Extra prompts (one per line):</td><td class="displaySetting">{{.ExtraStrings}}</td><td class="editSetting"><textarea name="ExtraStrings" >{{.ExtraStrings}}</textarea></td></tr>
-                            <tr><td>&nbsp;</td><td><input id="saveButton" type="submit" class="hiddenSave" name="save" value="Save changes"></td></tr>
-                            <tr id="yuhateme" class="hiddenSave"><td>Or... please don't go but...</td></tr>
-                            <tr><td><input id="leaveButton" type="submit" class="hiddenSave" name="leave" value="Leave twitch channel"></td></tr>
-                          </tbody>
-                          </table>
-                          {{ end }}
-                        {{ end }}
-                        </form>
-                </main>
-        <footer class="mastfoot mt-auto">
-                <div class="inner">
-                  <p>Cover template for <a href="https://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
-                </div>
-                </footer>
-                </div>
-                </body>
-                </html>
-    </body>
-</html>

web/bye.html

@@ -1,75 +0,0 @@
-<html>
-        <!doctype html>
-        <html lang="en">
-          <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="Karaokards bot for twitch chat">
-            <meta name="author" content="Martyn Ranyard">
-            <title>Karaokards</title>
-        
-            <!-- Bootstrap core CSS -->
-            <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-            <!-- Custom styles for this template -->
-            <link href="/cover.css" rel="stylesheet">
-        
-            <style>
-              .bd-placeholder-img {
-                font-size: 1.125rem;
-                text-anchor: middle;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-              }
-        
-              @media (min-width: 768px) {
-                .bd-placeholder-img-lg {
-                  font-size: 3.5rem;
-                }
-                    }
-                    
-                    li.match-nomatch{
-                        background-color: #1e2122;
-                    }
-                    li.match-matchtrack{
-                        background-color: #E9B000;
-                    }
-                    li.match-fullmatch{
-                        background-color: #008F95;
-                    }
-                    li.match-matchtrackfuzzt{
-                        background-color: darkgray;
-                    }
-                    li.match-fullmatchfuzzy{
-                        background-color: darkgray;
-                    }
-                    a{
-                        text-decoration-line: underline;
-                    }        
-            </style>
-          </head>
-          <body class="text-center">
-                <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
-                <header class="masthead mb-auto">
-                <div class="inner">
-                  <h3 class="masthead-brand">Karaokards</h3>
-                  <nav class="nav nav-masthead justify-content-center">
-                    <a class="nav-link active" href="/">Home</a>
-                  </nav>
-                </div>
-                </header>
-                <main role="main" class="inner cover">
-                        <h1 class="cover-heading">Left channel!!!</h1>
-                        <p><img src="/static/okaybye.gif" alt="animation of dissappointed sister from Frozen saying Okay, bye..."/></p>
-                </main>
-        <footer class="mastfoot mt-auto">
-                <div class="inner">
-                  <p>Cover template for <a href="https://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
-                </div>
-                </footer>
-                </div>
-                </body>
-                </html>
-    </body>
-</html>

web/index.html

@@ -57,7 +57,6 @@
                   <h3 class="masthead-brand">Karaokards</h3>
                   <nav class="nav nav-masthead justify-content-center">
                     <a class="nav-link active" href="/">Home</a>
-                    <a class="nav-link active" href="https://id.twitch.tv/oauth2/authorize?client_id={{.ClientID}}&redirect_uri={{.BaseURI}}/twitchadmin&response_type=code&scope=user:read:broadcast">Admin - log in with twitch</a>
                   </nav>
                 </div>
                 </header>

web/standby.html

@@ -1,111 +0,0 @@
-      <html>
-        <!doctype html>
-        <html lang="en">
-          <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <meta name="description" content="Karaokards">
-            <meta name="author" content="Martyn Ranyard">
-            <title>Please Stand By!</title>
-        
-            <!-- Bootstrap core CSS -->
-            <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-            <!-- Custom styles for this template -->
-            <link href="/cover.css" rel="stylesheet">
-        
-            <style>
-              .bd-placeholder-img {
-                font-size: 1.125rem;
-                text-anchor: middle;
-                -webkit-user-select: none;
-                -moz-user-select: none;
-                -ms-user-select: none;
-                user-select: none;
-              }
-        
-              @media (min-width: 768px) {
-                .bd-placeholder-img-lg {
-                  font-size: 3.5rem;
-                }
-                    }
-                    
-                    li.match-nomatch{
-                        background-color: #1e2122;
-                    }
-                    li.match-matchtrack{
-                        background-color: #E9B000;
-                    }
-                    li.match-fullmatch{
-                        background-color: #008F95;
-                    }
-                    li.match-matchtrackfuzzt{
-                        background-color: darkgray;
-                    }
-                    li.match-fullmatchfuzzy{
-                        background-color: darkgray;
-                    }
-                    a{
-                        text-decoration-line: underline;
-                    }
-            </style>
-          </head>
-          <body class="text-center" onload=directToResults()>
-                <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
-                <header class="masthead mb-auto">
-                <div class="inner">
-                  <h3 class="masthead-brand">Karaokards</h3>
-                  <nav class="nav nav-masthead justify-content-center">
-                    <a class="nav-link active" href="/">Home</a>
-                  </nav>
-                </div>
-                </header>
-                <main role="main" class="inner cover">
-                        <h1 class="cover-heading">Please stand by, twitch gives us stuff that needs to be sent to the server!</h1>
-                        <img src="https://media.giphy.com/media/ule4vhcY1xEKQ/source.gif" alt="Cats typing furiously" />
-                        <p/>
-                        <p>Just hold on, the javascript is doing it's stuff. Don't blame me, twitch really forces us to use javascript here.</p>
-                        <p>Shameless self-promotion : Follow me on twitch - <a href="https://www.twitch.tv/iMartynOnTwitch">iMartynOnTwitch</a>, oddly enough, I do a lot of twitchsings!</p>
-                      </main>
-        <footer class="mastfoot mt-auto">
-                <div class="inner">
-                  <p>Cover template for <a href="https://getbootstrap.com/">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
-                </div>
-                </footer>
-                </div>
-                <script>
-                  // #access_token=hkq5diaiopu23tzyo5oik7jl7g2w0n&scope=user%3Aread%3Abroadcast&token_type=bearer
-
-                function directToResults() {
-                    var url = document.createElement('a');
-                    url.setAttribute("href", window.location.href);
-                    if ((url.port != 80) && (url.port != 443)) {
-                        customPort = ":"+url.port
-                    } else {
-                        customPort = ""
-                    }
-                
-                  u = new URLSearchParams(document.location.hash.substr(1))
-                  var destination = new URL(url.protocol + "//" + url.hostname + customPort + "/twitchtobackend?" + u.toString())
-                  console.log(destination)
-                  window.location.href = destination
-                }
-                
-                function toggleUnfound() {
-                    var unmatched = document.getElementsByClassName('match-nomatch'), i;
-                    if (document.getElementById("showhidebutton").getAttribute("tracksHidden") != "true") {
-                        document.getElementById("showhidebutton").setAttribute("tracksHidden","true")
-                        for (i = 0; i < unmatched.length; i += 1) {
-                                unmatched[i].style.display = 'none';
-                        }
-                    } else {
-                        document.getElementById("showhidebutton").setAttribute("tracksHidden","false")
-                        for (i = 0; i < unmatched.length; i += 1) {
-                                unmatched[i].style.display = 'list-item';
-                        }
-                    }
-                }
-                </script>
-                </body>
-                </html>
-    </body>
-</html>