Add separate config for channel keys.

It was a never-ending source of bugs

examples/irccat.json

@@ -18,7 +18,8 @@
     "nick": "irccat",
     "realname": "IRCCat",
     "identify_pass": "",
-    "channels": ["#channel"]
+    "channels": ["#channel"],
+    "keys": {"#channel": "join_key"}
   },
   "commands": {
     "auth_channel": "#channel",

main.go

@@ -12,6 +12,7 @@ import (
 	"github.com/thoj/go-ircevent"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 )
 
@@ -119,7 +120,18 @@ func (i *IRCCat) handleWelcome(e *irc.Event) {
 
 	log.Infof("Connected, joining channels...")
 	for _, channel := range viper.GetStringSlice("irc.channels") {
-		i.irc.Join(channel)
+		key_var := fmt.Sprintf("irc.keys.%s", channel)
+		if strings.ContainsAny(channel, " \t") {
+			log.Errorf("Channel name '%s' contains whitespace. Set a channel key by setting the config variable irc.keys.#channel",
+				channel)
+			continue
+		}
+
+		if viper.IsSet(key_var) {
+			i.irc.Join(channel + " " + viper.GetString(key_var))
+		} else {
+			i.irc.Join(channel)
+		}
 		i.channels.Add(channel)
 	}
 }

tcplistener/tcplistener.go

@@ -68,8 +68,7 @@ func (l *TCPListener) parseMessage(msg string) {
 		parts := strings.SplitN(msg, " ", 2)
 		if parts[0] == "#*" {
 			for _, channel := range channels {
-				chan_parts := strings.Split(channel, " ")
-				l.irc.Privmsg(chan_parts[0], replaceFormatting(parts[1]))
+				l.irc.Privmsg(channel, replaceFormatting(parts[1]))
 			}
 		} else {
 			targets := strings.Split(parts[0], ",")
@@ -85,8 +84,7 @@ func (l *TCPListener) parseMessage(msg string) {
 		l.irc.SendRawf("TOPIC %s :%s", parts[1], replaceFormatting(parts[2]))
 	} else {
 		if len(channels) > 0 {
-			chan_parts := strings.Split(channels[0], " ")
-			l.irc.Privmsg(chan_parts[0], replaceFormatting(msg))
+			l.irc.Privmsg(channels[0], replaceFormatting(msg))
 		}
 	}
 }