chore: OBAPI

src/onebot/action/msg/DeleteMsg.ts

@@ -1,10 +1,7 @@
-import { NTQQMsgApi } from '@/core/apis';
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/utils/MessageUnique';
-import { sleep } from '@/common/utils/helper';
-import { NTEventDispatch } from '@/common/utils/EventTask';
 import { NodeIKernelMsgListener } from '@/core';
 
 const SchemaData = {
@@ -26,9 +23,10 @@ class DeleteMsg extends BaseAction<Payload, void> {
   actionName = ActionName.DeleteMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id));
     if (msg) {
-      let ret = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onMsgInfoListUpdate']>
+      let ret = this.CoreContext.eventWrapper.RegisterListen<NodeIKernelMsgListener['onMsgInfoListUpdate']>
         (
           'NodeIKernelMsgListener/onMsgInfoListUpdate',
           1,

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -1,5 +1,4 @@
 import BaseAction from '../BaseAction';
-import { NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { ChatType, Peer } from '@/core/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -19,6 +18,7 @@ type Payload = FromSchema<typeof SchemaData>;
 
 class ForwardSingleMsg extends BaseAction<Payload, null> {
   protected async getTargetPeer(payload: Payload): Promise<Peer> {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     if (payload.user_id) {
       const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
       if (!peerUid) {
@@ -30,7 +30,8 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
   }
 
   protected async _handle(payload: Payload): Promise<null> {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(payload.message_id);
     if (!msg) {
       throw new Error(`无法找到消息${payload.message_id}`);
     }

src/onebot/action/msg/GetMsg.ts

@@ -1,10 +1,9 @@
 import { OB11Message } from '../../types';
-import { OB11Constructor } from '../../constructor';
+import { OB11Constructor } from '../../helper/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/utils/MessageUnique';
-import { NTQQMsgApi } from '@/core';
 
 
 export type ReturnDataType = OB11Message
@@ -23,6 +22,7 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
   actionName = ActionName.GetMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     // log("history msg ids", Object.keys(msgHistory));
     if (!payload.message_id) {
       throw Error('参数message_id不能为空');

src/onebot/action/msg/MarkMsgAsRead.ts

@@ -16,6 +16,7 @@ type PlayloadType = FromSchema<typeof SchemaData>;
 
 class MarkMsgAsRead extends BaseAction<PlayloadType, null> {
   async getPeer(payload: PlayloadType): Promise<Peer> {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     if (payload.user_id) {
       const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
       if (!peerUid) {
@@ -30,6 +31,7 @@ class MarkMsgAsRead extends BaseAction<PlayloadType, null> {
     return { chatType: ChatType.group, peerUid: payload.group_id.toString() };
   }
   protected async _handle(payload: PlayloadType): Promise<null> {
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     // 调用API
     const ret = await NTQQMsgApi.setMsgRead(await this.getPeer(payload));
     if (ret.result != 0) {
@@ -65,6 +67,7 @@ export class MarkAllMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName._MarkAllMsgAsRead;
 
   protected async _handle(payload: Payload): Promise<null> {
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     await NTQQMsgApi.markallMsgAsRead();
     return null;
   }

src/onebot/action/msg/SendMsg/check-send-message.ts

@@ -1,4 +1,4 @@
-import { OB11MessageData } from '@/onebot11/types';
+import { OB11MessageData } from '@/onebot/types';
 
 function checkSendMessage(sendMsgList: OB11MessageData[]) {
   function checkUri(uri: string): boolean {

src/onebot/action/msg/SetMsgEmojiLike.ts

@@ -19,6 +19,7 @@ export class SetMsgEmojiLike extends BaseAction<Payload, any> {
   actionName = ActionName.SetMsgEmojiLike;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
     if (!msg) {
       throw new Error('msg not found');