@alemonjs/qq-bot 0.0.18 → 0.0.19

package/lib/hook.d.ts

@@ -0,0 +1,10 @@
+import { EventKeys, Events } from 'alemonjs';
+
+/**
+ * 判断当前模式
+ * @param event
+ * @returns
+ */
+declare const useMode: <T extends EventKeys>(event: Events[T]) => (mode: "guild" | "group") => boolean;
+
+export { useMode };

package/lib/hook.js

@@ -0,0 +1,35 @@
+/**
+ * 判断当前模式
+ * @param event
+ * @returns
+ */
+const useMode = (event) => {
+    const tag = event.tag;
+    let currentMode = 'group';
+    // 群at
+    if (tag == 'GROUP_AT_MESSAGE_CREATE') {
+        currentMode = 'group';
+    }
+    // 私聊
+    if (tag == 'C2C_MESSAGE_CREATE') {
+        currentMode = 'group';
+    }
+    // 频道私聊
+    if (tag == 'DIRECT_MESSAGE_CREATE') {
+        currentMode = 'guild';
+    }
+    // 频道at
+    if (tag == 'AT_MESSAGE_CREATE') {
+        currentMode = 'guild';
+    }
+    // 频道消息
+    if (tag == 'MESSAGE_CREATE') {
+        currentMode = 'guild';
+    }
+    const isMode = (mode) => {
+        return currentMode == mode;
+    };
+    return isMode;
+};
+
+export { useMode };

package/lib/index.d.ts

@@ -1,9 +1,11 @@
 import * as alemonjs from 'alemonjs';
 import { QQBotAPI } from './sdk/api.js';
+export { useMode } from './hook.js';
 
 type Client = typeof QQBotAPI.prototype;
 declare const client: Client;
 declare const platform = "qq-bot";
+
 declare const _default: alemonjs.DefinePlatformValue;
 
 export { type Client, client, _default as default, platform };

package/lib/index.group.js

@@ -1,10 +1,10 @@
-import { defineBot, getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
+import { getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
 import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
 import { QQBotGroupClient } from './sdk/websoket.group.js';
 import { isGuild } from './utils.js';
 
 const platform = 'qq-bot';
-var QQBotGroup = defineBot(() => {
+var QQBotGroup = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
         value = {};

package/lib/index.guild.js

@@ -1,10 +1,10 @@
-import { defineBot, getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
+import { getConfigValue, useUserHashKey, onProcessor } from 'alemonjs';
 import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
 import { QQBotGuildClient } from './sdk/websoket.guild.js';
 import { isGuild } from './utils.js';
 
 const platform = 'qq-bot';
-var QQBotGuild = defineBot(() => {
+var QQBotGuild = definePlatform(() => {
     let value = getConfigValue();
     if (!value)
         value = {};

package/lib/index.js

@@ -4,6 +4,7 @@ import { AT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, C2C_
 import QQBotGroup from './index.group.js';
 import QQBotGuild from './index.guild.js';
 import { isGuild } from './utils.js';
+export { useMode } from './hook.js';
 
 const client = new Proxy({}, {
     get: (_, prop) => {

package/lib/sdk/websoket.group.js

@@ -93,7 +93,7 @@ class QQBotGroupClient extends QQBotAPI {
         await this.#setTimeoutBotConfig();
         // 请求url
         if (!this.#gatewayUrl) {
-            this.#gatewayUrl = gatewayURL ?? await this.gateway().then(res => res?.url);
+            this.#gatewayUrl = gatewayURL ?? (await this.gateway().then(res => res?.url));
         }
         if (!this.#gatewayUrl)
             return;

package/lib/sdk/websoket.guild.js

@@ -70,15 +70,17 @@ class QQBotGuildClient extends QQBotAPI {
      */
     async connect(gatewayURL) {
         //
-        this.#gatewayUrl = gatewayURL ?? await this.gateway()
-            .then(res => res.url)
-            .catch(err => {
-            if (this.#events['ERROR']) {
-                for (const item of this.#events['ERROR']) {
-                    item(err);
-                }
-            }
-        });
+        this.#gatewayUrl =
+            gatewayURL ??
+                (await this.gateway()
+                    .then(res => res.url)
+                    .catch(err => {
+                    if (this.#events['ERROR']) {
+                        for (const item of this.#events['ERROR']) {
+                            item(err);
+                        }
+                    }
+                }));
         // 请求url
         if (!this.#gatewayUrl)
             return this;

package/lib/send/index.js

@@ -12,27 +12,27 @@ const createButtonsData = (rows) => {
                     const options = button.options;
                     id++;
                     return {
-                        "id": String(id),
-                        "render_data": {
-                            "label": typeof value == 'object' ? value.title : value,
-                            "visited_label": typeof value == 'object' ? value.label : value,
+                        id: String(id),
+                        render_data: {
+                            label: typeof value == 'object' ? value.title : value,
+                            visited_label: typeof value == 'object' ? value.label : value,
                             // tudo
-                            "style": 0
+                            style: 0
                         },
-                        "action": {
-                            // 0 link 1 callback , 2 command 
-                            "type": typeof options.data === 'object' ? 1 : (options?.isLink ? 0 : 2),
-                            "permission": {
+                        action: {
+                            // 0 link 1 callback , 2 command
+                            type: typeof options.data === 'object' ? 1 : options?.isLink ? 0 : 2,
+                            permission: {
                                 // 所有人
-                                "type": 2,
+                                type: 2
                                 // "specify_role_ids": ["1", "2", "3"]
                             },
                             // "click_limit": 10,
-                            "unsupport_tips": options?.toolTip ?? '',
-                            "data": options?.data ?? '',
+                            unsupport_tips: options?.toolTip ?? '',
+                            data: options?.data ?? '',
                             // reply: true,
-                            "at_bot_show_channel_list": options.showList ?? false,
-                            "enter": options?.autoEnter ?? false
+                            at_bot_show_channel_list: options.showList ?? false,
+                            enter: options?.autoEnter ?? false
                         }
                     };
                 })
@@ -47,7 +47,7 @@ const GROUP_AT_MESSAGE_CREATE = (client, event, val) => {
         .map(item => {
         // if (item.type == 'Link') {
         //   return `[${item.options?.title ?? item.value}](${item.value})`
-        // } else 
+        // } else
         if (item.type == 'Mention') {
             if (item.value == 'everyone' ||
                 item.value == 'all' ||
@@ -126,7 +126,7 @@ const GROUP_AT_MESSAGE_CREATE = (client, event, val) => {
                 });
             }
             const rows = item.value;
-            // 构造成按钮 
+            // 构造成按钮
             const data = createButtonsData(rows);
             return client.groupOpenMessages(event.GuildId, {
                 content: '',
@@ -216,7 +216,7 @@ const C2C_MESSAGE_CREATE = (client, event, val) => {
             rows.map(row => {
                 return row;
             });
-            // 构造成按钮 
+            // 构造成按钮
             const data = createButtonsData(rows);
             return client.groupOpenMessages(event.GuildId, {
                 content: '',
@@ -284,7 +284,7 @@ const AT_MESSAGE_CREATE = (client, event, val) => {
         .map(item => {
         // if (item.type == 'Link') {
         //   return `[${item.options?.title ?? item.value}](${item.value})`
-        // } else 
+        // } else
         if (item.type == 'Mention') {
             if (item.value == 'everyone' ||
                 item.value == 'all' ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "阿柠檬qqbot平台连接",
   "author": "lemonade",
   "license": "MIT",