🐛 Fixed package name in methods and other actions

add.go

@@ -5,14 +5,14 @@ import (
 	tg "github.com/toby3d/telegram"     // My Telegram bindings
 )
 
-func commandAdd(msg *telegram.Message, pack bool) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandAdd(msg *tg.Message, pack bool) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
 
-	reply := telegram.NewMessage(msg.Chat.ID, T("reply_add_sticker"))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply := tg.NewMessage(msg.Chat.ID, T("reply_add_sticker"))
+	reply.ParseMode = tg.ModeMarkdown
 
 	err = dbChangeUserState(msg.From.ID, stateAddSticker)
 	errCheck(err)
@@ -29,14 +29,14 @@ func commandAdd(msg *telegram.Message, pack bool) {
 	errCheck(err)
 }
 
-func actionAdd(msg *telegram.Message, pack bool) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func actionAdd(msg *tg.Message, pack bool) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
 
-	reply := telegram.NewMessage(msg.Chat.ID, T("success_add_sticker"))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply := tg.NewMessage(msg.Chat.ID, T("success_add_sticker"))
+	reply.ParseMode = tg.ModeMarkdown
 
 	switch {
 	case pack && msg.Sticker.SetName == "":
@@ -74,9 +74,9 @@ func actionAdd(msg *telegram.Message, pack bool) {
 				"SetTitle": set.Title,
 			})
 		} else {
-			markup := telegram.NewInlineKeyboardMarkup(
-				telegram.NewInlineKeyboardRow(
-					telegram.NewInlineKeyboardButtonSwitch(
+			markup := tg.NewInlineKeyboardMarkup(
+				tg.NewInlineKeyboardRow(
+					tg.NewInlineKeyboardButtonSwitch(
 						T("button_share"),
 						" ",
 					),
@@ -101,9 +101,9 @@ func actionAdd(msg *telegram.Message, pack bool) {
 			msg.Sticker.Emoji = " "
 		}
 
-		markup := telegram.NewInlineKeyboardMarkup(
-			telegram.NewInlineKeyboardRow(
-				telegram.NewInlineKeyboardButtonSwitch(
+		markup := tg.NewInlineKeyboardMarkup(
+			tg.NewInlineKeyboardRow(
+				tg.NewInlineKeyboardButtonSwitch(
 					T("button_share"),
 					msg.Sticker.Emoji,
 				),

cancel.go

@@ -2,8 +2,8 @@ package main
 
 import tg "github.com/toby3d/telegram" // My Telegram bindings
 
-func commandCancel(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandCancel(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
@@ -28,7 +28,7 @@ func commandCancel(msg *telegram.Message) {
 	err = dbChangeUserState(msg.From.ID, stateNone)
 	errCheck(err)
 
-	reply := telegram.NewMessage(msg.Chat.ID, text)
+	reply := tg.NewMessage(msg.Chat.ID, text)
 	_, err = bot.SendMessage(reply)
 	errCheck(err)
 }

commands.go

@@ -17,7 +17,7 @@ const (
 	cmdStart      = "start"
 )
 
-func commands(msg *telegram.Message) {
+func commands(msg *tg.Message) {
 	log.Ln("Received a", msg.Command(), "command")
 	switch strings.ToLower(msg.Command()) {
 	case strings.ToLower(cmdStart):

delete.go

@@ -2,8 +2,8 @@ package main
 
 import tg "github.com/toby3d/telegram" // My Telegram bindings
 
-func commandDelete(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandDelete(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
@@ -15,7 +15,7 @@ func commandDelete(msg *telegram.Message) {
 		err = dbChangeUserState(msg.From.ID, stateNone)
 		errCheck(err)
 
-		reply := telegram.NewMessage(msg.Chat.ID, T("error_empty_remove"))
+		reply := tg.NewMessage(msg.Chat.ID, T("error_empty_remove"))
 		_, err = bot.SendMessage(reply)
 		errCheck(err)
 		return
@@ -24,25 +24,25 @@ func commandDelete(msg *telegram.Message) {
 	err = dbChangeUserState(msg.From.ID, stateDelete)
 	errCheck(err)
 
-	markup := telegram.NewInlineKeyboardMarkup(
-		telegram.NewInlineKeyboardRow(
-			telegram.NewInlineKeyboardButtonSwitchSelf(
+	markup := tg.NewInlineKeyboardMarkup(
+		tg.NewInlineKeyboardRow(
+			tg.NewInlineKeyboardButtonSwitchSelf(
 				T("button_remove"),
 				" ",
 			),
 		),
 	)
 
-	reply := telegram.NewMessage(msg.Chat.ID, T("reply_remove"))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply := tg.NewMessage(msg.Chat.ID, T("reply_remove"))
+	reply.ParseMode = tg.ModeMarkdown
 	reply.ReplyMarkup = &markup
 
 	_, err = bot.SendMessage(reply)
 	errCheck(err)
 }
 
-func actionDelete(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func actionDelete(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
@@ -54,8 +54,8 @@ func actionDelete(msg *telegram.Message) {
 	)
 	errCheck(err)
 
-	reply := telegram.NewMessage(msg.Chat.ID, T("success_remove"))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply := tg.NewMessage(msg.Chat.ID, T("success_remove"))
+	reply.ParseMode = tg.ModeMarkdown
 
 	if notExist {
 		reply.Text = T("error_already_remove")

get_updates_channel.go

@@ -14,7 +14,7 @@ var allowedUpdates = []string{
 }
 
 // getUpdatesChannel return webhook or long polling channel with bot updates
-func getUpdatesChannel() telegram.UpdatesChannel {
+func getUpdatesChannel() tg.UpdatesChannel {
 	log.Ln("Preparing channel for updates...")
 	if !*flagWebhook {
 		log.Ln("Use LongPolling updates")
@@ -23,7 +23,7 @@ func getUpdatesChannel() telegram.UpdatesChannel {
 		_, err := bot.DeleteWebhook()
 		errCheck(err)
 
-		return bot.NewLongPollingChannel(&telegram.GetUpdatesParameters{
+		return bot.NewLongPollingChannel(&tg.GetUpdatesParameters{
 			Offset:         0,
 			Limit:          100,
 			Timeout:        60,
@@ -41,7 +41,7 @@ func getUpdatesChannel() telegram.UpdatesChannel {
 	)
 
 	log.Ln("Creating new webhook...")
-	webhook := telegram.NewWebhook(
+	webhook := tg.NewWebhook(
 		fmt.Sprint(set, listen, bot.AccessToken), nil,
 	)
 	webhook.MaxConnections = 40

help.go

@@ -2,8 +2,8 @@ package main
 
 import tg "github.com/toby3d/telegram" // My Telegram bindings
 
-func commandHelp(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandHelp(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	err := dbChangeUserState(msg.From.ID, stateNone)
 	errCheck(err)
@@ -11,16 +11,16 @@ func commandHelp(msg *telegram.Message) {
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
 
-	markup := telegram.NewInlineKeyboardMarkup(
-		telegram.NewInlineKeyboardRow(
-			telegram.NewInlineKeyboardButtonSwitch(
+	markup := tg.NewInlineKeyboardMarkup(
+		tg.NewInlineKeyboardRow(
+			tg.NewInlineKeyboardButtonSwitch(
 				T("button_share"),
 				" ",
 			),
 		),
 	)
 
-	reply := telegram.NewMessage(
+	reply := tg.NewMessage(
 		msg.Chat.ID, T("reply_help", map[string]interface{}{
 			"AddStickerCommand": cmdAddSticker,
 			"AddPackCommand":    cmdAddPack,
@@ -30,7 +30,7 @@ func commandHelp(msg *telegram.Message) {
 			"Username":          bot.Self.Username,
 		}),
 	)
-	reply.ParseMode = telegram.ModeMarkdown
+	reply.ParseMode = tg.ModeMarkdown
 	reply.ReplyMarkup = &markup
 
 	_, err = bot.SendMessage(reply)

inline_query.go

@@ -16,7 +16,7 @@ var r = strings.NewReplacer(
 	"🏿", "",
 )
 
-func inlineQuery(inline *telegram.InlineQuery) {
+func inlineQuery(inline *tg.InlineQuery) {
 	inline.Query = r.Replace(inline.Query)
 
 	log.Ln("Let's preparing answer...")
@@ -32,7 +32,7 @@ func inlineQuery(inline *telegram.InlineQuery) {
 	offset++
 
 	log.Ln("CURRENT OFFSET:", inline.Offset)
-	answer := &telegram.AnswerInlineQueryParameters{}
+	answer := &tg.AnswerInlineQueryParameters{}
 	answer.InlineQueryID = inline.ID
 	answer.CacheTime = 1
 	answer.IsPersonal = true
@@ -58,6 +58,7 @@ func inlineQuery(inline *telegram.InlineQuery) {
 		} else {
 			return
 		}
+		answer.Results = nil
 	} else {
 		log.Ln("STICKERS FROM REQUEST:", totalStickers)
 		if totalStickers > 50 {
@@ -71,7 +72,7 @@ func inlineQuery(inline *telegram.InlineQuery) {
 
 		var results = make([]interface{}, len(stickers))
 		for i, sticker := range stickers {
-			results[i] = telegram.NewInlineQueryResultCachedSticker(
+			results[i] = tg.NewInlineQueryResultCachedSticker(
 				sticker, sticker,
 			)
 		}

main.go

@@ -6,7 +6,7 @@ import (
 )
 
 // bot is general structure of the bot
-var bot *telegram.Bot
+var bot *tg.Bot
 
 // main function is a general function for work of this bot
 func main() {
@@ -16,7 +16,7 @@ func main() {
 	go dbInit()
 
 	log.Ln("Initializing new bot via checking access_token...")
-	bot, err = telegram.NewBot(cfg.UString("telegram.token"))
+	bot, err = tg.NewBot(cfg.UString("telegram.token"))
 	errCheck(err)
 
 	log.Ln("Let's check updates channel!")
@@ -46,8 +46,8 @@ func main() {
 			messages(update.Message)
 		default:
 			log.Ln("Get unsupported update")
+			continue
 		}
-		continue
 	}
 
 	err = db.Close()

messages.go

@@ -7,7 +7,7 @@ import (
 
 // message function check Message update on commands, sended stickers or other
 // user stuff
-func messages(msg *telegram.Message) {
+func messages(msg *tg.Message) {
 	if msg.IsCommand() {
 		commands(msg)
 		return
@@ -18,19 +18,19 @@ func messages(msg *telegram.Message) {
 
 	switch state {
 	case stateNone:
-		bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+		bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 		T, err := switchLocale(msg.From.LanguageCode)
 		errCheck(err)
 
-		reply := telegram.NewMessage(
+		reply := tg.NewMessage(
 			msg.Chat.ID,
 			T("error_unknown", map[string]interface{}{
 				"AddStickerCommand": cmdAddSticker,
 				"AddPackCommand":    cmdAddPack,
 				"DeleteCommand":     cmdDelete,
 			}))
-		reply.ParseMode = telegram.ModeMarkdown
+		reply.ParseMode = tg.ModeMarkdown
 
 		_, err = bot.SendMessage(reply)
 		errCheck(err)

reset.go

@@ -9,8 +9,8 @@ import (
 
 const keyPhrase = "Yes, I am totally sure."
 
-func commandReset(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandReset(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
@@ -22,8 +22,8 @@ func commandReset(msg *telegram.Message) {
 		err = dbChangeUserState(msg.From.ID, stateNone)
 		errCheck(err)
 
-		reply := telegram.NewMessage(msg.Chat.ID, T("error_already_reset"))
-		reply.ParseMode = telegram.ModeMarkdown
+		reply := tg.NewMessage(msg.Chat.ID, T("error_already_reset"))
+		reply.ParseMode = tg.ModeMarkdown
 
 		_, err = bot.SendMessage(reply)
 		errCheck(err)
@@ -33,20 +33,20 @@ func commandReset(msg *telegram.Message) {
 	err = dbChangeUserState(msg.From.ID, stateReset)
 	errCheck(err)
 
-	reply := telegram.NewMessage(
+	reply := tg.NewMessage(
 		msg.Chat.ID,
 		T("reply_reset", map[string]interface{}{
 			"KeyPhrase":     keyPhrase,
 			"CancelCommand": cmdCancel,
 		}))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply.ParseMode = tg.ModeMarkdown
 
 	_, err = bot.SendMessage(reply)
 	errCheck(err)
 }
 
-func actionReset(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func actionReset(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	err := dbChangeUserState(msg.From.ID, stateNone)
 	errCheck(err)
@@ -55,8 +55,8 @@ func actionReset(msg *telegram.Message) {
 	errCheck(err)
 
 	if msg.Text != keyPhrase {
-		reply := telegram.NewMessage(msg.Chat.ID, T("error_reset_phrase"))
-		reply.ParseMode = telegram.ModeMarkdown
+		reply := tg.NewMessage(msg.Chat.ID, T("error_reset_phrase"))
+		reply.ParseMode = tg.ModeMarkdown
 
 		_, err = bot.SendMessage(reply)
 		errCheck(err)
@@ -66,21 +66,21 @@ func actionReset(msg *telegram.Message) {
 	err = dbResetUserStickers(msg.From.ID)
 	errCheck(err)
 
-	reply := telegram.NewMessage(msg.Chat.ID, T("success_reset"))
-	reply.ParseMode = telegram.ModeMarkdown
+	reply := tg.NewMessage(msg.Chat.ID, T("success_reset"))
+	reply.ParseMode = tg.ModeMarkdown
 
 	_, err = bot.SendMessage(reply)
 	errCheck(err)
 
 	for i := 1; i <= 3; i++ {
-		bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+		bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 		text := T(fmt.Sprint("meta_reset_", i))
 
 		time.Sleep(time.Minute * time.Duration(len(text)) / 1000)
 
-		reply = telegram.NewMessage(msg.Chat.ID, text)
-		reply.ParseMode = telegram.ModeMarkdown
+		reply = tg.NewMessage(msg.Chat.ID, text)
+		reply.ParseMode = tg.ModeMarkdown
 
 		_, err = bot.SendMessage(reply)
 		errCheck(err)

start.go

@@ -7,8 +7,8 @@ import (
 	tg "github.com/toby3d/telegram"     // My Telegram bindings
 )
 
-func commandStart(msg *telegram.Message) {
-	bot.SendChatAction(msg.Chat.ID, telegram.ActionTyping)
+func commandStart(msg *tg.Message) {
+	bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
 
 	err := dbChangeUserState(msg.From.ID, stateNone)
 	errCheck(err)
@@ -24,13 +24,13 @@ func commandStart(msg *telegram.Message) {
 	T, err := switchLocale(msg.From.LanguageCode)
 	errCheck(err)
 
-	reply := telegram.NewMessage(
+	reply := tg.NewMessage(
 		msg.Chat.ID, T("reply_start", map[string]interface{}{
 			"Username": bot.Self.Username,
 			"ID":       bot.Self.ID,
 		}),
 	)
-	reply.ParseMode = telegram.ModeMarkdown
+	reply.ParseMode = tg.ModeMarkdown
 
 	_, err = bot.SendMessage(reply)
 	errCheck(err)