细节优化

mmmjie · Feb 2, 2024 · 367b841 · 367b841
1 parent aef0598
commit 367b841
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Model/config.js b/Model/config.js
@@ -8,9 +8,11 @@ const configSave = config => fs.writeFileSync(configFile, YAML.stringify({ ...co
 const config = {
   tips: "",
   permission: "master",
-  toMarkdown: false,
-  toButton: false,
-  toCallback: true,
+  markdown: {
+    global: false,
+    button: true,
+    callback: true,
+  },
   bot: {},
   token: []
 }

diff --git a/index.js b/index.js
@@ -45,7 +45,7 @@ const adapter = new class ICQQAdapter {
         data: button.link,
         ...button.ICQQ?.action,
       }
-    else if (config.toCallback && (button.input || button.callback))
+    else if (config.markdown.callback && (button.input || button.callback))
       for (const i of Bot.uin)
         if (Bot[i].adapter?.id == "QQBot" && Bot[i].sdk?.config?.appid && Bot[i].callback) {
           msg.action = {
@@ -204,7 +204,7 @@ const adapter = new class ICQQAdapter {
   async makeMsg(id, pick, msg) {
     if (!Array.isArray(msg))
       msg = [msg]
-    if (config.toMarkdown)
+    if (config.markdown.global)
       return this.makeMarkdownMsg(id, pick, msg)
 
     const msgs = []
@@ -214,8 +214,8 @@ const adapter = new class ICQQAdapter {
           msgs.push(...(await this.makeMarkdownMsg(id, pick, msg)))
           continue
         case "button":
-          if (config.toButton) {
-            if (config.toButton == "direct")
+          if (config.markdown.button) {
+            if (config.markdown.button == "direct")
               msgs.push({ type: "button", content: { rows: this.makeButtons(i.data) }})
             else
               return this.makeMarkdownMsg(id, pick, msg)