Slightly different config file formats

Signed-off-by: Martyn Ranyard <m@rtyn.berlin>

internal/irc/irc.go

@@ -40,13 +40,22 @@ var DirectMsgRegex *regexp.Regexp = regexp.MustCompile(`^:(\w+)!\w+@\w+\.tmi\.tw
 // command.
 var CmdRegex *regexp.Regexp = regexp.MustCompile(`^!(\w+)\s?(\w+)?`)
 
-type OAuthCred struct {
+type IRCOAuthCred struct {
 
 	// The bot account's OAuth password.
 	Password string `json:"password,omitempty"`
 
 	// The developer application client ID. Used for API calls to Twitch.
+	Nick string `json:"nick,omitempty"`
+}
+
+type AppOAuthCred struct {
+
+	// The bot account's OAuth password.
 	ClientID string `json:"client_id,omitempty"`
+
+	// The developer application client ID. Used for API calls to Twitch.
+	ClientSecret string `json:"client_secret,omitempty"`
 }
 
 type ConfigStruct struct {
@@ -61,8 +70,8 @@ type ConfigStruct struct {
 type KardBot struct {
 	Channel        string
 	conn           net.Conn
-	IrcCredentials *OAuthCred
-	AppCredentials *OAuthCred
+	IrcCredentials *IRCOAuthCred
+	AppCredentials *AppOAuthCred
 	MsgRate        time.Duration
 	Name           string
 	Port           string
@@ -163,8 +172,8 @@ func (bb *KardBot) HandleChat() error {
 			matches = DirectMsgRegex.FindStringSubmatch(line)
 			if nil != matches {
 				userName := matches[1]
-//				msgType := matches[2]
-//				channel := matches[3]
+				//				msgType := matches[2]
+				//				channel := matches[3]
 				msg := matches[4]
 				rgb.GPrintf("[%s] Direct message %s: %s\n", TimeStamp(), userName, msg)
 
@@ -226,7 +235,7 @@ func (bb *KardBot) HandleChat() error {
 								)
 								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)
+									rgb.RPrintf("[%s] ERROR %s\n", err)
 								}
 								bb.Say("Ack.")
 							default:
@@ -288,15 +297,21 @@ func (bb *KardBot) ReadCredentials(credType string) error {
 	}
 
 	// parses the file contents
-	var creds OAuthCred
+	if credType == "IRC" {
+		var creds IRCOAuthCred
 		dec := json.NewDecoder(strings.NewReader(string(credFile)))
 		if err = dec.Decode(&creds); nil != err && io.EOF != err {
 			return err
 		}
 
-	if credType == "IRC" {
 		bb.IrcCredentials = &creds
 	} else {
+		var creds AppOAuthCred
+		dec := json.NewDecoder(strings.NewReader(string(credFile)))
+		if err = dec.Decode(&creds); nil != err && io.EOF != err {
+			return err
+		}
+
 		bb.AppCredentials = &creds
 	}
 
@@ -383,7 +398,7 @@ func (bb *KardBot) Start() {
 		bb.Connect()
 		bb.Login()
 		if len(bb.ChannelData) > 0 {
-			for channelName,channelData := range bb.ChannelData {
+			for channelName, channelData := range bb.ChannelData {
 				if !channelData.HasLeft {
 					bb.JoinChannel(channelName)
 				}

internal/webserver/webserver.go

@@ -212,7 +212,7 @@ func TwitchAdminHandler(response http.ResponseWriter, request *http.Request) {
 			"https://id.twitch.tv/oauth2/token",
 			url.Values{
 				"client_id":     {ircBot.AppCredentials.ClientID},
-				"client_secret": {ircBot.AppCredentials.Password},
+				"client_secret": {ircBot.AppCredentials.ClientSecret},
 				"code":          {vars["code"]},
 				"grant_type":    {"authorization_code"},
 				"redirect_uri":  {"https://" + ircBot.Config.ExternalUrl + "/twitchadmin"}})
@@ -306,7 +306,7 @@ func TwitchBackendHandler(response http.ResponseWriter, request *http.Request) {
 			"https://id.twitch.tv/oauth2/token",
 			url.Values{
 				"client_id":     {ircBot.AppCredentials.ClientID},
-				"client_secret": {ircBot.AppCredentials.Password},
+				"client_secret": {ircBot.AppCredentials.ClientSecret},
 				"code":          {vars["code"]},
 				"grant_type":    {"authorization_code"},
 				"redirect_uri":  {"https://" + ircBot.Config.ExternalUrl + "/twitchadmin"}})