Merge pull request 'Implement configuration file + automatic channel joining' (#14) from config into master

Reviewed-on: https://git.com.de/LibertaCasa/watbot/pulls/14

1 files changed, 17 insertions, 9 deletions

diff --git a/wat/bot.go b/wat/bot.go
index 48559d4..a555de4 100644
--- a/wat/bot.go
+++ b/wat/bot.go
@@ -18,8 +18,10 @@ type WatBot struct {
 }
 
 type WatConfig struct {
-	PermittedChannels []string
+	AdminHosts        []string
 	IgnoredHosts      []string
+	AutoJoinChannels  []string
+	PermittedChannels []string
 }
 
 func NewWatBot(config *irc.ClientConfig, watConfig *WatConfig, serverConn *tls.Conn) *WatBot {
@@ -35,23 +37,29 @@ func CleanNick(nick string) string {
 	return string(nick[0]) + "\u200c" + nick[1:]
 }
 
+func PrefixChannel(channel string) string {
+	// there could theoretically be other channel prefixes ..
+	if channel[0] != '#' && channel[0] != '!' {
+		channel = "#" + channel
+	}
+	return channel
+}
+
 func (w *WatBot) HandleIrcMsg(c *irc.Client, m *irc.Message) {
 	switch cmd := m.Command; cmd {
 	case "PING":
 		w.write("PONG", m.Params[0])
 	case "PRIVMSG":
 		w.Msg(m)
+	case "001":
+		for _, channel := range w.c.AutoJoinChannels {
+			w.write("JOIN", PrefixChannel(channel))
+		}
 	}
 }
 
 func (w *WatBot) Admin(m *irc.Message) bool {
-	admins := [2]string{"mph.monster", "cranberry.juice"}
-	for _, admin := range admins {
-		if m.Prefix.Host == admin {
-			return true
-		}
-	}
-	return false
+	return w.Allowed(m.Prefix.Host, w.c.AdminHosts)
 }
 
 func (w *WatBot) Allowed(c string, r []string) bool {
@@ -73,7 +81,7 @@ func (w *WatBot) CanRespond(m *irc.Message) bool {
 	// if !strings.Contains(m.Prefix.Host, "") {
 	// 	return false
 	// }
-	if !w.Allowed(m.Params[0], w.c.PermittedChannels) {
+	if !w.Allowed(PrefixChannel(m.Params[0]), w.c.PermittedChannels) {
 		return false
 	}
 	return true