From a98179a6ed7879f16fd625521decd327375aee62 Mon Sep 17 00:00:00 2001
From: Vladimir Hodakov <vladimir@hodakov.me>
Date: Tue, 8 Jan 2019 06:51:36 +0400
Subject: [PATCH] Fix typos, remove unwanted goroutines

---
 domains/announces/v1/announces.go | 85 +++++++++++++++----------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/domains/announces/v1/announces.go b/domains/announces/v1/announces.go
index eccb98f..da92713 100644
--- a/domains/announces/v1/announces.go
+++ b/domains/announces/v1/announces.go
@@ -16,58 +16,57 @@ func fwMessagesFilter(msg *tdlib.TdMessage) bool {
 
 // ZookeeperReceiver adds announcement functionality to bot
 func ZookeeperReceiver(client *tdlib.Client) {
-	log.Debug().Msg("Adding receiver for @FWorld_bot messages...")
+	log.Debug().Msg("Adding receiver for @FWorldBot messages...")
 	// Here we can add a receiver to retreive any message type we want
 	// We like to get UpdateNewMessage events and with a specific FilterFunc
 	receiver := client.AddEventReceiver(&tdlib.UpdateNewMessage{}, fwMessagesFilter, 5)
 	log.Debug().Msg("Receiver added")
-	go func() {
-		for newMsg := range receiver.Chan {
-			updateMsg := (newMsg).(*tdlib.UpdateNewMessage)
-			// Check if message text contains needed battle data
-			msgText := updateMsg.Message.Content.(*tdlib.MessageText)
-			if strings.HasPrefix(msgText.Text.Text, "Я встретил") {
-				log.Debug().Msgf("%s", msgText.Text.Text)
-				battleType := ""
-				battleTag := ""
-				if strings.Contains(msgText.Text.Text, "Огров") {
-					battleType = "Огры!"
-				}
-				if strings.Contains(msgText.Text.Text, "Буйволов") {
-					battleType = "Буйволы!"
-				}
-				if strings.Contains(msgText.Text.Text, "Кабанов") {
-					battleType = "Кабаны!"
-				}
-				switch updateMsg.Message.ReplyMarkup.(type) {
-				case *tdlib.ReplyMarkupInlineKeyboard:
-					keyboard := updateMsg.Message.ReplyMarkup.(*tdlib.ReplyMarkupInlineKeyboard)
-					if len(keyboard.Rows) > 0 {
-						if len(keyboard.Rows[0]) > 0 {
-							button := keyboard.Rows[0][0]
-							switch button.Type.(type) {
-							case *tdlib.InlineKeyboardButtonTypeSwitchInline:
-								buttonQuery := button.Type.(*tdlib.InlineKeyboardButtonTypeSwitchInline)
-								battleTag = string(buttonQuery.Query)
-							default:
-								log.Error().Msg("Invalid button type")
-							}
+
+	for newMsg := range receiver.Chan {
+		updateMsg := (newMsg).(*tdlib.UpdateNewMessage)
+		// Check if message text contains needed battle data
+		msgText := updateMsg.Message.Content.(*tdlib.MessageText)
+		if strings.HasPrefix(msgText.Text.Text, "Я встретил") {
+			log.Debug().Msgf("%s", msgText.Text.Text)
+			battleType := ""
+			battleTag := ""
+			if strings.Contains(msgText.Text.Text, "Огров") {
+				battleType = "Огры!"
+			}
+			if strings.Contains(msgText.Text.Text, "Буйволов") {
+				battleType = "Буйволы!"
+			}
+			if strings.Contains(msgText.Text.Text, "Кабанов") {
+				battleType = "Кабаны!"
+			}
+			switch updateMsg.Message.ReplyMarkup.(type) {
+			case *tdlib.ReplyMarkupInlineKeyboard:
+				keyboard := updateMsg.Message.ReplyMarkup.(*tdlib.ReplyMarkupInlineKeyboard)
+				if len(keyboard.Rows) > 0 {
+					if len(keyboard.Rows[0]) > 0 {
+						button := keyboard.Rows[0][0]
+						switch button.Type.(type) {
+						case *tdlib.InlineKeyboardButtonTypeSwitchInline:
+							buttonQuery := button.Type.(*tdlib.InlineKeyboardButtonTypeSwitchInline)
+							battleTag = string(buttonQuery.Query)
+						default:
+							log.Error().Msg("Invalid button type")
 						}
 					}
-				default:
-					log.Error().Msg("Invalid keyboard type")
 				}
-				log.Debug().Msgf("Battle type: %s", battleType)
-				log.Debug().Msgf("Battle tag: %s", battleTag)
+			default:
+				log.Error().Msg("Invalid keyboard type")
+			}
+			log.Debug().Msgf("Battle type: %s", battleType)
+			log.Debug().Msgf("Battle tag: %s", battleTag)
 
-				replyText := battleType + " " + battleTag
+			replyText := battleType + " " + battleTag
 
-				reply := tdlib.NewInputMessageText(tdlib.NewFormattedText(replyText, nil), true, true)
-				_, err := client.SendMessage(updateMsg.Message.ChatID, 0, false, true, nil, reply)
-				if err != nil {
-					log.Error().Err(err)
-				}
+			reply := tdlib.NewInputMessageText(tdlib.NewFormattedText(replyText, nil), true, true)
+			_, err := client.SendMessage(updateMsg.Message.ChatID, 0, false, true, nil, reply)
+			if err != nil {
+				log.Error().Err(err)
 			}
 		}
-	}()
+	}
 }