@karinjs/adapter-qqbot 1.2.7 → 1.2.9

package/lib/core/api.d.ts

@@ -52,6 +52,12 @@ export declare class QQBotApi extends EventEmitter {
      * @param options 请求参数
      */
     post(url: string, options: any): Promise<import("got").Response<string> | undefined>;
+    /**
+     * delete请求
+     * @param url 请求地址
+     * @param options 请求参数
+     */
+    delete(url: string): Promise<import("got").Response<string> | undefined>;
     /**
      * 获取调用凭证
      * @param clientSecret 开发者的Secret
@@ -103,6 +109,13 @@ export declare class QQBotApi extends EventEmitter {
      * @param options 请求参数
      */
     sendMessage(openid: string, type: PathType, options: SendMessageOptions): Promise<SendMessageResponse>;
+    /**
+     * 撤回消息
+     * @param openid 用户、群openid
+     * @param type 请求路径类型
+     * @param message_id 消息id
+     */
+    recallMessage(openid: string, type: PathType, message_id: string): Promise<boolean>;
     /**
      * 构建发送文本消息请求参数
      */
@@ -133,10 +146,11 @@ export declare class QQBotApi extends EventEmitter {
     /**
      * 构建发送富媒体请求参数
      * 富媒体消息只能单独发送 并且必须进行上传
+     * @param content 附带的文字信息，仅在file_type为1时有效，其余情况请传空字符串
      * @param file_info 富媒体接口返回的file_info
      * @param id 消息id或者事件id
      */
-    buildMedia(file_info: string, id?: string, seq?: number): SendMessageOptions;
+    buildMedia(content: string, file_info: string, id?: string, seq?: number): SendMessageOptions;
     /**
      * 构建发送Markdown模板请求参数
      * @param custom_template_id 模板id

package/lib/core/api.js

@@ -59,6 +59,19 @@ export class QQBotApi extends EventEmitter {
             logger.error(`[got] 请求错误: ${JSON.stringify(error.response.body)}`);
         }
     }
+    /**
+     * delete请求
+     * @param url 请求地址
+     * @param options 请求参数
+     */
+    async delete(url) {
+        try {
+            return await got.delete(url, { headers: this.headers });
+        }
+        catch (error) {
+            logger.error(`[got] 请求错误: ${JSON.stringify(error.response.body)}`);
+        }
+    }
     /**
      * 获取调用凭证
      * @param clientSecret 开发者的Secret
@@ -280,6 +293,17 @@ export class QQBotApi extends EventEmitter {
         const result = await this.post(url, options);
         return JSON.parse(result.body);
     }
+    /**
+     * 撤回消息
+     * @param openid 用户、群openid
+     * @param type 请求路径类型
+     * @param message_id 消息id
+     */
+    async recallMessage(openid, type, message_id) {
+        const url = this.buildUrl(openid, type, "messages" /* V2ApiType.Message */);
+        const result = await this.delete(`${url}/${message_id}`);
+        return result.status === 200;
+    }
     /**
      * 构建发送文本消息请求参数
      */
@@ -332,12 +356,13 @@ export class QQBotApi extends EventEmitter {
     /**
      * 构建发送富媒体请求参数
      * 富媒体消息只能单独发送 并且必须进行上传
+     * @param content 附带的文字信息，仅在file_type为1时有效，其余情况请传空字符串
      * @param file_info 富媒体接口返回的file_info
      * @param id 消息id或者事件id
      */
-    buildMedia(file_info, id, seq) {
+    buildMedia(content, file_info, id, seq) {
         const options = {
-            content: '',
+            content,
             msg_type: 7 /* MessageType.Media */,
             media: {
                 file_info,

package/lib/core/index.d.ts

@@ -33,9 +33,7 @@ export declare class AdapterQQBot implements KarinAdapter {
      * @param data karin格式消息
      * */
     KarinConvertAdapter(data: Array<KarinElement>, type: PathType, openid: string, message_id?: string): Promise<ReplyReturn>;
-    SendMessage(_contact: Contact, elements: Array<KarinElement>): Promise<{
-        message_id: string;
-    }>;
+    SendMessage(contact: Contact, elements: Array<KarinElement>): Promise<ReplyReturn>;
     getAvatarUrl(user_id: string, size?: number): string;
     getGroupAvatarUrl(): string;
     GetCurrentAccount(): Promise<{
@@ -43,6 +41,7 @@ export declare class AdapterQQBot implements KarinAdapter {
         account_uin: string;
         account_name: string;
     }>;
+    RecallMessage(contact: Contact, message_id: string): Promise<boolean>;
     GetEssenceMessageList(): Promise<any>;
     DownloadForwardMessage(): Promise<any>;
     SetEssenceMessage(): Promise<any>;
@@ -56,7 +55,6 @@ export declare class AdapterQQBot implements KarinAdapter {
     UploadForwardMessage(): Promise<any>;
     sendForwardMessage(): Promise<any>;
     SendMessageByResId(): Promise<any>;
-    RecallMessage(): Promise<any>;
     GetMessage(): Promise<any>;
     GetHistoryMessage(): Promise<any>;
     VoteUser(): Promise<any>;

package/lib/core/index.js

@@ -19,14 +19,14 @@ export class AdapterQQBot {
         const { appId, secret, ...restConfig } = this.#config;
         this.markdown = restConfig;
         this.account = { uid: appId, uin: appId, name: '' };
-        this.adapter = { id: 'QQ', name: 'QQBot', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
+        this.adapter = { id: 'QQBot', name: 'QQBot', type: 'internal', sub_type: 'internal', start_time: Date.now(), connect: '', index: 0 };
         this.version = { name: 'QQBot', app_name: 'QQBot', version: Config.package.version };
         this.super = new QQBotApi(this.#config);
         switch (this.markdown.sendMode) {
             /** 原生 */
             case 1: {
                 this._sendNsg = async (e, elements, type, openid, message_id) => {
-                    const list = await button(e.msg);
+                    const list = await button(e.msg, e);
                     elements.push(...list);
                     return await markdownRaw({ bot: this, data: elements, type, openid, message_id });
                 };
@@ -35,7 +35,7 @@ export class AdapterQQBot {
             /** 旧图文模板 */
             case 3: {
                 this._sendNsg = async (e, elements, type, openid, message_id) => {
-                    const list = await button(e.msg);
+                    const list = await button(e.msg, e);
                     elements.push(...list);
                     return await markdownTemplate({ bot: this, data: elements, type, openid, message_id });
                 };
@@ -79,7 +79,7 @@ export class AdapterQQBot {
                 contact: {
                     scene: "group" /* Scene.Group */,
                     peer: group_id,
-                    sub_peer: '',
+                    sub_peer: null,
                 },
                 group_id,
                 raw_message: '',
@@ -112,7 +112,7 @@ export class AdapterQQBot {
                 contact: {
                     scene: "friend" /* Scene.Private */,
                     peer: user_id,
-                    sub_peer: '',
+                    sub_peer: null,
                 },
                 group_id: '',
                 raw_message: '',
@@ -187,6 +187,8 @@ export class AdapterQQBot {
      * */
     async KarinConvertAdapter(data, type, openid, message_id) {
         let seq = common.random(1, 999999);
+        /** 待排版的原始消息队列 */
+        let msg = [];
         /** 待发送列表 */
         const send_list = [];
         /** 采用并发上传 */
@@ -195,10 +197,10 @@ export class AdapterQQBot {
             switch (i.type) {
                 case 'text': {
                     const qr = await Common.getQQBotText(i.text);
-                    results.push({ index, options: this.super.buildText(qr.text, message_id, ++seq) });
+                    results.push({ index, type: i.type, content: qr.text });
                     if (qr.data) {
                         const { file_info } = await this.super.uploadMedia(openid, type, qr.data.base64, 1 /* FileType.Image */);
-                        results.push({ index, options: this.super.buildMedia(file_info, message_id, ++seq) });
+                        results.push({ index, type: 'image', content: file_info });
                     }
                     break;
                 }
@@ -211,7 +213,7 @@ export class AdapterQQBot {
                     /** 上传 */
                     const { file_info } = await this.super.uploadMedia(openid, type, file, 3 /* FileType.Record */);
                     /** 构建发送参数 */
-                    results.push({ index, options: this.super.buildMedia(file_info, message_id, ++seq) });
+                    results.push({ index, type: i.type, content: file_info });
                     break;
                 }
                 case 'image':
@@ -225,7 +227,7 @@ export class AdapterQQBot {
                     /** 上传 */
                     const { file_info } = await this.super.uploadMedia(openid, type, i.file, map[i.type]);
                     /** 构建发送参数 */
-                    results.push({ index, options: this.super.buildMedia(file_info, message_id, ++seq) });
+                    results.push({ index, type: i.type, content: file_info });
                     break;
                 }
                 // 不支持的消息类型
@@ -235,8 +237,30 @@ export class AdapterQQBot {
             return results;
         })).then((allResults) => {
             allResults.flat().sort((a, b) => a.index - b.index).forEach(result => {
-                send_list.push(result.options);
+                switch (result.type) {
+                    case 'text': {
+                        msg.push(result.content);
+                        break;
+                    }
+                    case 'image': {
+                        const content = msg.length ? msg.join('') : '';
+                        msg = [];
+                        send_list.push(this.super.buildMedia(content, result.content, message_id, seq++));
+                        break;
+                    }
+                    default: {
+                        if (msg.length) {
+                            send_list.push(this.super.buildText(msg.join(''), message_id, seq++));
+                            msg = [];
+                        }
+                        send_list.push(this.super.buildMedia('', result.content, message_id, seq++));
+                        break;
+                    }
+                }
             });
+            if (msg.length) {
+                send_list.push(this.super.buildText(msg.join(''), message_id, seq++));
+            }
         });
         const result = {
             message_id: '',
@@ -253,28 +277,8 @@ export class AdapterQQBot {
         result.message_time = result.raw_data[0].time;
         return result;
     }
-    async SendMessage(_contact, elements) {
-        const text = [];
-        for (const v of elements) {
-            switch (v.type) {
-                case 'at':
-                    text.push(`@${v.uid}`);
-                    break;
-                case 'face':
-                    text.push(`[表情:${v.id}]`);
-                    break;
-                case 'text':
-                    text.push(v.text);
-                    break;
-                case 'image':
-                    // text.push(await this.#MsgToFile(v.type, v.file))
-                    break;
-                default:
-                    text.push(`[未知消息类型:${JSON.stringify(v)}]`);
-            }
-        }
-        this.logger('info', `${logger.green('Send private input: ')}${text.join('')}`);
-        return { message_id: 'input' };
+    async SendMessage(contact, elements) {
+        return await this.KarinConvertAdapter(elements, contact.scene === 'group' ? "groups" /* PathType.Groups */ : "users" /* PathType.Friends */, contact.peer);
     }
     getAvatarUrl(user_id, size = 0) {
         if (user_id === this.account.uid)
@@ -285,7 +289,10 @@ export class AdapterQQBot {
         return 'https://p.qlogo.cn/gh/967068507/967068507/0';
     }
     async GetCurrentAccount() {
-        return { account_uid: 'input', account_uin: 'input', account_name: 'input' };
+        return { account_uid: this.account.uid, account_uin: this.account.uin, account_name: this.account.name };
+    }
+    async RecallMessage(contact, message_id) {
+        return await this.super.recallMessage(contact.peer, contact.scene === 'group' ? "groups" /* PathType.Groups */ : "users" /* PathType.Friends */, message_id);
     }
     async GetEssenceMessageList() { throw new Error('Method not implemented.'); }
     async DownloadForwardMessage() { throw new Error('Method not implemented.'); }
@@ -300,7 +307,6 @@ export class AdapterQQBot {
     async UploadForwardMessage() { throw new Error('Method not implemented.'); }
     async sendForwardMessage() { throw new Error('Method not implemented.'); }
     async SendMessageByResId() { throw new Error('Method not implemented.'); }
-    async RecallMessage() { throw new Error('Method not implemented.'); }
     async GetMessage() { throw new Error('Method not implemented.'); }
     async GetHistoryMessage() { throw new Error('Method not implemented.'); }
     async VoteUser() { throw new Error('Method not implemented.'); }

package/lib/core/markdown.js

@@ -39,7 +39,7 @@ export async function markdownTemplate(Opt) {
     const mediaFn = async (file, type, name, FileType) => {
         const { url } = await handler.call('qqbot.files', { file, type, name });
         const { file_info } = await bot.super.uploadMedia(openid, type, url, FileType);
-        const opt = bot.super.buildMedia(file_info, message_id, ++seq);
+        const opt = bot.super.buildMedia('', file_info, message_id, ++seq);
         const res = await bot.super.sendMessage(openid, type, opt);
         result.raw_data.push(res);
     };
@@ -173,7 +173,7 @@ export async function markdownRaw(Opt) {
     const mediaFn = async (file, type, name, FileType) => {
         const { url } = await handler.call('qqbot.files', { file, type, name });
         const { file_info } = await bot.super.uploadMedia(openid, type, url, FileType);
-        const opt = bot.super.buildMedia(file_info, message_id, ++seq);
+        const opt = bot.super.buildMedia('', file_info, message_id, ++seq);
         const res = await bot.super.sendMessage(openid, type, opt);
         result.raw_data.push(res);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/adapter-qqbot",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "author": "shijin",
   "type": "module",
   "description": "karin plugin template",