@alemonjs/kook 0.1.2 → 0.2.1

package/README.md

@@ -25,7 +25,7 @@ kook:
   # 令牌
   token: ''
   # 主人
-  master_id:
+  master_key:
     - ''
 ```
 

package/lib/index.d.ts

@@ -1,7 +1,9 @@
+import * as alemonjs from 'alemonjs';
 import { KOOKClient } from './sdk/platform/kook/sdk/wss.js';
 
 type Client = typeof KOOKClient.prototype;
+declare const platform = "gui";
 declare const client: Client;
-declare const _default: () => typeof global.alemonjs;
+declare const _default: () => alemonjs.ClientAPI;
 
-export { type Client, client, _default as default };
+export { type Client, client, _default as default, platform };

package/lib/index.js

@@ -1,4 +1,4 @@
-import { defineBot, getConfig, createHash, Text, At, OnProcessor, useParse } from 'alemonjs';
+import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import 'fs';
 import 'axios';
 import 'path';
@@ -10,10 +10,18 @@ import 'form-data';
 import './sdk/platform/kook/sdk/typings.js';
 import { KOOKClient } from './sdk/platform/kook/sdk/wss.js';
 
-const client = global.client;
+const platform = 'gui';
+const client = new Proxy({}, {
+    get: (_, prop) => {
+        if (prop in global.client) {
+            return global.client[prop];
+        }
+        return undefined;
+    }
+});
 var index = defineBot(() => {
-    const cfg = getConfig();
-    const config = cfg.value?.kook;
+    const value = getConfigValue();
+    const config = value?.kook;
     if (!config)
         return;
     // 创建客户端
@@ -27,14 +35,12 @@ var index = defineBot(() => {
         if (event.extra?.author?.bot)
             return false;
         // 主人
-        const master_id = config?.master_id ?? [];
-        const isMaster = master_id.includes(event.author_id);
+        const master_key = config?.master_key ?? [];
+        const isMaster = master_key.includes(event.author_id);
         // 头像
         const avatar = event.extra.author.avatar;
         // 获取消息
         let msg = event.content;
-        // 艾特消息处理
-        const at_users = [];
         const url = avatar.substring(0, avatar.indexOf('?'));
         const UserAvatar = {
             toBuffer: async () => {
@@ -49,24 +55,26 @@ var index = defineBot(() => {
                 return url;
             }
         };
-        const UserKey = createHash(`kook:${event.author_id}`);
+        const UserId = event.author_id;
+        const UserKey = useUserHashKey({
+            Platform: platform,
+            UserId
+        });
         // 定义消
         const e = {
             // 事件类型
-            Platform: 'kook',
+            Platform: platform,
             // 用户Id
-            UserId: event.author_id,
+            UserId: UserId,
             UserKey,
             UserName: event.extra.author.username,
             UserAvatar: UserAvatar,
             IsMaster: isMaster,
+            IsBot: false,
             // message
             MessageId: event.msg_id,
-            MessageBody: [
-                Text(msg),
-                ...at_users.map(item => At(item.id, 'user', { name: item.name, avatar: item.avatar, bot: item.bot }))
-            ],
             MessageText: msg,
+            OpenId: '',
             CreateAt: Date.now(),
             //
             tag: 'MESSAGES_PUBLIC',
@@ -89,26 +97,18 @@ var index = defineBot(() => {
         // 创建私聊标记
         const data = await client.userChatCreate(event.extra.author.id).then(res => res?.data);
         // 主人
-        const master_id = config?.master_id ?? [];
-        const isMaster = master_id.includes(event.author_id);
+        const master_key = config?.master_key ?? [];
+        const isMaster = master_key.includes(event.author_id);
         // 头像
         const avatar = event.extra.author.avatar;
         // 获取消息
         let msg = event.content;
-        // 艾特消息处理
-        const at_users = [];
         /**
          * 艾特类型所得到的
          * 包括机器人在内
          */
         const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
         for (const item of mention_role_part) {
-            at_users.push({
-                id: item.role_id,
-                name: item.name,
-                avatar: '',
-                bot: true
-            });
             msg = msg.replace(`(rol)${item.role_id}(rol)`, '').trim();
         }
         /**
@@ -116,12 +116,6 @@ var index = defineBot(() => {
          */
         const mention_part = event.extra.kmarkdown?.mention_part ?? [];
         for (const item of mention_part) {
-            at_users.push({
-                id: item.id,
-                name: item.username,
-                avatar: item.avatar,
-                bot: false
-            });
             msg = msg.replace(`(met)${item.id}(met)`, '').trim();
         }
         const url = avatar.substring(0, avatar.indexOf('?'));
@@ -138,26 +132,27 @@ var index = defineBot(() => {
                 return url;
             }
         };
-        const UserKey = createHash(`kook:${event.author_id}`);
+        const UserId = event.author_id;
+        const UserKey = useUserHashKey({
+            Platform: platform,
+            UserId
+        });
         // 定义消
         const e = {
             // 事件类型
-            Platform: 'kook',
+            Platform: platform,
             //
             GuildId: event.extra.guild_id,
             ChannelId: event.target_id,
             // 用户Id
-            UserId: event.author_id,
+            UserId: UserId,
             UserKey,
             UserName: event.extra.author.username,
             UserAvatar: UserAvatar,
             IsMaster: isMaster,
+            IsBot: false,
             // message
             MessageId: event.msg_id,
-            MessageBody: [
-                Text(msg),
-                ...at_users.map(item => At(item.id, 'user', { name: item.name, avatar: item.avatar, bot: item.bot }))
-            ],
             MessageText: msg,
             OpenId: data?.code,
             CreateAt: Date.now(),
@@ -186,9 +181,47 @@ var index = defineBot(() => {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = useParse({
-                        MessageBody: val
-                    }, 'Text');
+                    const content = val
+                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                        .map(item => {
+                        if (item.type == 'Link') {
+                            return `[${item.options?.title ?? item.value}](${item.value})`;
+                        }
+                        else if (item.type == 'Mention') {
+                            if (item.value == 'everyone' ||
+                                item.value == 'all' ||
+                                item.value == '' ||
+                                typeof item.value != 'string') {
+                                return `(met)all(met)`;
+                            }
+                            if (item.options?.belong == 'user') {
+                                return `(met)${item.value}(met)`;
+                            }
+                            else if (item.options?.belong == 'channel') {
+                                return `(chn)${item.value}(chn)`;
+                            }
+                            return '';
+                        }
+                        else if (item.type == 'Text') {
+                            if (item.options?.style == 'block') {
+                                return `\`${item.value}\``;
+                            }
+                            else if (item.options?.style == 'italic') {
+                                return `*${item.value}*`;
+                            }
+                            else if (item.options?.style == 'bold') {
+                                return `**${item.value}**`;
+                            }
+                            else if (item.options?.style == 'strikethrough') {
+                                return `~~${item.value}~~`;
+                            }
+                            else if (item.options?.style == 'boldItalic') {
+                                return `***${item.value}***`;
+                            }
+                            return item.value;
+                        }
+                    })
+                        .join('');
                     if (content) {
                         return Promise.all([content].map(item => client.createMessage({
                             type: 9,
@@ -196,9 +229,7 @@ var index = defineBot(() => {
                             content: item
                         })));
                     }
-                    const images = useParse({
-                        MessageBody: val
-                    }, 'Image');
+                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
                     if (images) {
                         return Promise.all(images.map(async (item) => {
                             // 上传图片
@@ -214,10 +245,48 @@ var index = defineBot(() => {
                         }));
                     }
                     return Promise.all([]);
+                },
+                mention: async (e) => {
+                    const event = e.value;
+                    const MessageMention = [];
+                    /**
+                     * 艾特类型所得到的,包括机器人在内
+                     */
+                    const mention_role_part = event.extra.kmarkdown?.mention_role_part ?? [];
+                    for (const item of mention_role_part) {
+                        MessageMention.push({
+                            UserId: item.role_id,
+                            UserName: item.name,
+                            UserKey: useUserHashKey({
+                                Platform: platform,
+                                UserId: item.role_id
+                            }),
+                            IsMaster: false,
+                            IsBot: true
+                        });
+                    }
+                    /**
+                     * 艾特用户所得到的
+                     */
+                    const mention_part = event.extra.kmarkdown?.mention_part ?? [];
+                    for (const item of mention_part) {
+                        MessageMention.push({
+                            // avatar: item.avatar,
+                            UserId: item.id,
+                            UserName: item.username,
+                            UserKey: useUserHashKey({
+                                Platform: platform,
+                                UserId: item.role_id
+                            }),
+                            IsMaster: false,
+                            IsBot: false
+                        });
+                    }
+                    return MessageMention;
                 }
             }
         }
     };
 });
 
-export { client, index as default };
+export { client, index as default, platform };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/kook",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "kook-bot",
   "author": "lemonade",
   "license": "MIT",