Add return constants package, and common message sender functions

Trying to resolve as much as possible ``gometalinter`` issues.

lib/broadcaster/responders.go

@@ -1,48 +1,41 @@
 // i2_bot – Instinct PokememBro Bot
-// Copyright (c) 2017 Vladimir "fat0troll" Hodakov
+// Copyright (c) 2017-2018 Vladimir "fat0troll" Hodakov
 
 package broadcaster
 
 import (
+	"strconv"
+
 	"github.com/go-telegram-bot-api/telegram-bot-api"
 	"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
-	"strconv"
 )
 
 // AdminBroadcastMessageCompose saves message for future broadcast
 func (b *Broadcaster) AdminBroadcastMessageCompose(update *tgbotapi.Update, playerRaw *dbmapping.Player) string {
 	broadcastingMessageBody := update.Message.CommandArguments()
-	messageRaw, ok := dbmapping.Broadcast{}, false
-
+	messageMode := "none"
 	switch update.Message.Command() {
 	case "send_all":
-		messageRaw, ok = b.createBroadcastMessage(playerRaw, broadcastingMessageBody, "all")
-		if !ok {
-			return "fail"
-		}
+		messageMode = "all"
 	case "send_league":
-		messageRaw, ok = b.createBroadcastMessage(playerRaw, broadcastingMessageBody, "league")
-		if !ok {
-			return "fail"
-		}
+		messageMode = "league"
+	}
+
+	messageRaw, ok := b.createBroadcastMessage(playerRaw, broadcastingMessageBody, messageMode)
+	if !ok {
+		return "fail"
 	}
 
 	message := "Сообщение сохранено в базу.\n"
 	message += "Выглядеть оно будет так:"
 
-	msg := tgbotapi.NewMessage(update.Message.Chat.ID, message)
-	msg.ParseMode = "Markdown"
-
-	c.Bot.Send(msg)
+	c.Sender.SendMarkdownAnswer(update, message)
 
 	broadcastingMessage := "*Привет, %username%!*\n\n"
 	broadcastingMessage += "*Важное сообщение от администратора " + update.Message.From.FirstName + " " + update.Message.From.LastName + "* (@" + update.Message.From.UserName + ")\n\n"
 	broadcastingMessage += messageRaw.Text
 
-	msg = tgbotapi.NewMessage(update.Message.Chat.ID, broadcastingMessage)
-	msg.ParseMode = "Markdown"
-
-	c.Bot.Send(msg)
+	c.Sender.SendMarkdownAnswer(update, broadcastingMessage)
 
 	switch update.Message.Command() {
 	case "send_all":
@@ -51,10 +44,7 @@ func (b *Broadcaster) AdminBroadcastMessageCompose(update *tgbotapi.Update, play
 		message = "Чтобы отправить сообщение всем игрокам лиги Инстинкт, отправь команду /send\\_confirm " + strconv.Itoa(messageRaw.ID)
 	}
 
-	msg = tgbotapi.NewMessage(update.Message.Chat.ID, message)
-	msg.ParseMode = "Markdown"
-
-	c.Bot.Send(msg)
+	c.Sender.SendMarkdownAnswer(update, message)
 
 	return "ok"
 }

lib/broadcaster/sender.go

@@ -1,12 +1,14 @@
 // i2_bot – Instinct PokememBro Bot
-// Copyright (c) 2017 Vladimir "fat0troll" Hodakov
+// Copyright (c) 2017-2018 Vladimir "fat0troll" Hodakov
 
 package broadcaster
 
 import (
-	"github.com/go-telegram-bot-api/telegram-bot-api"
-	"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
 	"strconv"
+
+	"github.com/go-telegram-bot-api/telegram-bot-api"
+	"source.wtfteam.pro/i2_bot/i2_bot/lib/constants"
+	"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
 )
 
 // AdminBroadcastMessageSend sends saved message to all private chats
@@ -15,13 +17,13 @@ func (b *Broadcaster) AdminBroadcastMessageSend(update *tgbotapi.Update, playerR
 	messageNumInt, _ := strconv.Atoi(messageNum)
 	messageRaw, ok := b.getBroadcastMessageByID(messageNumInt)
 	if !ok {
-		return "fail"
+		return constants.BotError
 	}
 	if messageRaw.AuthorID != playerRaw.ID {
-		return "fail"
+		return constants.UserRequestForbidden
 	}
 	if messageRaw.Status != "new" {
-		return "fail"
+		return constants.UserRequestFailed
 	}
 
 	broadcastingMessageBody := messageRaw.Text
@@ -29,7 +31,7 @@ func (b *Broadcaster) AdminBroadcastMessageSend(update *tgbotapi.Update, playerR
 	profileRaw, err := c.DataCache.GetProfileByPlayerID(playerRaw.ID)
 	if err != nil {
 		c.Log.Error(err.Error())
-		return "fail"
+		return constants.UserRequestFailed
 	}
 
 	prettyName := profileRaw.Nickname + " (@" + profileRaw.TelegramNickname + ")"
@@ -48,22 +50,17 @@ func (b *Broadcaster) AdminBroadcastMessageSend(update *tgbotapi.Update, playerR
 		broadcastingMessage += "*Важное сообщение от администратора *" + prettyName + "\n\n"
 		broadcastingMessage += broadcastingMessageBody
 
-		msg := tgbotapi.NewMessage(int64(chat.TelegramID), broadcastingMessage)
-		msg.ParseMode = "Markdown"
-		c.Bot.Send(msg)
+		c.Sender.SendMarkdownMessageToChatID(chat.TelegramID, broadcastingMessage)
 	}
 
 	messageRaw, ok = b.updateBroadcastMessageStatus(messageRaw.ID, "sent")
 	if !ok {
-		return "fail"
+		return constants.BotError
 	}
 
 	message := "Сообщение отправлено. Надеюсь, пользователи бота за него тебя не убьют.\n"
 
-	msg := tgbotapi.NewMessage(update.Message.Chat.ID, message)
-	msg.ParseMode = "Markdown"
+	c.Sender.SendMarkdownAnswer(update, message)
 
-	c.Bot.Send(msg)
-
-	return "ok"
+	return constants.UserRequestSuccess
 }