onebots 0.4.25 → 0.4.26

package/lib/adapters/qq/bot.d.ts

@@ -1,7 +1,6 @@
 import type { QQAdapter } from "../../adapters/qq";
 import { AxiosInstance } from "axios";
 import { WebSocket } from "ws";
-import { SessionManager } from "../../adapters/qq/sessionManager";
 import { OneBot } from "../../onebot";
 import { QQBot } from "../../adapters/qq/qqBot";
 export declare class Bot extends QQBot {
@@ -12,7 +11,6 @@ export declare class Bot extends QQBot {
     nickname: string;
     status: number;
     ws: WebSocket;
-    sessionManager: SessionManager;
     constructor(oneBot: OneBot, appId: string, config: QQAdapter.Config['protocol']);
     init(): Promise<void>;
     stop(): void;

package/lib/adapters/qq/index.js

@@ -106,7 +106,7 @@ class QQAdapter extends adapter_1.Adapter {
     }
     toCqcode(version, messageArr) {
         return [].concat(messageArr).map(item => {
-            const dataStr = Object.entries(item.data).map(([key, value]) => {
+            const dataStr = Object.entries(item).filter(([key]) => key !== 'type').map(([key, value]) => {
                 // is Buffer
                 if (value instanceof Buffer)
                     return `${key}=${value.toString('base64')}`;
@@ -117,13 +117,13 @@ class QQAdapter extends adapter_1.Adapter {
                 if (value instanceof Array)
                     return `${key}=${value.map(v => JSON.stringify(v)).join(',')}`;
                 // is String
-                return `${key}=${item.data[key]}`;
+                return `${key}=${item[key]}`;
             });
             return `[CQ:${item.type},${dataStr.join(',')}]`;
         }).join('');
     }
     formatEventPayload(version, event, data) {
-        return {
+        const result = {
             id: data.id,
             type: event,
             version: version,
@@ -135,6 +135,8 @@ class QQAdapter extends adapter_1.Adapter {
             platform: 'qq',
             ...data,
         };
+        delete data.bot;
+        return result;
     }
     async start(uin) {
         const startOneBots = [...this.oneBots.values()].filter(oneBot => {

package/lib/adapters/qq/message.d.ts

@@ -5,11 +5,12 @@ import { Bot } from "./bot";
 export declare class Message {
     bot: Bot;
     sub_type: Message.SubType;
-    get self_id(): string;
+    self_id: string;
     guild_id?: string;
     channel_id?: string;
     group_id?: string;
     message_id: string;
+    seq: number;
     sender: Message.Sender;
     user_id: string;
     constructor(bot: Bot, attrs: Partial<Message>);

package/lib/adapters/qq/message.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildMessageEvent = exports.DirectMessageEvent = exports.GroupMessageEvent = exports.PrivateMessageEvent = exports.Message = void 0;
-const qqBot_1 = require("./qqBot");
 const utils_1 = require("./utils");
 const crypto_1 = require("crypto");
+const bot_1 = require("./bot");
 class Message {
-    get self_id() {
-        return this.bot.self_id;
-    }
     constructor(bot, attrs) {
         this.bot = bot;
         Object.assign(this, attrs);
+        this.self_id = bot.self_id;
+        this.seq = attrs.seq || (0, crypto_1.randomInt)(1000000);
     }
     get [Symbol.unscopables]() {
         return {
@@ -20,7 +19,8 @@ class Message {
     toJSON() {
         return Object.fromEntries(Object.keys(this)
             .filter(key => {
-            return typeof this[key] !== "function" && !(this[key] instanceof qqBot_1.QQBot);
+            console.log(key, typeof this[key]);
+            return typeof this[key] !== "function" && !(this[key] instanceof bot_1.Bot);
         })
             .map(key => [key, this[key]]));
     }

package/lib/adapters/qq/qqBot.js

@@ -88,7 +88,9 @@ class QQBot extends events_1.EventEmitter {
                 raw_message: brief,
                 sender: {
                     user_id: payload.author?.id,
-                    user_openid: payload.author?.user_openid || payload.author?.member_openid
+                    nickname: payload.author?.name || '',
+                    user_openid: payload.author?.user_openid || payload.author?.member_openid,
+                    ...(payload.author || {})
                 },
                 timestamp: new Date(payload.timestamp).getTime() / 1000,
             });

package/lib/config.sample.yaml

@@ -40,5 +40,17 @@ qq.a: # `${适配器名称}:${账号}`
     - version: V11
   # 。。。其他配置项参见上方对应oneBot版本的通用配置
   protocol: # 将会覆盖通用配置中的protocol
-    platform: 1
+    token: '' # qq机器人token
+    secret: '' # qq机器人secret
+    sandbox: false # 是否沙箱环境
+    intents: # 需要监听的intents
+      - 'GROUP_AT_MESSAGE_CREATE' # 群聊@事件 没有群聊权限请注释
+      - 'C2C_MESSAGE_CREATE' # 私聊事件 没有私聊权限请注释
+      - 'DIRECT_MESSAGE' # 频道私信事件
+      #     - 'GUILD_MESSAGES' # 私域机器人频道消息事件，公域机器人请注释
+      - 'GUILDS' # 频道变更事件
+      - 'GUILD_MEMBERS' # 频道成员变更事件
+      - 'GUILD_MESSAGE_REACTIONS' # 频道消息表态事件
+      - 'INTERACTION' # 互动事件
+      - 'PUBLIC_GUILD_MESSAGES' # 公域机器人频道消息事件，私域机器人请注释
   # 。。。其他配置项参见上方对应oneBot版本的通用配置

package/lib/service/V11/index.js

@@ -314,6 +314,7 @@ class V11 extends service_1.Service {
             return JSON.stringify(data1);
         }
         else {
+            delete data.bot;
             return JSON.stringify(data);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.25",
+    "version": "0.4.26",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"