onebots 0.4.72 → 0.4.73

package/lib/adapter.js

@@ -24,13 +24,13 @@ class Adapter extends events_1.EventEmitter {
         this.oneBots = new Map();
         _Adapter_logger.set(this, void 0);
         this.on("message.receive", (uin, ...args) => {
-            this.oneBots.get(uin)?.emit("message.receive", ...args);
+            this.getOneBot(uin).emit("message.receive", ...args);
         });
         this.on("notice.receive", (uin, ...args) => {
-            this.oneBots.get(uin)?.emit("notice.receive", ...args);
+            this.getOneBot(uin).emit("notice.receive", ...args);
         });
         this.on("request.receive", (uin, ...args) => {
-            this.oneBots.get(uin)?.emit("request.receive", ...args);
+            this.getOneBot(uin).emit("request.receive", ...args);
         });
     }
     materialize(content) {

package/lib/adapters/qq/index.js

@@ -83,36 +83,49 @@ class QQAdapter extends adapter_1.Adapter {
         return oneBot;
     }
     async sendGroupMessage(uin, version, args) {
-        const [group_id, message, source] = args;
+        let [group_id, message, source] = args;
+        if (version === "V11") {
+            const [sub_type] = group_id.split(":");
+            if (sub_type === "guild")
+                return await this.sendGuildMessage(uin, version, [
+                    group_id.slice(6),
+                    message,
+                    source,
+                ]);
+        }
         const bot = this.getOneBot(uin);
         let quote;
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendGroupMessage(group_id, message, quote);
-        if (result.msg === "success") {
-            return {
-                message_id: version === "V11"
-                    ? bot.V11.transformToInt("message_id", `group:${group_id}${result.msg_id}`)
-                    : `group:${group_id}${result.msg_id}`,
-            };
-        }
-        throw new Error(result.msg);
+        return {
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `group:${group_id}${result.id}`)
+                : `group:${group_id}${result.id}`,
+        };
     }
     async sendPrivateMessage(uin, version, args) {
-        const [user_id, message, source] = args;
+        let [user_id, message, source] = args;
+        if (version === "V11") {
+            const [sub_type, real_user_id = sub_type] = user_id.split(":");
+            if (sub_type === "direct")
+                return await this.sendDirectMessage(uin, version, [
+                    user_id.slice(7),
+                    message,
+                    source,
+                ]);
+            user_id = real_user_id;
+        }
         const bot = this.getOneBot(uin);
         let quote;
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendPrivateMessage(user_id, message, quote);
-        if (result.msg === "success") {
-            return {
-                message_id: version === "V11"
-                    ? bot.V11.transformToInt("message_id", `private:${user_id}${result.msg_id}`)
-                    : `private:${user_id}${result.msg_id}`,
-            };
-        }
-        throw new Error(result.msg);
+        return {
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `private:${user_id}${result.id}`)
+                : `private:${user_id}${result.id}`,
+        };
     }
     async sendGuildMessage(uin, version, args) {
         const [channel_id, message, source] = args;
@@ -121,14 +134,11 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendGuildMessage(channel_id, message, quote);
-        if (result.msg === "success") {
-            return {
-                message_id: version === "V11"
-                    ? bot.V11.transformToInt("message_id", `guild:${channel_id}${result.msg_id}`)
-                    : `guild:${channel_id}${result.msg_id}`,
-            };
-        }
-        throw new Error(result.msg);
+        return {
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `guild:${channel_id}${result.id}`)
+                : `guild:${channel_id}${result.id}`,
+        };
     }
     async sendDirectMessage(uin, version, args) {
         const [guild_id, message, source] = args;
@@ -137,14 +147,11 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendDirectMessage(guild_id, message, quote);
-        if (result.msg === "success") {
-            return {
-                message_id: version === "V11"
-                    ? bot.V11.transformToInt("message_id", `direct:${guild_id}${result.msg_id}`)
-                    : `direct:${guild_id}${result.msg_id}`,
-            };
-        }
-        throw new Error(result.msg);
+        return {
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `direct:${guild_id}${result.id}`)
+                : `direct:${guild_id}${result.id}`,
+        };
     }
     deleteMessage(uin, message_id) {
         const [from_type, from_id, ...msg_idArr] = message_id.split(":");
@@ -181,6 +188,12 @@ class QQAdapter extends adapter_1.Adapter {
             .map(segment => {
             if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
                 return onebot.V12.transformMedia(segment);
+            if (segment.type === "reply") {
+                if (version === "V11")
+                    segment.data.id = onebot.V11.getStrByInt("message_id", segment.data.id);
+                const [_1, _2, ...others] = (segment.data.id || "").split(":");
+                segment.data.id = others.join(":");
+            }
             return segment;
         })
             .map(item => {
@@ -227,8 +240,21 @@ class QQAdapter extends adapter_1.Adapter {
             },
             user_id: data.user_id || data.sender?.user_id,
         };
-        if (data.message_id) {
-            data.message_id = `${data.message_type}:${data.channel_id || data.guild_id || data.group_id || data.user_id}:${data.message_id}`;
+        if (result.message_id) {
+            if (result.message_type === "private") {
+                result.message_id = `${result.sub_type}:${result.guild_id || result.group_id || result.user_id}:${result.message_id}`;
+                result.user_id = `${result.sub_type}:${result.guild_id || result.group_id || result.user_id}`;
+                if (result.sender)
+                    result.sender.user_id = result.user_id;
+            }
+            else if (result.message_type === "guild") {
+                result.message_type = "group";
+                result.message_id = `guild:${result.channel_id}:${result.message_id}`;
+                result.group_id = `guild:${result.channel_id}`;
+            }
+            else {
+                result.message_id = `${result.message_type}:${result.channel_id || result.guild_id || result.group_id || result.user_id}:${result.message_id}`;
+            }
         }
         delete result.bot;
         const oneBot = this.getOneBot(uin);
@@ -238,8 +264,8 @@ class QQAdapter extends adapter_1.Adapter {
         switch (version) {
             case "V11":
                 oneBot.V11.transformStrToIntForObj(result, ["message_id", "user_id", "group_id"]);
-                oneBot.V11.transformStrToIntForObj(result.sender, ["user_id "]);
-                oneBot.V11.transformStrToIntForObj(result.self, ["user_id "]);
+                oneBot.V11.transformStrToIntForObj(result.sender, ["user_id"]);
+                oneBot.V11.transformStrToIntForObj(result.self, ["user_id"]);
                 break;
         }
         return result;

package/lib/onebot.d.ts

@@ -5,7 +5,6 @@ import { V12 } from "./service/V12";
 import { Adapter } from "./adapter";
 import { Service } from "./service";
 import { Logger } from "log4js";
-import { App } from "./server/app";
 export declare class NotFoundError extends Error {
     message: string;
 }
@@ -21,7 +20,7 @@ export declare class OneBot<T = any> extends EventEmitter {
     protected password: string;
     internal: T;
     instances: (V11 | V12)[];
-    get app(): App;
+    get app(): import(".").App;
     get V11(): V11;
     get V12(): V12;
     get platform(): string;

package/lib/server/app.js

@@ -318,18 +318,15 @@ function createOnebots(config = "config.yaml", cp = null) {
     }
     if (!(0, fs_1.existsSync)(App.configDir))
         (0, fs_1.mkdirSync)(App.configDir);
-    if (!(0, fs_1.existsSync)(App.configPath)) {
-        if (isStartWithConfigFile) {
-            (0, fs_1.copyFileSync)(path.resolve(__dirname, "../config.sample.yaml"), App.configPath);
-            console.log("未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动");
-            console.log(`配置文件在:  ${App.configPath}`);
-            process_1.default.exit();
-        }
-        else {
-            (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump(config));
-            console.log(`已自动保存配置到：${App.configPath}`);
-            console.log(`配置文件在:  `);
-        }
+    if (!(0, fs_1.existsSync)(App.configPath) && isStartWithConfigFile) {
+        (0, fs_1.copyFileSync)(path.resolve(__dirname, "../config.sample.yaml"), App.configPath);
+        console.log("未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动");
+        console.log(`配置文件在:  ${App.configPath}`);
+        process_1.default.exit();
+    }
+    if (!isStartWithConfigFile) {
+        (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump(config));
+        console.log(`已自动保存配置到：${App.configPath}`);
     }
     if (!(0, fs_1.existsSync)(App.dataDir)) {
         (0, fs_1.mkdirSync)(App.dataDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.72",
+  "version": "0.4.73",
   "description": "基于icqq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {
@@ -93,4 +93,4 @@
     "reflect-metadata": "^0.1.13",
     "ws": "^8.16.0"
   }
-}
+}