diff --git a/handlers/callbacks.go b/handlers/callbacks.go index 1065494..34dd76a 100644 --- a/handlers/callbacks.go +++ b/handlers/callbacks.go @@ -39,7 +39,7 @@ func (bot *Bot) HandleCallbackQuery(query *api.CallbackQuery) { case "decline": bot.handleDeclineRequest(query, user, userString, adminUserString) case "ban": - bot.showBanConfirmation(query, user, userString) + bot.showBanConfirmation(query, user) bot.API.Request(api.NewCallback(query.ID, "")) return case "banc": @@ -132,7 +132,7 @@ func (bot *Bot) handleBanRequest(query *api.CallbackQuery, user *ExtendedChatJoi } // showBanConfirmation displays a confirmation prompt for the ban action. -func (bot *Bot) showBanConfirmation(query *api.CallbackQuery, user *ExtendedChatJoinRequest, userString string) { +func (bot *Bot) showBanConfirmation(query *api.CallbackQuery, user *ExtendedChatJoinRequest) { approveBtn := api.NewInlineKeyboardButtonData("Approve", fmt.Sprintf("approve_%d", user.From.ID)) declineBtn := api.NewInlineKeyboardButtonData("Decline", fmt.Sprintf("decline_%d", user.From.ID)) confirmBtn := api.NewInlineKeyboardButtonData("Ban (confirm)", fmt.Sprintf("banc_%d", user.From.ID)) @@ -141,10 +141,10 @@ func (bot *Bot) showBanConfirmation(query *api.CallbackQuery, user *ExtendedChat []api.InlineKeyboardButton{confirmBtn}, ) - msg := fmt.Sprintf("Are you sure you want to ban %s for 24 hours?", userString) - edit := api.NewEditMessageText(query.Message.Chat.ID, query.Message.MessageID, msg) + edit := api.NewEditMessageText(query.Message.Chat.ID, query.Message.MessageID, query.Message.Text) edit.ReplyMarkup = &keyboard edit.ParseMode = api.ModeHTML + edit.Entities = query.Message.Entities bot.API.Send(edit) }