onebots 0.4.22 → 0.4.25

package/lib/service/V11/action/index.d.ts

@@ -3,7 +3,7 @@ import { FriendAction } from "./friend";
 import { GroupAction } from "./group";
 export interface Action extends CommonAction, FriendAction, GroupAction {
 }
-declare const Action_base: import("../../../utils").Class;
+declare const Action_base: import("../../../utils").Class<any>;
 export declare class Action extends Action_base {
 }
 export {};

package/lib/service/V11/db_entities.d.ts

@@ -2,7 +2,7 @@ export declare class MsgEntry {
     id?: number;
     base64_id: string;
     seq: number;
-    user_id: number;
+    user_id: string;
     nickname: string;
     group_id: number;
     group_name: string;

package/lib/service/V11/db_entities.js

@@ -28,7 +28,7 @@ __decorate([
 ], MsgEntry.prototype, "seq", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
-    __metadata("design:type", Number)
+    __metadata("design:type", String)
 ], MsgEntry.prototype, "user_id", void 0);
 __decorate([
     (0, typeorm_1.Column)(),

package/lib/service/V11/db_sqlite.d.ts

@@ -38,7 +38,7 @@ export declare class Database {
      * @param group_id
      * @param seq
      */
-    getMsgByParams(user_id: number, group_id: number, seq: number): Promise<MsgEntry | null>;
+    getMsgByParams(user_id: string, group_id: number, seq: number): Promise<MsgEntry | null>;
     /**
      * 将一条消息标记为 recalled
      * @param base64_id

package/lib/service/V11/db_sqlite.js

@@ -96,7 +96,10 @@ class Database {
      */
     async markMsgAsRecalled(base64_id, id) {
         if (base64_id || id)
-            await this.msgRepo.update(base64_id ? { base64_id: base64_id } : { id: id }, { recalled: true, recall_time: new Date() });
+            await this.msgRepo.update(base64_id ? { base64_id: base64_id } : { id: id }, {
+                recalled: true,
+                recall_time: new Date(),
+            });
         else
             throw new Error("base64_id 或 id 参数至少一个应该被赋值");
     }
@@ -106,12 +109,7 @@ class Database {
     async shrinkDB() {
         let dt = new Date();
         dt.setDate(dt.getDate() - this.msgHistoryPreserveDays);
-        await this.msgRepo
-            .createQueryBuilder()
-            .delete()
-            .from(db_entities_1.MsgEntry)
-            .where("create_time < :dt", { dt: dt })
-            .execute();
+        await this.msgRepo.createQueryBuilder().delete().from(db_entities_1.MsgEntry).where("create_time < :dt", { dt: dt }).execute();
     }
 }
 exports.Database = Database;

package/lib/service/V11/index.d.ts

@@ -1,21 +1,20 @@
 /// <reference types="node" />
-import { Client } from "icqq";
 import { Config } from "./config";
 import { Action } from "./action";
-import { OneBot } from "../../onebot";
+import { OneBot, OneBotStatus } from "../../onebot";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
 import { Dispose } from "../../types";
 import { Database } from "./db_sqlite";
 import { Service } from "../../service";
-export declare class V11 extends Service<'V11'> implements OneBot.Base {
+import { Dict } from "@zhinjs/shared";
+export declare class V11 extends Service<"V11"> implements OneBot.Base {
     oneBot: OneBot<'V11'>;
-    client: Client;
+    config: OneBot.Config<'V11'>;
     action: Action;
-    version: string;
+    version: OneBot.Version;
     protected timestamp: number;
     protected heartbeat?: NodeJS.Timeout;
-    private path;
     db: Database;
     disposes: Dispose[];
     protected _queue: Array<{
@@ -26,15 +25,14 @@ export declare class V11 extends Service<'V11'> implements OneBot.Base {
     logger: Logger;
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
-    constructor(oneBot: OneBot<'V11'>, client: Client, config: OneBot.Config<'V11'>);
-    start(path?: string): void;
+    constructor(oneBot: OneBot<'V11'>, config: OneBot.Config<'V11'>);
+    start(): void;
     private startHttp;
     private startHttpReverse;
     private startWs;
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
     format(_: any, data: any): any;
-    system_online(data: any): void;
     dispatch(data: any): Promise<void>;
     private _formatEvent;
     private addMsgToDB;
@@ -68,20 +66,21 @@ export declare class V11 extends Service<'V11'> implements OneBot.Base {
     /**
      * 限速队列调用
      */
-    protected _runQueue(): Promise<void>;
+    _runQueue(): Promise<void>;
 }
 export declare namespace V11 {
     interface Result<T extends any> {
         retcode: number;
-        status: "ok" | 'async' | 'error';
+        status: "ok" | "async" | "error";
         data: T;
         error: string;
+        echo?: string;
     }
     function ok<T extends any>(data: T, retcode?: number, pending?: boolean): Result<T>;
     function error(error: string, retcode?: number): Result<any>;
     const defaultConfig: Config;
-    function genMetaEvent(uin: number, type: string): {
-        self_id: number;
+    function genMetaEvent(uin: string, type: string): {
+        self_id: string | number;
         time: number;
         post_type: string;
         meta_event_type: string;
@@ -98,7 +97,7 @@ export declare namespace V11 {
         enable_cors?: boolean;
         enable_reissue?: boolean;
         rate_limit_interval?: number;
-        post_message_format?: 'string' | 'array';
+        post_message_format?: "string" | "array";
         heartbeat?: number;
         secret?: string;
         reconnect_interval?: number;
@@ -107,4 +106,37 @@ export declare namespace V11 {
         http_reverse?: (string | Config.HttpReverseConfig)[];
         ws_reverse?: string[];
     }
+    type Payload<T = Dict> = {
+        [P in string | symbol]: any;
+    } & T;
+    type SelfInfo = {
+        status: OneBotStatus;
+        nickname: string;
+    };
+    interface GroupInfo {
+        group_id: number;
+        group_name: string;
+    }
+    interface UserInfo {
+        user_id: number;
+        user_name: string;
+    }
+    interface GroupMemberInfo {
+        group_id: number;
+        user_id: number;
+        user_name: string;
+    }
+    interface Message {
+    }
+    interface Segment {
+        type: string;
+        data: Dict;
+    }
+    interface MessageElement {
+        type: string;
+        data: Dict;
+    }
+    interface MessageRet {
+        message_id: number;
+    }
 }