From 523d2edd6b0abf44f27bfa2307f3c6ffaafb3574 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Thu, 21 Apr 2022 20:48:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=20Utils=20=E6=94=B9=E5=8A=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/kotlin/OracleAccountExtension.kt | 26 +++++++++--------------
 1 file changed, 10 insertions(+), 16 deletions(-)

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