Refactor integrations

Move to a separate file for better code structure and to avoid huge
branching inside Msg().

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

wat/bot.go

@@ -128,11 +128,8 @@ func (w *WatBot) Msg(m *irc.Message) {
 	}
 
 	// integration with games in other bots
-	isBot, games := w.integration.Bot(m)
+	if w.integration.HandleIntegration(m, args) {
-	if isBot {
+		return
-		if w.integration.HandleIntegration(m, args, games) {
-			return
-		}
 	}
 
 	// check if command char (or something weird) is present

wat/integration.go

@@ -39,14 +39,18 @@ func (w *WatIntegration) Bot(m *irc.Message) (bool, []string) {
 	return isBot, games
 }
 
-func (w *WatIntegration) HandleIntegration(m *irc.Message, msgargs []string, games []string) bool {
+func (w *WatIntegration) HandleIntegration(m *irc.Message, msgargs []string) bool {
 
-	// handles a message "Top finishers: (nick1: 1300) (nick2: 1200)" from an authorized Jeopardy game bot
+	isBot, games := w.Bot(m)
-	if msgargs[0] == "Top" && msgargs[1] == "finishers:" && w.bot.Allowed("jeopardy", games) {
+	if isBot {
-		w.Jeopardy(m, msgargs)
+		// handles a message "Top finishers: (nick1: 1300) (nick2: 1200)" from an authorized Jeopardy game bot
-		return true
+		if msgargs[0] == "Top" && msgargs[1] == "finishers:" && w.bot.Allowed("jeopardy", games) {
+			w.Jeopardy(m, msgargs)
+			return true
+		}
 	}
 
+	// not an authorized bot or no integration matched the given message
 	return false
 }