@alemonjs/onebot 0.2.3 → 0.2.5

package/lib/index.js

@@ -1,7 +1,11 @@
 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 ImageURLToBuffer = async (url) => {
+    const arrayBuffer = await fetch(url).then(res => res.arrayBuffer());
+    return Buffer.from(arrayBuffer);
+};
 const client = new Proxy({}, {
     get: (_, prop) => {
         if (prop in global.client) {
@@ -82,7 +86,7 @@ var index = definePlatform(() => {
             UserAvatar: UserAvatar,
             // message
             MessageId: String(event.message_id),
-            MessageText: msg,
+            MessageText: msg.trim(),
             // 用户openId
             OpenId: String(event.user_id),
             // 创建时间
@@ -143,7 +147,7 @@ var index = definePlatform(() => {
             UserAvatar: UserAvatar,
             // message
             MessageId: String(event.message_id),
-            MessageText: msg,
+            MessageText: msg.trim(),
             // 用户openId
             OpenId: String(event.user_id),
             // 创建时间
@@ -161,12 +165,11 @@ var index = definePlatform(() => {
         console.error('ERROR', event);
     });
     global.client = client;
-    createServer(client);
     const sendGroup = async (event, val) => {
         if (val.length < 0)
             return Promise.all([]);
         const content = val
-            .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+            .filter(item => item.type == 'Mention' || item.type == 'Text')
             .map(item => item.value)
             .join('');
         if (content) {
@@ -187,16 +190,28 @@ var index = definePlatform(() => {
                 });
             }));
         }
-        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
         if (images) {
-            return Promise.all(images.map(item => {
+            return Promise.all(images.map(async (item) => {
+                let data = null;
+                if (item.type === 'ImageFile') {
+                    const db = readFileSync(item.value);
+                    data = db;
+                }
+                else if (item.type === 'ImageURL') {
+                    const db = await ImageURLToBuffer(item.value);
+                    data = db;
+                }
+                else {
+                    data = item.value;
+                }
                 client.sendGroupMessage({
                     group_id: event.ChannelId,
                     message: [
                         {
                             type: 'image',
                             data: {
-                                file: `base64://${item.toString('base64')}`
+                                file: `base64://${data.toString('base64')}`
                             }
                         }
                     ]
@@ -241,16 +256,28 @@ var index = definePlatform(() => {
                 createResult(ResultCode.Fail, err?.response?.data ?? err?.message ?? err, null)
             ]);
         }
-        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+        const images = val.filter(item => item.type == 'Image' || item.type == 'ImageFile' || item.type == 'ImageURL');
         if (images) {
-            return Promise.all(images.map(item => {
+            return Promise.all(images.map(async (item) => {
+                let data = null;
+                if (item.type === 'ImageFile') {
+                    const db = readFileSync(item.value);
+                    data = db;
+                }
+                else if (item.type === 'ImageURL') {
+                    const db = await ImageURLToBuffer(item.value);
+                    data = db;
+                }
+                else {
+                    data = item.value;
+                }
                 client.sendGroupMessage({
                     group_id: event.ChannelId,
                     message: [
                         {
                             type: 'image',
                             data: {
-                                file: `base64://${item.toString('base64')}`
+                                file: `base64://${data.toString('base64')}`
                             }
                         }
                     ]

package/lib/sdk/wss.js

@@ -71,9 +71,6 @@ class OneBotClient {
                         if (this.#events['DIRECT_MESSAGE'])
                             this.#events['DIRECT_MESSAGE'](event);
                     }
-                    else {
-                        // console.info('未知消息类型', event)
-                    }
                     return;
                 }
                 else if (event?.post_type == 'notice') {

package/lib/server/index.js

@@ -31,6 +31,38 @@ const createServer = (client) => {
         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, () => {

package/package.json

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