@alemonjs/qq-bot 2.1.0-alpha.3 → 2.1.0-alpha.4

package/lib/sdk/typing.d.ts

@@ -0,0 +1,63 @@
+type MessageType = 0 | 1 | 2 | 3 | 4 | 7
+type FileType = 1 | 2 | 3 | 4
+interface ButtonType {
+  id: string
+  render_data: {
+    label: string
+    visited_label: string
+    style?: number
+  }
+  action: {
+    type: number
+    permission: {
+      type: number
+    }
+    reply?: boolean
+    enter?: boolean
+    unsupport_tips?: string
+    data:
+      | string
+      | {
+          click: string
+          confirm: string
+          cancel: string
+        }
+    at_bot_show_channel_list?: boolean
+  }
+}
+interface KeyboardType {
+  id?: string
+  content?: {
+    rows: {
+      buttons: ButtonType[]
+    }[]
+  }
+}
+interface MarkdownType {
+  /** markdown 模版id，申请模版后获得 */
+  custom_template_id: string
+  /** 原生 markdown 文本内容（内邀使用） */
+  content?: string
+  /** 模版内变量与填充值的kv映射 */
+  params?: Array<{
+    key: string
+    values: string[]
+  }>
+}
+interface ApiRequestData {
+  content?: string
+  msg_type: MessageType
+  markdown?: MarkdownType
+  keyboard?: KeyboardType
+  media?: {
+    file_info: string
+  }
+  ark?: any
+  image?: any
+  message_reference?: any
+  event_id?: any
+  msg_id?: string
+  msg_seq?: number
+}
+
+export type { ApiRequestData, ButtonType, FileType, KeyboardType, MarkdownType, MessageType }

package/lib/sends.js

@@ -212,7 +212,8 @@ const GROUP_AT_MESSAGE_CREATE = async (client, event, val) => {
                 });
             }
             try {
-                const file_data = item.type == 'ImageFile' ? readFileSync(item.value, 'base64') : item.value;
+                const getFileBase64 = () => readFileSync(item.value, 'base64');
+                const file_data = item.type == 'ImageFile' ? getFileBase64() : item.value;
                 const file_info = await client
                     .postRichMediaByGroup(event.GuildId, {
                     file_type: 1,
@@ -372,7 +373,8 @@ const C2C_MESSAGE_CREATE = (client, event, val) => {
                     id: res.id
                 });
             }
-            const file_data = item.type == 'ImageFile' ? readFileSync(item.value, 'base64') : item.value;
+            const getFileBase64 = () => readFileSync(item.value, 'base64');
+            const file_data = item.type == 'ImageFile' ? getFileBase64() : item.value;
             const file_info = await client
                 .postRichMediaByUsers(event.OpenId, {
                 file_type: 1,
@@ -517,10 +519,10 @@ const DIRECT_MESSAGE_CREATE = (client, event, val) => {
                 });
                 return createResult(ResultCode.Ok, 'client.postDirectImage', { id: res?.id });
             }
-            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : item.value;
+            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : Buffer.from(item.value, 'base64');
             const res = await client.postDirectImage(event.OpenId, {
                 msg_id: event.MessageId,
-                image: Buffer.isBuffer(file_data) ? file_data : Buffer.from(file_data)
+                image: file_data
             });
             return createResult(ResultCode.Ok, 'client.postDirectImage', { id: res?.id });
         })).catch(err => [
@@ -583,10 +585,10 @@ const AT_MESSAGE_CREATE = (client, event, val) => {
                 });
                 return createResult(ResultCode.Ok, 'client.postImage', { id: res?.id });
             }
-            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : item.value;
+            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : Buffer.from(item.value, 'base64');
             const res = await client.postImage(event.ChannelId, {
                 msg_id: event.MessageId,
-                image: Buffer.isBuffer(file_data) ? file_data : Buffer.from(file_data)
+                image: file_data
             });
             return createResult(ResultCode.Ok, 'client.postImage', { id: res?.id });
         })).catch(err => [
@@ -655,10 +657,10 @@ const MESSAGE_CREATE = (client, event, val) => {
                 });
                 return createResult(ResultCode.Ok, 'client.postImage', { id: res?.id });
             }
-            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : item.value;
+            const file_data = item.type == 'ImageFile' ? readFileSync(item.value) : Buffer.from(item.value, 'base64');
             const res = await client.postImage(event.ChannelId, {
                 msg_id: event.MessageId,
-                image: Buffer.isBuffer(file_data) ? file_data : Buffer.from(file_data)
+                image: file_data
             });
             return createResult(ResultCode.Ok, 'client.postImage', { id: res?.id });
         })).catch(err => [

package/lib/utils.js

@@ -0,0 +1,13 @@
+/**
+ *
+ * @param str
+ * @returns
+ */
+const isGuild = str => {
+  // guild ID 纯数字，例如：11586990140073229091
+  // 转换失败，是群id。return false
+  if (isNaN(Number(str.substring(0, 6)))) return false
+  return true
+}
+
+export { isGuild }

package/package.json

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