refactor: 支持多个 Utils 改动.

This commit is contained in:
LamGC 2022-04-21 20:48:24 +08:00
parent a7b40cd100
commit 523d2edd6b
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D

View File

@ -171,13 +171,12 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
val markup = InlineKeyboardGroupBuilder() val markup = InlineKeyboardGroupBuilder()
.configure { .configure {
} }
.newRow() .rowButton {
.addButton {
text(changeNameMsg) text(changeNameMsg)
callbackData( callbackData(
action = "oc_account_change_name", action = "oc_account_change_name",
extraData = jsonObjectOf { extraData = jsonObjectOf {
JSON_FIELD_PROFILE += profile JsonFields.AccountProfile += profile
} }
) )
} }
@ -222,7 +221,7 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
.callbackData( .callbackData(
action = "oc_account_manager", action = "oc_account_manager",
extraData = jsonObjectOf { extraData = jsonObjectOf {
JSON_FIELD_PROFILE += account JsonFields.AccountProfile += account
} }
) )
.build() .build()
@ -261,8 +260,7 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
null null
} }
val newKeyboardMarkup = InlineKeyboardGroupBuilder() val newKeyboardMarkup = InlineKeyboardGroupBuilder()
.newRow() .rowButton {
.addButton {
text("服务器列表") text("服务器列表")
callbackData(keyboardCallback.next("oc_server_list")) callbackData(keyboardCallback.next("oc_server_list"))
} }
@ -271,11 +269,10 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
text("账号管理") text("账号管理")
callbackData(keyboardCallback.next("oc_account_edit")) callbackData(keyboardCallback.next("oc_account_edit"))
} }
.newRow().addButton { .rowButton {
text("<<< 返回上一级") text("<<< 返回上一级")
callbackData(action = "oc_account_list") callbackData(action = "oc_account_list")
} }.build()
.then().build()
val editMessageText = EditMessageText.builder() val editMessageText = EditMessageText.builder()
.chatId(upd.callbackQuery.message.chatId.toString()) .chatId(upd.callbackQuery.message.chatId.toString())
@ -298,21 +295,18 @@ class OracleAccountManagerExtension(private val bot: BaseAbilityBot) : AbilityEx
fun editOracleAccount(): Reply = Reply.of({ bot, upd -> fun editOracleAccount(): Reply = Reply.of({ bot, upd ->
val keyboardCallback = upd.callbackQuery.callbackData val keyboardCallback = upd.callbackQuery.callbackData
val newKeyboardMarkup = InlineKeyboardGroupBuilder() val newKeyboardMarkup = InlineKeyboardGroupBuilder()
.newRow() .rowButton {
.addButton {
text("更改名称") text("更改名称")
callbackData(action = "oc_account_change_name", keyboardCallback.extraData) callbackData(action = "oc_account_change_name", keyboardCallback.extraData)
} }
.newRow() .rowButton {
.addButton {
text("解绑 Oracle 账号") text("解绑 Oracle 账号")
callbackData(action = "oc_account_remove", keyboardCallback.extraData) callbackData(action = "oc_account_remove", keyboardCallback.extraData)
} }
.newRow().addButton { .rowButton {
text("<<< 返回上一级") text("<<< 返回上一级")
callbackData(action = "oc_account_manager", keyboardCallback.extraData) callbackData(action = "oc_account_manager", keyboardCallback.extraData)
} }.build()
.then().build()
val editMessageReplyMarkup = EditMessageReplyMarkup.builder() val editMessageReplyMarkup = EditMessageReplyMarkup.builder()
.chatId(upd.callbackQuery.message.chatId.toString()) .chatId(upd.callbackQuery.message.chatId.toString())