LamGC/oracle-manager
1
0
Fork 0
mirror of https://github.com/LamGC/oracle-manager.git synced 2025-04-29 22:27:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(account_manager): 修复通过按钮返回账号列表时发送了新消息的问题.

Browse Source 
原设定为点击返回账号列表按钮时, 使用 EditMessageText 回到账号列表的, 但因逻辑错误, 导致按照命令触发的形式, 发送了新的消息.
此改动已修正该问题.
This commit is contained in:
LamGC 2022-04-20 17:27:01 +08:00
parent 5df02ab5be
commit 7f3fa2ea0f
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/kotlin/OracleAccountExtension.kt
View File

@ -185,24 +185,21 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
} }
fun listOracleAccountReply(): Reply = Reply.of({ bot, upd -> fun listOracleAccountReply(): Reply = Reply.of({ bot, upd ->
doListOracleAccount(bot, upd.callbackQuery.message.chatId, upd.callbackQuery.from.id) doListOracleAccount(
bot,
upd.callbackQuery.message.chatId,
upd.callbackQuery.from.id,
upd.callbackQuery.message.messageId
)
}, callbackQueryAt("oc_account_list")) }, callbackQueryAt("oc_account_list"))
private fun doListOracleAccount(bot: BaseAbilityBot, chatId: Long, userId: Long) { private fun doListOracleAccount(bot: BaseAbilityBot, chatId: Long, userId: Long, messageId: Int? = null) {
val accounts = OracleAccountManage.getOracleAccountsByTelegramUserId(userId) val accounts = OracleAccountManage.getOracleAccountsByTelegramUserId(userId)
if (accounts.isEmpty()) { if (accounts.isEmpty()) {
bot.silent().send("你还没有绑定任何 Oracle 账号，请使用【/oc_account_add】绑定一个 Oracle 账号。", chatId) bot.silent().send("你还没有绑定任何 Oracle 账号，请使用【/oc_account_add】绑定一个 Oracle 账号。", chatId)
return return
} }
// TODO: 要弄个页面, 防止账号太多刷爆了 // TODO: 要弄个页面, 防止账号太多刷爆了
val msgBuilder = SendMessage.builder()
.chatId(chatId.toString())
.text(
"""
当前 Telegram 用户已绑定以下 Oracle 账号
（账号没有名字只有邮箱是因为通过 API 获取名字失败）
""".trimIndent()
)
val keyboardGroup = InlineKeyboardMarkup.builder() val keyboardGroup = InlineKeyboardMarkup.builder()
for (account in accounts) { for (account in accounts) {
val provider = account.getAuthenticationDetailsProvider() val provider = account.getAuthenticationDetailsProvider()
@ -225,8 +222,25 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
) )
) )
} }
msgBuilder.replyMarkup(keyboardGroup.build()) val text = """
bot.silent().execute(msgBuilder.build()) 当前 Telegram 用户已绑定以下 Oracle 账号
（账号没有名字只有邮箱是因为通过 API 获取名字失败）
""".trimIndent()
if (messageId == null) {
SendMessage.builder()
.chatId(chatId.toString())
.text(text)
.replyMarkup(keyboardGroup.build())
.build().execute(bot.silent())
} else {
EditMessageText.builder()
.text(text)
.messageId(messageId)
.chatId(chatId.toString())
.replyMarkup(keyboardGroup.build())
.build().execute(bot.silent())
}
} }
fun manageOracleAccount(): Reply = Reply.of({ bot, upd -> fun manageOracleAccount(): Reply = Reply.of({ bot, upd ->