moved config around somewhat

2 files changed, 38 insertions, 12 deletions

diff --git a/main.go b/main.go
index bc203d8..0370b6d 100644
--- a/main.go
+++ b/main.go
@@ -12,12 +12,23 @@ func main() {
 	pass := flag.String("pass", "", "password")
 	flag.Parse()
 	fmt.Printf("PASS len %d\n", len(*pass))
-	config := irc.ClientConfig {
+	config := irc.ClientConfig{
 		Nick: "watt",
 		Pass: *pass,
 		User: "wat/tripsit",
 		Name: "wat",
 	}
+	watConfig := wat.WatConfig{
+		PermittedChannels: []string{
+			"##wat",
+			//"##test",
+			"##sweden",
+			"##freedom",
+		},
+		IgnoredHosts: []string{
+			"tripsit/user/creatonez",
+		},
+	}
 	tcpConf := &tls.Config{
 		InsecureSkipVerify: true,
 	}
@@ -26,6 +37,6 @@ func main() {
 		fmt.Println("err " + err.Error())
 		return
 	}
-	wwat := wat.NewWatBot(&config, conn)
+	wwat := wat.NewWatBot(&config, &watConfig, conn)
 	wwat.Run()
 }
diff --git a/wat/bot.go b/wat/bot.go
index d9ddd69..100e4df 100644
--- a/wat/bot.go
+++ b/wat/bot.go
@@ -11,20 +11,19 @@ import (
 type WatBot struct {
 	client *irc.Client
 	conn   *tls.Conn
+	c      *WatConfig
 	game   *WatGame
 	Db     *WatDb
 	Nick   string
 }
 
-var allowedChannels = []string{
-	"##wat",
-	"##test",
-	"##sweden",
-	"##freedom",
+type WatConfig struct {
+	PermittedChannels []string
+	IgnoredHosts      []string
 }
 
-func NewWatBot(config *irc.ClientConfig, serverConn *tls.Conn) *WatBot {
-	wat := WatBot{conn: serverConn, Nick: config.Nick}
+func NewWatBot(config *irc.ClientConfig, watConfig *WatConfig, serverConn *tls.Conn) *WatBot {
+	wat := WatBot{conn: serverConn, Nick: config.Nick, c: watConfig}
 	wat.Db = NewWatDb()
 	wat.game = NewWatGame(&wat, wat.Db)
 	config.Handler = irc.HandlerFunc(wat.HandleIrcMsg)
@@ -49,8 +48,8 @@ func (w *WatBot) Admin(m *irc.Message) bool {
 	return m.Prefix.Host == "tripsit/operator/hibs"
 }
 
-func (w *WatBot) AllowedChannel(c string) bool {
-	for _, allowed := range allowedChannels {
+func (w *WatBot) Allowed(c string, r []string) bool {
+	for _, allowed := range r {
 		if c == allowed {
 			return true
 		}
@@ -58,10 +57,26 @@ func (w *WatBot) AllowedChannel(c string) bool {
 	return false
 }
 
+func (w *WatBot) CanRespond(m *irc.Message) bool {
+	if w.Admin(m) {
+		return true
+	}
+	if w.Allowed(m.Prefix.Host, w.c.IgnoredHosts) {
+		return false
+	}
+	if !strings.Contains(m.Prefix.Host, "tripsit") {
+		return false
+	}
+	if !w.Allowed(m.Params[0], w.c.PermittedChannels) {
+		return false
+	}
+	return true
+}
+
 func (w *WatBot) Msg(m *irc.Message) {
 	// bail out if you're not yves, if you're not tripsit or if you're not in an allowed channel
 	// but if you're an admin you can do whatever
-	if m.Prefix.Host == "tripsit/user/creatonez" || !strings.Contains(m.Prefix.Host, "tripsit") || (!w.AllowedChannel(m.Params[0]) && !w.Admin(m)) {
+	if !w.CanRespond(m) {
 		return
 	}