@karinjs/adapter-qqbot 1.2.6 → 1.2.8

package/lib/core/api.js

@@ -41,7 +41,7 @@ export class QQBotApi extends EventEmitter {
         this.wssUrl = '';
         this.heartbeat = { op: 1, d: null, session_id: '' };
         this.heartbeat_interval = 0;
-        // 后续处理 重启后重新建立历史会话
+        // todo: 后续处理 重启后重新建立历史会话
     }
     logger(level, ...args) {
         logger.bot(level, this.appId, ...args);
@@ -112,7 +112,7 @@ export class QQBotApi extends EventEmitter {
                 shard: [0, 1],
                 properties: {
                     $os: 'Linux',
-                    $browser: 'karin-plugin-adapter-qqbot',
+                    $browser: '@karinjs/adapter-qqbot',
                     $device: 'karin',
                 },
             },

package/lib/core/index.d.ts

@@ -1,7 +1,7 @@
 import { QQBotApi } from './api.js';
 import { PathType, C2CMessageCreateEvent, GroupAtMessageCreateEvent } from '../types/index.js';
 import { GlobalCfgType, AccountCfgType } from '../utils/index.js';
-import { Contact, LoggerLevel, ReplyReturn, KarinAdapter, KarinElement } from 'node-karin';
+import { Contact, LoggerLevel, ReplyReturn, KarinMessage, KarinAdapter, KarinElement } from 'node-karin';
 /**
  * - QQBot适配器
  */
@@ -15,7 +15,7 @@ export declare class AdapterQQBot implements KarinAdapter {
     markdown: GlobalCfgType;
     constructor(config: AccountCfgType);
     init(): Promise<void>;
-    _sendNsg(elements: Array<KarinElement>, type: PathType, openid: string, message_id?: string): Promise<ReplyReturn>;
+    _sendNsg(e: KarinMessage, elements: Array<KarinElement>, type: PathType, openid: string, message_id?: string): Promise<ReplyReturn>;
     get self_id(): string;
     logger(level: LoggerLevel, ...args: any[]): void;
     GetVersion(): Promise<{

package/lib/core/index.js

@@ -1,7 +1,7 @@
 import { QQBotApi } from './api.js';
 import { markdownTemplate, markdownRaw } from './markdown.js';
 import { common, common as Common, config as Config, } from '../utils/index.js';
-import { logger, karin, segment, KarinMessage, } from 'node-karin';
+import { logger, karin, segment, KarinMessage, button, } from 'node-karin';
 /**
  * - QQBot适配器
  */
@@ -25,12 +25,20 @@ export class AdapterQQBot {
         switch (this.markdown.sendMode) {
             /** 原生 */
             case 1: {
-                this._sendNsg = async (elements, type, openid, message_id) => await markdownRaw({ bot: this, data: elements, type, openid, message_id });
+                this._sendNsg = async (e, elements, type, openid, message_id) => {
+                    const list = await button(e.msg, e);
+                    elements.push(...list);
+                    return await markdownRaw({ bot: this, data: elements, type, openid, message_id });
+                };
                 return;
             }
             /** 旧图文模板 */
             case 3: {
-                this._sendNsg = async (elements, type, openid, message_id) => await markdownTemplate({ bot: this, data: elements, type, openid, message_id });
+                this._sendNsg = async (e, elements, type, openid, message_id) => {
+                    const list = await button(e.msg, e);
+                    elements.push(...list);
+                    return await markdownTemplate({ bot: this, data: elements, type, openid, message_id });
+                };
                 return;
             }
             /** 纯文 现已不能申请 */
@@ -78,7 +86,7 @@ export class AdapterQQBot {
             };
             const e = new KarinMessage(message);
             e.bot = this;
-            e.replyCallback = async (elements) => await this._sendNsg(elements, "groups" /* PathType.Groups */, e.contact.peer, e.message_id);
+            e.replyCallback = async (elements) => await this._sendNsg(e, elements, "groups" /* PathType.Groups */, e.contact.peer, e.message_id);
             karin.emit('adapter.message', e);
         });
         this.super.on("C2C_MESSAGE_CREATE" /* QQBotEventType.C2C_MESSAGE_CREATE */, (data) => {
@@ -111,7 +119,7 @@ export class AdapterQQBot {
             };
             const e = new KarinMessage(message);
             e.bot = this;
-            e.replyCallback = async (elements) => await this._sendNsg(elements, "users" /* PathType.Friends */, e.contact.peer, e.message_id);
+            e.replyCallback = async (elements) => await this._sendNsg(e, elements, "users" /* PathType.Friends */, e.contact.peer, e.message_id);
             karin.emit('adapter.message', e);
         });
         /** 等待建立连接 注册Bot */
@@ -124,7 +132,7 @@ export class AdapterQQBot {
                 this.adapter.index = index;
         });
     }
-    async _sendNsg(elements, type, openid, message_id) {
+    async _sendNsg(e, elements, type, openid, message_id) {
         return await this.KarinConvertAdapter(elements, type, openid, message_id);
     }
     get self_id() {

package/package.json

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