chore:action

src/onebot/action/go-cqhttp/SendGroupNotice.ts

@@ -21,6 +21,7 @@ type Payload = FromSchema<typeof SchemaData>;
 export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice;
   protected async _handle(payload: Payload) {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     let UploadImage: { id: string, width: number, height: number } | undefined = undefined;
     if (payload.image) {
       //公告图逻辑

src/onebot/action/go-cqhttp/UploadGroupFile.ts

@@ -1,10 +1,8 @@
 import BaseAction from '../BaseAction';
-import { getGroup } from '@/core/data';
 import { ActionName } from '../types';
-import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import { ChatType, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { SendMsg, sendMsg } from '@/onebot11/action/msg/SendMsg';
+import { sendMsg } from '@/onebot/action/msg/SendMsg';
 import { uri2local } from '@/common/utils/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
@@ -25,10 +23,6 @@ export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const group = await getGroup(payload.group_id.toString());
-    if (!group) {
-      throw new Error(`群组${payload.group_id}不存在`);
-    }
     let file = payload.file;
     if (fs.existsSync(file)) {
       file = `file://${file}`;

src/onebot/action/go-cqhttp/UploadPrivareFile.ts

@@ -4,7 +4,7 @@ import { ActionName } from '../types';
 import { SendMsgElementConstructor } from '@/core/entities/constructor';
 import { ChatType, Peer, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { SendMsg, sendMsg } from '@/onebot11/action/msg/SendMsg';
+import { SendMsg, sendMsg } from '@/onebot/action/msg/SendMsg';
 import { uri2local } from '@/common/utils/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { NTQQFriendApi, NTQQUserApi } from '@/core';

src/onebot/action/group/DelEssenceMsg.ts

@@ -2,7 +2,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { NTQQGroupApi } from '@/core';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 
 const SchemaData = {
@@ -19,7 +18,8 @@ export default class DelEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.DelEssenceMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<any> {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
     if (!msg) {
       throw new Error('msg not found');
     }

src/onebot/action/group/GetGroupEssence.ts

@@ -1,10 +1,6 @@
-import { getGroup } from '@/core/data';
-import { OB11Group } from '../../types';
-import { OB11Constructor } from '../../constructor';
+import { GroupEssenceMsgRet } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQMsgApi } from '@/core/apis/msg';
-import { GroupEssenceMsgRet, WebApi } from '@/core/apis/webapi';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {
@@ -22,7 +18,8 @@ export class GetGroupEssence extends BaseAction<Payload, GroupEssenceMsgRet> {
   actionName = ActionName.GoCQHTTP_GetEssenceMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const ret = await WebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages.toString());
+    const NTQQWebApi = this.CoreContext.getApiContext().WebApi;
+    const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages.toString());
     if (!ret) {
       throw new Error('获取失败');
     }

src/onebot/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { getGroup } from '@/core/data';
 import { OB11Group } 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';

src/onebot/action/group/GetGroupList.ts

@@ -1,8 +1,7 @@
 import { OB11Group } from '../../types';
-import { OB11Constructor } from '../../constructor';
+import { OB11Constructor } from '../../helper/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/apis';
 import { Group } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 // no_cache get时传字符串
@@ -19,6 +18,7 @@ class GetGroupList extends BaseAction<Payload, OB11Group[]> {
   actionName = ActionName.GetGroupList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     const groupList: Group[]  = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true');
     return OB11Constructor.groups(groupList);
   }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -1,14 +1,8 @@
 import { OB11GroupMember } from '../../types';
-import { OB11Constructor } from '../../constructor';
+import { OB11Constructor } from '../../helper/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQUserApi } from '@/core/apis/user';
-import { logDebug } from '@/common/utils/log';
-import { WebApi } from '@/core/apis/webapi';
-import { NTQQGroupApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { getGroupMember, selfInfo } from '@/core/data';
-import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
 const SchemaData = {
   type: 'object',
   properties: {
@@ -25,6 +19,9 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     const isNocache = payload.no_cache == true || payload.no_cache === 'true';
     const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
     if (!uid) {
@@ -36,14 +33,14 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
     }
     try {
       const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
-      logDebug('群成员详细信息结果', info);
+      this.CoreContext.context.logger.logDebug('群成员详细信息结果', info);
       Object.assign(member, info);
     } catch (e) {
-      logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
+      this.CoreContext.context.loggerlogDebug('获取群成员详细信息失败, 只能返回基础信息', e);
     }
     const date = Math.round(Date.now() / 1000);
     const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-    if (!requireMinNTQQBuild('26702')) {
+    if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
       const SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache);
       let isPrivilege = false;
       if (SelfInfoInGroup) {

src/onebot/action/group/GetGroupMemberInfoOld.ts

@@ -1,15 +1,9 @@
 import { OB11GroupMember } from '../../types';
-import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
-import { OB11Constructor } from '../../constructor';
+import { OB11Constructor } from '../../helper/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { NTQQUserApi } from '@/core/apis/user';
-import { logDebug } from '@/common/utils/log';
-import { WebApi } from '@/core/apis/webapi';
-import { NTQQGroupApi } from '@/core';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
-
 // no_cache get时传字符串
 const SchemaData = {
   type: 'object',
@@ -27,7 +21,9 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    if (requireMinNTQQBuild('26702')) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    if (this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
       const V2Data = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), payload.user_id.toString(), payload.no_cache == true || payload.no_cache === 'true');
       if (V2Data) {
         return OB11Constructor.groupMember(payload.group_id.toString(), V2Data);

src/onebot/action/group/GetGroupMemberList.ts

@@ -1,13 +1,9 @@
-import { getGroup, getGroupMember, selfInfo } from '@/core/data';
+
 import { OB11GroupMember } from '../../types';
-import { OB11Constructor } from '../../constructor';
+import { OB11Constructor } from '../../helper/constructor';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core';
-import { WebApi } from '@/core/apis/webapi';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { requireMinNTQQBuild } from '@/common/utils/QQBasicInfo';
-
 const SchemaData = {
   type: 'object',
   properties: {
@@ -23,6 +19,8 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    const NTQQWebApi = this.CoreContext.getApiContext().WebApi;
     const isNocache = payload.no_cache == true || payload.no_cache === 'true';
 
     const GroupList = await NTQQGroupApi.getGroups(isNocache);
@@ -44,12 +42,12 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
       MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
     }
 
-    if (!requireMinNTQQBuild('26702')) {
-      const selfRole = groupMembers.get(selfInfo.uid)?.role;
+    if (!this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
+      const selfRole = groupMembers.get(this.CoreContext.selfInfo.uid)?.role;
       const isPrivilege = selfRole === 3 || selfRole === 4;
 
       if (isPrivilege) {
-        const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
+        const webGroupMembers = await NTQQWebApi.getGroupMembers(payload.group_id.toString());
         for (let i = 0, len = webGroupMembers.length; i < len; i++) {
           if (!webGroupMembers[i]?.uin) {
             continue;
@@ -65,7 +63,7 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
         }
       } else {
         if (isNocache) {
-          const DateMap = await NTQQGroupApi.getGroupMemberLastestSendTimeCache(payload.group_id.toString());//开始从本地拉取
+          const DateMap = await NTQQGroupApi.getGroupMemberLatestSendTimeCache(payload.group_id.toString());//开始从本地拉取
           for (const DateUin of DateMap.keys()) {
             const MemberData = MemberMap.get(parseInt(DateUin));
             if (MemberData) {

src/onebot/action/group/GetGroupNotice.ts

@@ -1,4 +1,4 @@
-import { WebApi, WebApiGroupNoticeFeed, WebApiGroupNoticeRet } from '@/core/apis/webapi';
+import { WebApiGroupNoticeFeed } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -26,12 +26,15 @@ const SchemaData = {
 type Payload = FromSchema<typeof SchemaData>;
 
 type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
+
 export class GetGroupNotice extends BaseAction<Payload, GroupNotice[]> {
   actionName = ActionName.GoCQHTTP_GetGroupNotice;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
+    const NTQQWebApi = this.CoreContext.getApiContext().WebApi;
+
     const group = payload.group_id.toString();
-    const ret = await WebApi.getGrouptNotice(group);
+    const ret = await NTQQWebApi.getGroupNotice(group);
     if (!ret) {
       throw new Error('获取公告失败');
     }

src/onebot/action/group/GetGroupSystemMsg.ts

@@ -1,4 +1,3 @@
-import { NTQQGroupApi, NTQQUserApi } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -15,6 +14,8 @@ type Payload = FromSchema<typeof SchemaData>;
 export class GetGroupSystemMsg extends BaseAction<void, any> {
   actionName = ActionName.GetGroupSystemMsg;
   protected async _handle(payload: void) {
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 
     const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(10);
     const retData: any = { InvitedRequest: [], join_requests: [] };

src/onebot/action/group/SetEssenceMsg.ts

@@ -1,7 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { NTQQGroupApi, NTQQMsgApi } from '@/core';
 import { MessageUnique } from '@/common/utils/MessageUnique';
 
 const SchemaData = {
@@ -18,7 +17,8 @@ export default class SetEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.SetEssenceMsg;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<any> {
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString()));
     if (!msg) {
       throw new Error('msg not found');
     }

src/onebot/action/group/SetGroupAddRequest.ts

@@ -20,11 +20,12 @@ export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAddRequest;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     const flag = payload.flag.toString();
     const approve = payload.approve?.toString() !== 'false';
     await NTQQGroupApi.handleGroupRequest(flag,
       approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-      payload.reason
+      payload.reason || " "
     );
     return null;
   }

src/onebot/action/group/SetGroupAdmin.ts

@@ -1,5 +1,4 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '@/core/data';
 import { GroupMemberRole } from '@/core/entities';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
@@ -21,12 +20,7 @@ export default class SetGroupAdmin extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAdmin;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    // 已经前置验证类型
-    const enable = payload.enable?.toString() !== 'false';
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     await NTQQGroupApi.setMemberRole(payload.group_id.toString(), member.uid, enable ? GroupMemberRole.admin : GroupMemberRole.normal);
     return null;
   }

src/onebot/action/group/SetGroupBan.ts

@@ -1,7 +1,5 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {
@@ -20,10 +18,7 @@ export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     await NTQQGroupApi.banMember(payload.group_id.toString(),
       [{ uid: member.uid, timeStamp: parseInt(payload.duration.toString()) }]);
     return null;

src/onebot/action/group/SetGroupCard.ts

@@ -20,10 +20,7 @@ export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '');
     return null;
   }

src/onebot/action/group/SetGroupKick.ts

@@ -1,5 +1,4 @@
 import BaseAction from '../BaseAction';
-import { getGroupMember } from '@/core/data';
 import { ActionName } from '../types';
 import { NTQQGroupApi } from '@/core/apis/group';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -21,10 +20,9 @@ export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await getGroupMember(payload.group_id, payload.user_id);
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`;
-    }
+    const NTQQUserApi = this.CoreContext.getApiContext().UserApi;
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
+    const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi;
     const rejectReq = payload.reject_add_request?.toString() == 'true';
     await NTQQGroupApi.kickMember(payload.group_id.toString(), [member.uid], rejectReq);
     return null;

src/onebot/action/group/SetGroupLeave.ts

@@ -1,9 +1,6 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { NTQQGroupApi } from '@/core/apis/group';
-import { log, logError } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { deleteGroup } from '@/core/data';
 const SchemaData = {
   type: 'object',
   properties: {
@@ -18,11 +15,10 @@ export default class SetGroupLeave extends BaseAction<Payload, any> {
   actionName = ActionName.SetGroupLeave;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload): Promise<any> {
+    const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi;
     try {
       await NTQQGroupApi.quitGroup(payload.group_id.toString());
-      deleteGroup(payload.group_id.toString());
     } catch (e) {
-      logError('退群失败', e);
       throw e;
     }
   }