@alemonjs/onebot 0.2.4 → 0.2.6

package/lib/index.js

@@ -1,8 +1,9 @@
 import { getConfigValue, useUserHashKey, onProcessor, createResult, ResultCode } from 'alemonjs';
 import { OneBotClient } from './sdk/wss.js';
-import { createServer } from './server/index.js';
 import { readFileSync } from 'fs';
 
+const MyBot = {
+    id: ''};
 const ImageURLToBuffer = async (url) => {
     const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
     return Buffer.from(arrayBuffer);
@@ -36,11 +37,11 @@ var index = definePlatform(() => {
     client.connect();
     client.on('META', event => {
         if (event?.self_id) {
-            String(event.self_id);
+            MyBot.id = String(event.self_id);
         }
     });
     client.on('MESSAGES', event => {
-        const uis = config.master_uids ?? [];
+        const uis = config?.master_id ?? [];
         let msg = '';
         const arr = [];
         for (const item of event.message) {
@@ -100,8 +101,8 @@ var index = definePlatform(() => {
         // 处理消息
         onProcessor('message.create', e, event);
     });
-    client.on('DIRECT_MESSAGE', (event) => {
-        const uis = config.master_uids ?? [];
+    client.on('DIRECT_MESSAGE', event => {
+        const uis = config?.master_id ?? [];
         let msg = '';
         const arr = [];
         for (const item of event.message) {
@@ -166,7 +167,6 @@ var index = definePlatform(() => {
         console.error('ERROR', event);
     });
     global.client = client;
-    createServer(client);
     const sendGroup = async (event, val) => {
         if (val.length < 0)
             return Promise.all([]);
@@ -318,8 +318,49 @@ var index = definePlatform(() => {
                     }
                     return Promise.all([]);
                 },
-                mention: async () => {
-                    return [];
+                mention: async (event) => {
+                    const uis = config?.master_id ?? [];
+                    const e = event.value;
+                    if (e?.type == 'message.create' || e?.type == 'private.message.create') {
+                        const Metions = [];
+                        for (const item of e.message) {
+                            if (item.type == 'at') {
+                                let isBot = false;
+                                if (item.data.qq == 'all') {
+                                    continue;
+                                }
+                                if (item.data.qq == MyBot.id) {
+                                    isBot = true;
+                                }
+                                const avatar = `https://q1.qlogo.cn/g?b=qq&s=0&nk=${item.data.qq}`;
+                                Metions.push({
+                                    UserId: item.data.qq,
+                                    UserKey: useUserHashKey({
+                                        Platform: platform,
+                                        UserId: item.data.qq
+                                    }),
+                                    UserName: item.data?.nickname,
+                                    UserAvatar: {
+                                        toBuffer: async () => {
+                                            const arrayBuffer = await fetch(avatar).then(res => res.arrayBuffer());
+                                            return Buffer.from(arrayBuffer);
+                                        },
+                                        toBase64: async () => {
+                                            const arrayBuffer = await fetch(avatar).then(res => res.arrayBuffer());
+                                            return Buffer.from(arrayBuffer).toString('base64');
+                                        },
+                                        toURL: async () => {
+                                            return avatar;
+                                        }
+                                    },
+                                    IsMaster: uis.includes(item.data.qq),
+                                    IsBot: isBot
+                                });
+                            }
+                        }
+                        return;
+                    }
+                    return Promise.all([]);
                 }
             }
         }

package/lib/sdk/wss.js

@@ -98,7 +98,9 @@ class OneBotClient {
                     }
                     return;
                 }
-                else if (event?.echo === 'get_friend_list' || event?.echo === 'get_group_list' || event?.echo === 'get_group_member_list') {
+                else if (event?.echo === 'get_friend_list' ||
+                    event?.echo === 'get_group_list' ||
+                    event?.echo === 'get_group_member_list') {
                     // 处理获取好友列表和群列表的响应
                     // if (this.#events['META']) this.#events['META'](event)
                     // console.debug('响应', event)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/onebot",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "onebot",
   "author": "lemonade",
   "license": "MIT",

package/lib/server/index.js

@@ -1,73 +0,0 @@
-import Koa from 'koa';
-import Router from 'koa-router';
-
-// 使用koa + router 写 hello world
-const createServer = (client) => {
-    const app = new Koa();
-    const router = new Router();
-    const port = 8080; // 端口号
-    // 检测
-    router.get('/', (ctx) => {
-        ctx.body = 'Hello, World!';
-    });
-    // 获取群列表
-    router.get('/get_group_list', async (ctx) => {
-        client.getGroupList();
-        ctx.body = 'Hello, World!';
-    });
-    // 获取好友列表
-    router.get('/get_friend_list', async (ctx) => {
-        client.getFriendList();
-        ctx.body = 'Hello, World!';
-    });
-    // 获取群成员列表
-    router.get('/get_group_member_list', async (ctx) => {
-        const group_id = ctx.query.group_id;
-        if (!group_id) {
-            ctx.status = 400;
-            ctx.body = 'group_id is required';
-            return;
-        }
-        client.getGroupMemberList({ group_id: Number(group_id) });
-        ctx.body = 'Hello, World!';
-    });
-    // 同意加群
-    router.get('/set_group_add_request', async (ctx) => {
-        const flag = ctx.query.flag;
-        const sub_type = ctx.query.sub_type;
-        const approve = ctx.query.approve;
-        if (!flag || !sub_type || !approve) {
-            ctx.status = 400;
-            ctx.body = 'flag, sub_type and approve are required';
-            return;
-        }
-        client.setGroupAddRequest({
-            flag: String(flag),
-            sub_type: String(sub_type),
-            approve: Boolean(approve),
-        });
-        ctx.body = 'Hello, World!';
-    });
-    // 同意加好友
-    router.get('/set_friend_add_request', async (ctx) => {
-        const flag = ctx.query.flag;
-        const approve = ctx.query.approve;
-        if (!flag || !approve) {
-            ctx.status = 400;
-            ctx.body = 'flag and approve are required';
-            return;
-        }
-        client.setFriendAddRequest({
-            flag: String(flag),
-            approve: Boolean(approve),
-        });
-        ctx.body = 'Hello, World!';
-    });
-    app.use(router.routes());
-    app.use(router.allowedMethods());
-    app.listen(port, () => {
-        console.log(`Server is running at http://localhost:${port}`);
-    });
-};
-
-export { createServer };