From: Eduardo Date: Thu, 28 Mar 2024 22:58:53 +0000 (+0100) Subject: just some code movement X-Git-Url: http://git.edufdez.es/?a=commitdiff_plain;h=0cc34fdbbc24c668c9a14addd283d436361b5bc1;p=sylphiette-bot.git just some code movement --- diff --git a/telegram.go b/telegram.go index c1fffd6..b9790bf 100644 --- a/telegram.go +++ b/telegram.go @@ -68,40 +68,6 @@ func handleMessage(message *tgbotapi.Message) { } } -func sendMenu(chatId int64) error { - msg := tgbotapi.NewMessage(chatId, botText) - msg.ParseMode = tgbotapi.ModeHTML - msg.ReplyMarkup = menuTextMarkup - msg.DisableNotification = true - resMsg, err := telegram.Send(msg) - botMsg = &resMsg - return err -} - -func handleButton(query *tgbotapi.CallbackQuery) { - var text string - - markup := tgbotapi.NewInlineKeyboardMarkup() - message := query.Message - - if botMsg == nil { - botMsg = message - } - - if query.Data == UpdateTextBtn { - text = botText - markup = menuTextMarkup - } - - callbackCfg := tgbotapi.NewCallback(query.ID, "") - telegram.Send(callbackCfg) - - // Replace menu text and keyboard - msg := tgbotapi.NewEditMessageTextAndMarkup(message.Chat.ID, message.MessageID, text, markup) - msg.ParseMode = tgbotapi.ModeHTML - telegram.Send(msg) -} - // When we get a command, we react accordingly func handleCommand(chatId int64, command string) error { var err error @@ -159,6 +125,40 @@ func handleConversation(chatId int64, text string) error { return err } +func sendMenu(chatId int64) error { + msg := tgbotapi.NewMessage(chatId, botText) + msg.ParseMode = tgbotapi.ModeHTML + msg.ReplyMarkup = menuTextMarkup + msg.DisableNotification = true + resMsg, err := telegram.Send(msg) + botMsg = &resMsg + return err +} + +func handleButton(query *tgbotapi.CallbackQuery) { + var text string + + markup := tgbotapi.NewInlineKeyboardMarkup() + message := query.Message + + if botMsg == nil { + botMsg = message + } + + if query.Data == UpdateTextBtn { + text = botText + markup = menuTextMarkup + } + + callbackCfg := tgbotapi.NewCallback(query.ID, "") + telegram.Send(callbackCfg) + + // Replace menu text and keyboard + msg := tgbotapi.NewEditMessageTextAndMarkup(message.Chat.ID, message.MessageID, text, markup) + msg.ParseMode = tgbotapi.ModeHTML + telegram.Send(msg) +} + func manageSerieRequest(chatId int64, text string) error { var err error var response string = ""