chore: obApi

src/onebot/action/extends/GetFriendWithCategory.ts

@@ -1,17 +1,15 @@
-import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
+
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { BuddyCategoryType } from '@/core/entities/';
-import { NTQQFriendApi } from '@/core';
-import { OB11Constructor } from '@/onebot11/constructor';
+import { OB11Constructor } from '@/onebot/helper/constructor';
 
 export class GetFriendWithCategory extends BaseAction<void, any> {
   actionName = ActionName.GetFriendsWithCategory;
 
   protected async _handle(payload: void) {
-    if (requireMinNTQQBuild('26702')) {
+    if (this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
       //全新逻辑
-      return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2ExWithCate(true));
+      return OB11Constructor.friendsV2(await this.CoreContext.getApiContext().FriendApi.getBuddyV2ExWithCate(true));
     } else {
       throw new Error('this ntqq version not support, must be 26702 or later');
     }

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -1,7 +1,5 @@
-import { GroupNotify, GroupNotifyStatus } from '@/core/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis/user';
 import { NTQQGroupApi } from '@/core/apis/group';
 
 interface OB11GroupRequestNotify {
@@ -14,7 +12,7 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
   actionName = ActionName.GetGroupIgnoreAddRequest;
 
   protected async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-    const data = await NTQQGroupApi.getGroupIgnoreNotifies();
+    const data = await this.CoreContext.getApiContext().GroupApi.getGroupIgnoreNotifies();
     // log(data);
     // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
     // const returnData: OB11GroupRequestNotify[] = [];

src/onebot/action/extends/GetProfileLike.ts

@@ -1,12 +1,10 @@
-import { selfInfo } from '@/core/data';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis';
-
 export class GetProfileLike extends BaseAction<void, any> {
   actionName = ActionName.GetProfileLike;
   protected async _handle(payload: void) {
-    const ret = await NTQQUserApi.getProfileLike(selfInfo.uid);
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const ret = await NTQQUserApi.getProfileLike(this.CoreContext.selfInfo.uid);
     const listdata: any[] = ret.info.userLikeInfos[0].favoriteInfo.userInfos;
     for (let i = 0; i < listdata.length; i++) {
       listdata[i].uin = parseInt((await NTQQUserApi.getUinByUid(listdata[i].uid)) || '');

src/onebot/action/extends/GetRobotUinRange.ts

@@ -6,6 +6,7 @@ export class GetRobotUinRange extends BaseAction<void, Array<any>> {
 
   protected async _handle(payload: void) {
     // console.log(await NTQQUserApi.getRobotUinRange());
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     return await NTQQUserApi.getRobotUinRange();
   }
 }

src/onebot/action/extends/SetGroupHeader.ts

@@ -3,7 +3,6 @@ import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
 import { NTQQUserApi } from '@/core/apis/user';
 import { checkFileReceived, uri2local } from '@/common/utils/file';
-import { NTQQGroupApi } from '@/core';
 // import { log } from "../../../common/utils";
 
 interface Payload {
@@ -26,6 +25,7 @@ export default class SetGroupHeader extends BaseAction<Payload, any> {
     };
   }
   protected async _handle(payload: Payload): Promise<any> {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     const { path, isLocal, errMsg,success } = (await uri2local(payload.file));
     if (!success) {
       throw `头像${payload.file}设置失败,file字段可能格式不正确`;

src/onebot/action/extends/SetLongNick.ts

@@ -18,6 +18,7 @@ export class SetLongNick extends BaseAction<Payload, any> {
   actionName = ActionName.SetLongNick;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     const ret = await NTQQUserApi.setLongNick(payload.longNick);
     return ret;
   }

src/onebot/action/extends/SetOnlineStatus.ts

@@ -26,6 +26,7 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
     // { status: 50, extStatus: 0, batteryStatus: 0 }
     // { status: 60, extStatus: 0, batteryStatus: 0 }
     // { status: 70, extStatus: 0, batteryStatus: 0 }
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus);
     if (ret.result !== 0) {
       throw new Error('设置在线状态失败');

src/onebot/action/extends/SetQQAvatar.ts

@@ -24,6 +24,7 @@ export default class SetAvatar extends BaseAction<Payload, null> {
     };
   }
   protected async _handle(payload: Payload): Promise<null> {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     const { path, isLocal, errMsg,success } = (await uri2local(payload.file));
     if (!success) {
       throw `头像${payload.file}设置失败,file字段可能格式不正确`;

src/onebot/action/extends/SetSelfProfile.ts

@@ -20,6 +20,7 @@ export class SetSelfProfile extends BaseAction<Payload, any | null> {
   actionName = ActionName.SetSelfProfile;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
     const ret = await NTQQUserApi.modifySelfProfile({
       nick: payload.nick,
       longNick: payload.longNick,

src/onebot/action/extends/TestApi01.ts

@@ -1,28 +0,0 @@
-import BaseAction from '../BaseAction';
-import { ActionName, BaseCheckResult } from '../types';
-import { napCatCore, NTQQGroupApi } from '@/core';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
-const SchemaData = {
-  type: 'object',
-  properties: {
-    cmd: { type: 'string' },
-    param: { type: 'string' }
-  },
-  required: ['cmd', 'param'],
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export default class TestApi01 extends BaseAction<Payload, any> {
-  actionName = ActionName.TestApi01;
-  // 用不着复杂检测
-  protected async check(payload: Payload): Promise<BaseCheckResult> {
-    return {
-      valid: true,
-    };
-  }
-  protected async _handle(payload: Payload): Promise<any> {
-    return await napCatCore.session.getMsgService().sendSsoCmdReqByContend(payload.cmd, payload.param);
-  }
-}

src/onebot/action/extends/TranslateEnWordToZn.ts

@@ -1,9 +1,7 @@
 import BaseAction from '../BaseAction';
-import { ActionName, BaseCheckResult } from '../types';
-import { NTQQSystemApi, NTQQUserApi } from '@/core/apis';
+import { ActionName } from '../types';
+import { NTQQSystemApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import Ajv from 'ajv';
-// 设置在线状态
 
 const SchemaData = {
   type: 'object',

src/onebot/action/extends/sharePeer.ts

@@ -1,7 +1,5 @@
-import { NTQQGroupApi, NTQQUserApi } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { BuddyCategoryType } from '@/core/entities/';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {
@@ -20,6 +18,8 @@ export class sharePeer extends BaseAction<Payload, any> {
   actionName = ActionName.SharePeer;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     if (payload.group_id) {
       return await NTQQGroupApi.getGroupRecommendContactArkJson(payload.group_id);
     } else if (payload.user_id) {
@@ -40,6 +40,8 @@ export class shareGroupEx extends BaseAction<PayloadGroupEx, any> {
   actionName = ActionName.ShareGroupEx;
   PayloadSchema = SchemaDataGroupEx;
   protected async _handle(payload: PayloadGroupEx) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     return await NTQQGroupApi.getArkJsonGroupShare(payload.group_id);
   }
 }