From e7e8e99946cad24329cbbe2035932f013bb5c341 Mon Sep 17 00:00:00 2001 From: "Wesley F. Young" Date: Sun, 11 Aug 2024 19:10:42 +0800 Subject: [PATCH] refactor: inline getApiContext() --- src/core/apis/group.ts | 11 +++-- src/core/apis/msg.ts | 2 +- src/core/apis/sign.ts | 4 +- src/core/apis/user.ts | 8 ++-- src/core/apis/webapi.ts | 12 +++--- src/core/core.ts | 24 +++++------ src/onebot/action/extends/CreateCollection.ts | 2 +- src/onebot/action/extends/FetchCustomFace.ts | 2 +- src/onebot/action/extends/FetchEmojiLike.ts | 2 +- .../action/extends/GetCollectionList.ts | 2 +- .../action/extends/GetFriendWithCategory.ts | 2 +- .../action/extends/GetGroupAddRequest.ts | 2 +- src/onebot/action/extends/GetProfileLike.ts | 2 +- src/onebot/action/extends/GetRobotUinRange.ts | 2 +- src/onebot/action/extends/OCRImage.ts | 2 +- src/onebot/action/extends/SetGroupHeader.ts | 2 +- src/onebot/action/extends/SetLongNick.ts | 2 +- src/onebot/action/extends/SetOnlineStatus.ts | 2 +- src/onebot/action/extends/SetQQAvatar.ts | 2 +- src/onebot/action/extends/SetSelfProfile.ts | 2 +- src/onebot/action/extends/ShareContact.ts | 6 +-- .../action/extends/TranslateEnWordToZn.ts | 2 +- src/onebot/action/file/DelGroupFile.ts | 2 +- src/onebot/action/file/DelGroupFileFolder.ts | 2 +- src/onebot/action/file/GetFile.ts | 10 ++--- src/onebot/action/file/GetGroupFileCount.ts | 2 +- src/onebot/action/file/GetGroupFileList.ts | 2 +- src/onebot/action/file/SetGroupFileFolder.ts | 2 +- src/onebot/action/go-cqhttp/GetForwardMsg.ts | 2 +- .../action/go-cqhttp/GetFriendMsgHistory.ts | 6 +-- .../action/go-cqhttp/GetGroupHonorInfo.ts | 2 +- .../action/go-cqhttp/GetGroupMsgHistory.ts | 2 +- .../action/go-cqhttp/GetOnlineClient.ts | 2 +- .../action/go-cqhttp/GetStrangerInfo.ts | 2 +- .../action/go-cqhttp/SendGroupNotice.ts | 2 +- .../action/go-cqhttp/UploadPrivareFile.ts | 4 +- src/onebot/action/group/DelEssenceMsg.ts | 2 +- src/onebot/action/group/GetGroupEssence.ts | 2 +- src/onebot/action/group/GetGroupInfo.ts | 2 +- src/onebot/action/group/GetGroupList.ts | 2 +- src/onebot/action/group/GetGroupMemberInfo.ts | 6 +-- src/onebot/action/group/GetGroupMemberList.ts | 4 +- src/onebot/action/group/GetGroupNotice.ts | 2 +- src/onebot/action/group/GetGroupSystemMsg.ts | 4 +- src/onebot/action/group/SetEssenceMsg.ts | 2 +- src/onebot/action/group/SetGroupAddRequest.ts | 2 +- src/onebot/action/group/SetGroupAdmin.ts | 4 +- src/onebot/action/group/SetGroupBan.ts | 4 +- src/onebot/action/group/SetGroupCard.ts | 2 +- src/onebot/action/group/SetGroupKick.ts | 4 +- src/onebot/action/group/SetGroupLeave.ts | 2 +- src/onebot/action/group/SetGroupName.ts | 2 +- src/onebot/action/group/SetGroupWholeBan.ts | 2 +- src/onebot/action/msg/DeleteMsg.ts | 2 +- src/onebot/action/msg/ForwardSingleMsg.ts | 4 +- src/onebot/action/msg/GetMsg.ts | 2 +- src/onebot/action/msg/MarkMsgAsRead.ts | 8 ++-- .../msg/SendMsg/create-send-elements.ts | 4 +- .../action/msg/SendMsg/handle-forward-node.ts | 4 +- src/onebot/action/msg/SendMsg/index.ts | 14 +++---- src/onebot/action/msg/SetMsgEmojiLike.ts | 2 +- src/onebot/action/user/GetCookies.ts | 4 +- src/onebot/action/user/GetFriendList.ts | 2 +- src/onebot/action/user/GetRecentContact.ts | 4 +- src/onebot/action/user/SendLike.ts | 2 +- src/onebot/action/user/SetFriendAddRequest.ts | 2 +- src/onebot/helper/data.ts | 16 ++++---- src/onebot/helper/log.ts | 4 +- src/onebot/helper/msg.ts | 40 +++++++++---------- src/onebot/helper/quick.ts | 8 ++-- src/onebot/main.ts | 31 ++++++++------ 71 files changed, 173 insertions(+), 167 deletions(-) diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index ff2218e7..9445759b 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -1,14 +1,17 @@ import { ChatType, + GeneralCallResult, Group, GroupMember, GroupMemberRole, GroupNotify, GroupRequestOperateTypes, + InstanceContext, MemberExtSourceType, + NapCatCore, NodeIKernelGroupListener, + NodeIKernelGroupService, } from '@/core'; -import { GeneralCallResult, InstanceContext, NapCatCore, NodeIKernelGroupService } from '@/core'; import { isNumeric, runAllWithTimeout } from '@/common/utils/helper'; export class NTQQGroupApi { @@ -164,7 +167,7 @@ export class NTQQGroupApi { async getLatestMsg(GroupCode: string, uins: string[]) { const uids: Array = []; for (const uin of uins) { - const uid = await this.core.getApiContext().UserApi.getUidByUin(uin); + const uid = await this.core.apis.UserApi.getUidByUin(uin); if (uid) { uids.push(uid); } @@ -313,7 +316,7 @@ export class NTQQGroupApi { //需要异常处理 async uploadGroupBulletinPic(GroupCode: string, imageurl: string) { - const _Pskey = (await this.core.getApiContext().UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!; + const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!; return this.context.session.getGroupService().uploadGroupBulletinPic(GroupCode, _Pskey, imageurl); } @@ -377,7 +380,7 @@ export class NTQQGroupApi { width: number, height: number } | undefined = undefined, pinned: number = 0, confirmRequired: number = 0) { - const _Pskey = (await this.core.getApiContext().UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com'); + const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com'); //text是content内容url编码 const data = { text: encodeURI(content), diff --git a/src/core/apis/msg.ts b/src/core/apis/msg.ts index 5a90215f..a70c7a00 100644 --- a/src/core/apis/msg.ts +++ b/src/core/apis/msg.ts @@ -210,7 +210,7 @@ export class NTQQMsgApi { async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) { //唉？ ！我有个想法 if (peer.chatType === ChatType.temp && peer.guildId && peer.guildId !== '') { - let member = await this.core.ApiContext.GroupApi.getGroupMember(peer.guildId, peer.peerUid!); + let member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!); if (member) { await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick); } diff --git a/src/core/apis/sign.ts b/src/core/apis/sign.ts index f3fbbcd3..16d2d03c 100644 --- a/src/core/apis/sign.ts +++ b/src/core/apis/sign.ts @@ -185,8 +185,8 @@ export class NTQQMusicSignApi { // "view": "eventshare", // "ver": "0.0.0.1" // }; - const data = (await this.core.getApiContext().UserApi.getQzoneCookies()); - const Bkn = this.core.getApiContext().WebApi.getBknFromCookie(data.p_skey); + const data = (await this.core.apis.UserApi.getQzoneCookies()); + const Bkn = this.core.apis.WebApi.getBknFromCookie(data.p_skey); const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + this.core.selfInfo.uin + '; uin=o' + this.core.selfInfo.uin; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 932eb848..2a6909f0 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -238,9 +238,9 @@ export class NTQQUserApi { uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin); if (uid) return uid; // console.log((await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true))); - uid = (await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid + uid = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid if (uid) return uid; - uid = (await this.core.getApiContext().FriendApi.getBuddyIdMap(true)).getValue(Uin); + uid = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getValue(Uin); if (uid) return uid; const unveifyUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换 if (unveifyUid.indexOf('*') == -1) uid = unveifyUid; @@ -256,9 +256,9 @@ export class NTQQUserApi { if (uin) return uin; uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid); if (uin) return uin; - uin = (await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin + uin = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getKey(Uid);//从Buddy缓存获取Uin if (uin) return uin; - uin = (await this.core.getApiContext().FriendApi.getBuddyIdMap(true)).getKey(Uid); + uin = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getKey(Uid); if (uin) return uin; uin = (await this.getUserDetailInfo(Uid)).uin; //从QQ Native 转换 return uin; diff --git a/src/core/apis/webapi.ts b/src/core/apis/webapi.ts index 36f55a42..05deb711 100644 --- a/src/core/apis/webapi.ts +++ b/src/core/apis/webapi.ts @@ -19,7 +19,7 @@ export class NTQQWebApi { } async shareDigest(groupCode: string, msgSeq: string, msgRandom: string, targetGroupCode: string) { - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); const url = `https://qun.qq.com/cgi-bin/group_digest/share_digest?${ new URLSearchParams({ bkn: this.getBknFromCookie(cookieObject), @@ -37,7 +37,7 @@ export class NTQQWebApi { } async getGroupEssenceMsg(GroupCode: string, page_start: string) { - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${ new URLSearchParams({ bkn: this.getBknFromCookie(cookieObject), @@ -62,7 +62,7 @@ export class NTQQWebApi { async getGroupMembers(GroupCode: string, cached: boolean = true): Promise { //logDebug('webapi 获取群成员', GroupCode); const memberData: Array = new Array(); - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); const retList: Promise[] = []; const fastRet = await RequestUtil.HttpGetJson (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${ @@ -123,7 +123,7 @@ export class NTQQWebApi { // } async setGroupNotice(GroupCode: string, Content: string) { - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); let ret: any = undefined; try { ret = await RequestUtil.HttpGetJson @@ -144,7 +144,7 @@ export class NTQQWebApi { } async getGroupNotice(GroupCode: string): Promise { - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); let ret: WebApiGroupNoticeRet | undefined = undefined; try { ret = await RequestUtil.HttpGetJson(`https://web.qun.qq.com/cgi-bin/announce/get_t_list?${ @@ -166,7 +166,7 @@ export class NTQQWebApi { } async getGroupHonorInfo(groupCode: string, getType: WebHonorType) { - const cookieObject = await this.core.getApiContext().UserApi.getCookies('qun.qq.com'); + const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com'); const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => { const url = `https://qun.qq.com/interactive/honorlist?${ new URLSearchParams({ diff --git a/src/core/core.ts b/src/core/core.ts index bdb357e5..30c17f96 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -28,7 +28,7 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi { export class NapCatCore { readonly context: InstanceContext; - readonly ApiContext: NTApiContext; + readonly apis: NTApiContext; readonly eventWrapper: LegacyNTEventWrapper; // readonly eventChannel: NTEventChannel; NapCatDataPath: string; @@ -43,7 +43,7 @@ export class NapCatCore { this.context = context; this.util = new this.context.wrapper.NodeQQNTWrapperUtil(); this.eventWrapper = new LegacyNTEventWrapper(context.wrapper, context.session); - this.ApiContext = { + this.apis = { FileApi: new NTQQFileApi(this.context, this), SystemApi: new NTQQSystemApi(this.context, this), CollectionApi: new NTQQCollectionApi(this.context, this), @@ -63,10 +63,6 @@ export class NapCatCore { this.initNapCatCoreListeners().then().catch(this.context.logger.logError); } - getApiContext() { - return this.ApiContext; - } - get dataPath(): string { let result = this.util.getNTUserDataInfoConfig(); if (!result) { @@ -107,13 +103,13 @@ export class NapCatCore { groupListener.onGroupListUpdate = (updateType, groupList) => { // console.log("onGroupListUpdate", updateType, groupList) groupList.map(g => { - const existGroup = this.ApiContext.GroupApi.groupCache.get(g.groupCode); + const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode); //群成员数量变化 应该刷新缓存 if (existGroup && g.memberCount === existGroup.memberCount) { Object.assign(existGroup, g); } else { - this.ApiContext.GroupApi.groupCache.set(g.groupCode, g); + this.apis.GroupApi.groupCache.set(g.groupCode, g); // 获取群成员 } const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow'); @@ -128,8 +124,8 @@ export class NapCatCore { groupListener.onMemberListChange = (arg) => { // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知 const groupCode = arg.sceneId.split('_')[0]; - if (this.ApiContext.GroupApi.groupMemberCache.has(groupCode)) { - const existMembers = this.ApiContext.GroupApi.groupMemberCache.get(groupCode)!; + if (this.apis.GroupApi.groupMemberCache.has(groupCode)) { + const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!; arg.infos.forEach((member, uid) => { //console.log('onMemberListChange', member); const existMember = existMembers.get(uid); @@ -146,7 +142,7 @@ export class NapCatCore { }); } else { - this.ApiContext.GroupApi.groupMemberCache.set(groupCode, arg.infos); + this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos); } // console.log('onMemberListChange', groupCode, arg); }; @@ -155,11 +151,11 @@ export class NapCatCore { if (changeType === 0 && members.get(this.selfInfo.uid)?.isDelete) { // 自身退群或者被踢退群 5s用于Api操作 之后不再出现 setTimeout(() => { - this.ApiContext.GroupApi.groupCache.delete(groupCode); + this.apis.GroupApi.groupCache.delete(groupCode); }, 5000); } - const existMembers = this.ApiContext.GroupApi.groupMemberCache.get(groupCode); + const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode); if (existMembers) { members.forEach((member, uid) => { const existMember = existMembers.get(uid); @@ -179,7 +175,7 @@ export class NapCatCore { }); } else { - this.ApiContext.GroupApi.groupMemberCache.set(groupCode, members); + this.apis.GroupApi.groupMemberCache.set(groupCode, members); } }; } diff --git a/src/onebot/action/extends/CreateCollection.ts b/src/onebot/action/extends/CreateCollection.ts index 2f994f3b..d46c01e3 100644 --- a/src/onebot/action/extends/CreateCollection.ts +++ b/src/onebot/action/extends/CreateCollection.ts @@ -18,7 +18,7 @@ export class CreateCollection extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - return await this.CoreContext.getApiContext().CollectionApi.createCollection( + return await this.CoreContext.apis.CollectionApi.createCollection( this.CoreContext.selfInfo.uin, this.CoreContext.selfInfo.uid, this.CoreContext.selfInfo.nick, diff --git a/src/onebot/action/extends/FetchCustomFace.ts b/src/onebot/action/extends/FetchCustomFace.ts index 29dd101b..36984783 100644 --- a/src/onebot/action/extends/FetchCustomFace.ts +++ b/src/onebot/action/extends/FetchCustomFace.ts @@ -17,7 +17,7 @@ export class FetchCustomFace extends BaseAction { async _handle(payload: Payload) { //48 可能正好是QQ需要的一个页面的数量 Tagged Mlikiowa - const ret = await this.CoreContext.getApiContext().MsgApi.fetchFavEmojiList(payload.count || 48); + const ret = await this.CoreContext.apis.MsgApi.fetchFavEmojiList(payload.count || 48); return ret.emojiInfoList.map(e => e.url); } } diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index 21fd64f7..c75996af 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/src/onebot/action/extends/FetchEmojiLike.ts @@ -24,7 +24,7 @@ export class FetchEmojiLike extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const msgIdPeer = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); if (!msgIdPeer) throw new Error('消息不存在'); const msg = (await NTQQMsgApi.getMsgsByMsgId(msgIdPeer.Peer, [msgIdPeer.MsgId])).msgList[0]; diff --git a/src/onebot/action/extends/GetCollectionList.ts b/src/onebot/action/extends/GetCollectionList.ts index 9f9da5d6..1d2c35e9 100644 --- a/src/onebot/action/extends/GetCollectionList.ts +++ b/src/onebot/action/extends/GetCollectionList.ts @@ -18,7 +18,7 @@ export class GetCollectionList extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQCollectionApi = this.CoreContext.getApiContext().CollectionApi; + const NTQQCollectionApi = this.CoreContext.apis.CollectionApi; return await NTQQCollectionApi.getAllCollection(payload.category, payload.count); } } diff --git a/src/onebot/action/extends/GetFriendWithCategory.ts b/src/onebot/action/extends/GetFriendWithCategory.ts index 79ec2a15..5554d4af 100644 --- a/src/onebot/action/extends/GetFriendWithCategory.ts +++ b/src/onebot/action/extends/GetFriendWithCategory.ts @@ -8,7 +8,7 @@ export class GetFriendWithCategory extends BaseAction { async _handle(payload: void) { if (this.CoreContext.context.basicInfoWrapper.requireMinNTQQBuild('26702')) { //全新逻辑 - return OB11Constructor.friendsV2(await this.CoreContext.getApiContext().FriendApi.getBuddyV2ExWithCate(true)); + return OB11Constructor.friendsV2(await this.CoreContext.apis.FriendApi.getBuddyV2ExWithCate(true)); } else { throw new Error('this ntqq version not support, must be 26702 or later'); } diff --git a/src/onebot/action/extends/GetGroupAddRequest.ts b/src/onebot/action/extends/GetGroupAddRequest.ts index 10e9f19e..e7b2020a 100644 --- a/src/onebot/action/extends/GetGroupAddRequest.ts +++ b/src/onebot/action/extends/GetGroupAddRequest.ts @@ -11,7 +11,7 @@ export default class GetGroupAddRequest extends BaseAction { - const data = await this.CoreContext.getApiContext().GroupApi.getGroupIgnoreNotifies(); + const data = await this.CoreContext.apis.GroupApi.getGroupIgnoreNotifies(); // log(data); // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE); // const returnData: OB11GroupRequestNotify[] = []; diff --git a/src/onebot/action/extends/GetProfileLike.ts b/src/onebot/action/extends/GetProfileLike.ts index 31e9a76c..b6a7a47a 100644 --- a/src/onebot/action/extends/GetProfileLike.ts +++ b/src/onebot/action/extends/GetProfileLike.ts @@ -5,7 +5,7 @@ export class GetProfileLike extends BaseAction { actionName = ActionName.GetProfileLike; async _handle(payload: void) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.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++) { diff --git a/src/onebot/action/extends/GetRobotUinRange.ts b/src/onebot/action/extends/GetRobotUinRange.ts index a65574d8..21c0bce9 100644 --- a/src/onebot/action/extends/GetRobotUinRange.ts +++ b/src/onebot/action/extends/GetRobotUinRange.ts @@ -6,7 +6,7 @@ export class GetRobotUinRange extends BaseAction> { async _handle(payload: void) { // console.log(await NTQQUserApi.getRobotUinRange()); - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; return await NTQQUserApi.getRobotUinRange(); } } diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index e963cb1f..19e0889d 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/src/onebot/action/extends/OCRImage.ts @@ -19,7 +19,7 @@ export class OCRImage extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQSystemApi = this.CoreContext.getApiContext().SystemApi; + const NTQQSystemApi = this.CoreContext.apis.SystemApi; const { path, isLocal, errMsg, success } = (await uri2local(this.CoreContext.NapCatTempPath, payload.image)); if (!success) { throw `OCR ${payload.image}失败,image字段可能格式不正确`; diff --git a/src/onebot/action/extends/SetGroupHeader.ts b/src/onebot/action/extends/SetGroupHeader.ts index b3af7133..bfd60f4e 100644 --- a/src/onebot/action/extends/SetGroupHeader.ts +++ b/src/onebot/action/extends/SetGroupHeader.ts @@ -27,7 +27,7 @@ export default class SetGroupHeader extends BaseAction { } async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const { path, isLocal, errMsg, success } = (await uri2local(this.CoreContext.NapCatTempPath, payload.file)); if (!success) { throw `头像${payload.file}设置失败,file字段可能格式不正确`; diff --git a/src/onebot/action/extends/SetLongNick.ts b/src/onebot/action/extends/SetLongNick.ts index cf583ba6..a9a07af0 100644 --- a/src/onebot/action/extends/SetLongNick.ts +++ b/src/onebot/action/extends/SetLongNick.ts @@ -17,7 +17,7 @@ export class SetLongNick extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const ret = await NTQQUserApi.setLongNick(payload.longNick); return ret; } diff --git a/src/onebot/action/extends/SetOnlineStatus.ts b/src/onebot/action/extends/SetOnlineStatus.ts index 3191f6dc..c64ffaea 100644 --- a/src/onebot/action/extends/SetOnlineStatus.ts +++ b/src/onebot/action/extends/SetOnlineStatus.ts @@ -26,7 +26,7 @@ export class SetOnlineStatus extends BaseAction { // { 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 NTQQUserApi = this.CoreContext.apis.UserApi; const ret = await NTQQUserApi.setSelfOnlineStatus(payload.status, payload.extStatus, payload.batteryStatus); if (ret.result !== 0) { throw new Error('设置在线状态失败'); diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index 368f6008..ee83444c 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/src/onebot/action/extends/SetQQAvatar.ts @@ -24,7 +24,7 @@ export default class SetAvatar extends BaseAction { } async _handle(payload: Payload): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const { path, isLocal, errMsg, success } = (await uri2local(this.CoreContext.NapCatTempPath, payload.file)); if (!success) { throw `头像${payload.file}设置失败,file字段可能格式不正确`; diff --git a/src/onebot/action/extends/SetSelfProfile.ts b/src/onebot/action/extends/SetSelfProfile.ts index 4f787ee9..84b64a92 100644 --- a/src/onebot/action/extends/SetSelfProfile.ts +++ b/src/onebot/action/extends/SetSelfProfile.ts @@ -19,7 +19,7 @@ export class SetSelfProfile extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const ret = await NTQQUserApi.modifySelfProfile({ nick: payload.nick, longNick: payload.longNick, diff --git a/src/onebot/action/extends/ShareContact.ts b/src/onebot/action/extends/ShareContact.ts index 03621d7d..1a039182 100644 --- a/src/onebot/action/extends/ShareContact.ts +++ b/src/onebot/action/extends/ShareContact.ts @@ -19,8 +19,8 @@ export class SharePeer extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; if (payload.group_id) { return await NTQQGroupApi.getGroupRecommendContactArkJson(payload.group_id); } else if (payload.user_id) { @@ -44,7 +44,7 @@ export class ShareGroupEx extends BaseAction { PayloadSchema = SchemaDataGroupEx; async _handle(payload: PayloadGroupEx) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; return await NTQQGroupApi.getArkJsonGroupShare(payload.group_id); } } diff --git a/src/onebot/action/extends/TranslateEnWordToZn.ts b/src/onebot/action/extends/TranslateEnWordToZn.ts index ccc3980a..d4c1cbb6 100644 --- a/src/onebot/action/extends/TranslateEnWordToZn.ts +++ b/src/onebot/action/extends/TranslateEnWordToZn.ts @@ -20,7 +20,7 @@ export class TranslateEnWordToZn extends BaseAction | null> PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQSystemApi = this.CoreContext.getApiContext().SystemApi; + const NTQQSystemApi = this.CoreContext.apis.SystemApi; const ret = await NTQQSystemApi.translateEnWordToZn(payload.words); if (ret.result !== 0) { throw new Error('翻译失败'); diff --git a/src/onebot/action/file/DelGroupFile.ts b/src/onebot/action/file/DelGroupFile.ts index 8a3e3b26..0e926631 100644 --- a/src/onebot/action/file/DelGroupFile.ts +++ b/src/onebot/action/file/DelGroupFile.ts @@ -18,7 +18,7 @@ export class DelGroupFile extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; return await NTQQGroupApi.DelGroupFile(payload.group_id.toString(), [payload.file_id]); } } diff --git a/src/onebot/action/file/DelGroupFileFolder.ts b/src/onebot/action/file/DelGroupFileFolder.ts index a995df69..f80fa260 100644 --- a/src/onebot/action/file/DelGroupFileFolder.ts +++ b/src/onebot/action/file/DelGroupFileFolder.ts @@ -18,7 +18,7 @@ export class DelGroupFileFolder extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; return (await NTQQGroupApi.DelGroupFileFolder(payload.group_id.toString(), payload.folder_id)).groupFileCommonResult; } } diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index 17495e0c..e18a3f3e 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -42,11 +42,11 @@ export class GetFileBase extends BaseAction { } async _handle(payload: GetFilePayload): Promise { - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQFileApi = this.CoreContext.getApiContext().FileApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQFileApi = this.CoreContext.apis.FileApi; let UuidData: { high: string; low: string; diff --git a/src/onebot/action/file/GetGroupFileCount.ts b/src/onebot/action/file/GetGroupFileCount.ts index 393d853c..250b8053 100644 --- a/src/onebot/action/file/GetGroupFileCount.ts +++ b/src/onebot/action/file/GetGroupFileCount.ts @@ -17,7 +17,7 @@ export class GetGroupFileCount extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const ret = await NTQQGroupApi.GetGroupFileCount([payload.group_id?.toString()]); return { count: ret.groupFileCounts[0] }; } diff --git a/src/onebot/action/file/GetGroupFileList.ts b/src/onebot/action/file/GetGroupFileList.ts index f1d3a7af..e1fc23c7 100644 --- a/src/onebot/action/file/GetGroupFileList.ts +++ b/src/onebot/action/file/GetGroupFileList.ts @@ -19,7 +19,7 @@ export class GetGroupFileList extends BaseAction PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const ret = await NTQQMsgApi.getGroupFileList(payload.group_id.toString(), { sortType: 1, fileCount: payload.file_count, diff --git a/src/onebot/action/file/SetGroupFileFolder.ts b/src/onebot/action/file/SetGroupFileFolder.ts index 0dee6270..07c67854 100644 --- a/src/onebot/action/file/SetGroupFileFolder.ts +++ b/src/onebot/action/file/SetGroupFileFolder.ts @@ -18,7 +18,7 @@ export class SetGroupFileFolder extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; return (await NTQQGroupApi.CreatGroupFileFolder(payload.group_id.toString(), payload.folder_name)).resultWithGroupItem; } } diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index 09dabd27..78148782 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts @@ -24,7 +24,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const msgId = payload.message_id || payload.id; if (!msgId) { throw Error('message_id is required'); diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index d0a45983..9c5a44b4 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -28,9 +28,9 @@ export default class GetFriendMsgHistory extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; //处理参数 const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); const MsgCount = payload.count || 20; diff --git a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts index f778bbff..25ffa30c 100644 --- a/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts +++ b/src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts @@ -22,7 +22,7 @@ export class GetGroupHonorInfo extends BaseAction> { if (!payload.type) { payload.type = WebHonorType.ALL; } - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; return await NTQQWebApi.getGroupHonorInfo(payload.group_id.toString(), payload.type); } } diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index d43f0d1f..65f634ea 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -28,7 +28,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; //处理参数 const isReverseOrder = payload.reverseOrder || true; const MsgCount = payload.count || 20; diff --git a/src/onebot/action/go-cqhttp/GetOnlineClient.ts b/src/onebot/action/go-cqhttp/GetOnlineClient.ts index 93d9becc..be9485f9 100644 --- a/src/onebot/action/go-cqhttp/GetOnlineClient.ts +++ b/src/onebot/action/go-cqhttp/GetOnlineClient.ts @@ -15,7 +15,7 @@ export class GetOnlineClient extends BaseAction> { async _handle(payload: void) { //注册监听 - const NTQQSystemApi = this.CoreContext.getApiContext().SystemApi; + const NTQQSystemApi = this.CoreContext.apis.SystemApi; NTQQSystemApi.getOnlineDev(); await sleep(500); diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index 22630bba..8a10fb58 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -19,7 +19,7 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const user_id = payload.user_id.toString(); const extendData = await NTQQUserApi.getUserDetailInfoByUin(user_id); const uid = (await NTQQUserApi.getUidByUin(user_id))!; diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index 4df8e5e0..d823d588 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/src/onebot/action/go-cqhttp/SendGroupNotice.ts @@ -22,7 +22,7 @@ export class SendGroupNotice extends BaseAction { actionName = ActionName.GoCQHTTP_SendGroupNotice; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; let UploadImage: { id: string, width: number, height: number } | undefined = undefined; if (payload.image) { //公告图逻辑 diff --git a/src/onebot/action/go-cqhttp/UploadPrivareFile.ts b/src/onebot/action/go-cqhttp/UploadPrivareFile.ts index c362ae11..82f1a0cb 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivareFile.ts +++ b/src/onebot/action/go-cqhttp/UploadPrivareFile.ts @@ -24,8 +24,8 @@ export default class GoCQHTTPUploadPrivateFile extends BaseAction PayloadSchema = SchemaData; async getPeer(payload: Payload): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; if (payload.user_id) { const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!peerUid) { diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index 860d43cb..733138e5 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/src/onebot/action/group/DelEssenceMsg.ts @@ -18,7 +18,7 @@ export default class DelEssenceMsg extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); if (!msg) { throw new Error('msg not found'); diff --git a/src/onebot/action/group/GetGroupEssence.ts b/src/onebot/action/group/GetGroupEssence.ts index 7a7b34f7..135d5425 100644 --- a/src/onebot/action/group/GetGroupEssence.ts +++ b/src/onebot/action/group/GetGroupEssence.ts @@ -19,7 +19,7 @@ export class GetGroupEssence extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), payload.pages.toString()); if (!ret) { throw new Error('获取失败'); diff --git a/src/onebot/action/group/GetGroupInfo.ts b/src/onebot/action/group/GetGroupInfo.ts index daa4ab92..eff2a59c 100644 --- a/src/onebot/action/group/GetGroupInfo.ts +++ b/src/onebot/action/group/GetGroupInfo.ts @@ -19,7 +19,7 @@ class GetGroupInfo extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id.toString()); if (group) { return OB11Constructor.group(group); diff --git a/src/onebot/action/group/GetGroupList.ts b/src/onebot/action/group/GetGroupList.ts index d1fb89c1..b98cc926 100644 --- a/src/onebot/action/group/GetGroupList.ts +++ b/src/onebot/action/group/GetGroupList.ts @@ -19,7 +19,7 @@ class GetGroupList extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const groupList: Group[] = await NTQQGroupApi.getGroups(payload?.no_cache === true || payload.no_cache === 'true'); return OB11Constructor.groups(groupList); } diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index cf1693cb..9903b88c 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -21,9 +21,9 @@ class GetGroupMemberInfo extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; const isNocache = payload.no_cache == true || payload.no_cache === 'true'; const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!uid) { diff --git a/src/onebot/action/group/GetGroupMemberList.ts b/src/onebot/action/group/GetGroupMemberList.ts index 2801b962..ba554c2b 100644 --- a/src/onebot/action/group/GetGroupMemberList.ts +++ b/src/onebot/action/group/GetGroupMemberList.ts @@ -20,8 +20,8 @@ class GetGroupMemberList extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; const isNocache = payload.no_cache == true || payload.no_cache === 'true'; const GroupList = await NTQQGroupApi.getGroups(isNocache); diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index cc4d589a..7dbf4ab4 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -33,7 +33,7 @@ export class GetGroupNotice extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; const group = payload.group_id.toString(); const ret = await NTQQWebApi.getGroupNotice(group); diff --git a/src/onebot/action/group/GetGroupSystemMsg.ts b/src/onebot/action/group/GetGroupSystemMsg.ts index 0f5fcfeb..00a2a626 100644 --- a/src/onebot/action/group/GetGroupSystemMsg.ts +++ b/src/onebot/action/group/GetGroupSystemMsg.ts @@ -15,8 +15,8 @@ export class GetGroupSystemMsg extends BaseAction { actionName = ActionName.GetGroupSystemMsg; async _handle(payload: void) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(10); const retData: any = { InvitedRequest: [], join_requests: [] }; diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 82b07e79..1253f722 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/src/onebot/action/group/SetEssenceMsg.ts @@ -18,7 +18,7 @@ export default class SetEssenceMsg extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); if (!msg) { throw new Error('msg not found'); diff --git a/src/onebot/action/group/SetGroupAddRequest.ts b/src/onebot/action/group/SetGroupAddRequest.ts index 7aa3bf38..e03f4463 100644 --- a/src/onebot/action/group/SetGroupAddRequest.ts +++ b/src/onebot/action/group/SetGroupAddRequest.ts @@ -20,7 +20,7 @@ export default class SetGroupAddRequest extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const flag = payload.flag.toString(); const approve = payload.approve?.toString() !== 'false'; await NTQQGroupApi.handleGroupRequest(flag, diff --git a/src/onebot/action/group/SetGroupAdmin.ts b/src/onebot/action/group/SetGroupAdmin.ts index fcd687ef..2a1dfb12 100644 --- a/src/onebot/action/group/SetGroupAdmin.ts +++ b/src/onebot/action/group/SetGroupAdmin.ts @@ -20,8 +20,8 @@ export default class SetGroupAdmin extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!uid) throw new Error('get Uid Error'); await NTQQGroupApi.setMemberRole(payload.group_id.toString(), uid, payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal); diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index c3812e47..1c62f7b6 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -19,8 +19,8 @@ export default class SetGroupBan extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!uid) throw new Error('uid error'); await NTQQGroupApi.banMember(payload.group_id.toString(), diff --git a/src/onebot/action/group/SetGroupCard.ts b/src/onebot/action/group/SetGroupCard.ts index eb66a458..b1d518e3 100644 --- a/src/onebot/action/group/SetGroupCard.ts +++ b/src/onebot/action/group/SetGroupCard.ts @@ -19,7 +19,7 @@ export default class SetGroupCard extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; const member = await NTQQGroupApi.getGroupMember(payload.group_id.toString(), payload.user_id.toString()); member && await NTQQGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || ''); return null; diff --git a/src/onebot/action/group/SetGroupKick.ts b/src/onebot/action/group/SetGroupKick.ts index 96ffdf13..b8ad5d63 100644 --- a/src/onebot/action/group/SetGroupKick.ts +++ b/src/onebot/action/group/SetGroupKick.ts @@ -20,8 +20,8 @@ export default class SetGroupKick extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const rejectReq = payload.reject_add_request?.toString() == 'true'; const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!uid) throw new Error('get Uid Error'); diff --git a/src/onebot/action/group/SetGroupLeave.ts b/src/onebot/action/group/SetGroupLeave.ts index 66fc3c26..43b3fe2c 100644 --- a/src/onebot/action/group/SetGroupLeave.ts +++ b/src/onebot/action/group/SetGroupLeave.ts @@ -17,7 +17,7 @@ export default class SetGroupLeave extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; await NTQQGroupApi.quitGroup(payload.group_id.toString()); } } diff --git a/src/onebot/action/group/SetGroupName.ts b/src/onebot/action/group/SetGroupName.ts index 44ac3dc9..9009c587 100644 --- a/src/onebot/action/group/SetGroupName.ts +++ b/src/onebot/action/group/SetGroupName.ts @@ -17,7 +17,7 @@ export default class SetGroupName extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; await NTQQGroupApi.setGroupName(payload.group_id.toString(), payload.group_name); return null; } diff --git a/src/onebot/action/group/SetGroupWholeBan.ts b/src/onebot/action/group/SetGroupWholeBan.ts index b7bf982e..e0d3293b 100644 --- a/src/onebot/action/group/SetGroupWholeBan.ts +++ b/src/onebot/action/group/SetGroupWholeBan.ts @@ -19,7 +19,7 @@ export default class SetGroupWholeBan extends BaseAction { async _handle(payload: Payload): Promise { const enable = payload.enable?.toString() !== 'false'; - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; await NTQQGroupApi.banGroup(payload.group_id.toString(), enable); return null; } diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index d4b488c4..837b43d6 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/src/onebot/action/msg/DeleteMsg.ts @@ -24,7 +24,7 @@ class DeleteMsg extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const msg = MessageUnique.getMsgIdAndPeerByShortId(Number(payload.message_id)); if (msg) { const ret = this.CoreContext.eventWrapper.RegisterListen diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index c2b6a522..48d32d3a 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/src/onebot/action/msg/ForwardSingleMsg.ts @@ -18,7 +18,7 @@ type Payload = FromSchema; class ForwardSingleMsg extends BaseAction { protected async getTargetPeer(payload: Payload): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; if (payload.user_id) { const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!peerUid) { @@ -30,7 +30,7 @@ class ForwardSingleMsg extends BaseAction { } async _handle(payload: Payload): Promise { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const msg = MessageUnique.getMsgIdAndPeerByShortId(payload.message_id); if (!msg) { throw new Error(`无法找到消息${payload.message_id}`); diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index a0fe6679..40c8ef9c 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/src/onebot/action/msg/GetMsg.ts @@ -23,7 +23,7 @@ class GetMsg extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; // log("history msg ids", Object.keys(msgHistory)); if (!payload.message_id) { throw Error('参数message_id不能为空'); diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index e6605695..b66ae47e 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -15,8 +15,8 @@ type PlayloadType = FromSchema; class MarkMsgAsRead extends BaseAction { async getPeer(payload: PlayloadType): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; if (payload.user_id) { const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); if (!peerUid) { @@ -32,7 +32,7 @@ class MarkMsgAsRead extends BaseAction { } async _handle(payload: PlayloadType): Promise { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; // 调用API const ret = await NTQQMsgApi.setMsgRead(await this.getPeer(payload)); if (ret.result != 0) { @@ -70,7 +70,7 @@ export class MarkAllMsgAsRead extends BaseAction { actionName = ActionName._MarkAllMsgAsRead; async _handle(payload: Payload): Promise { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; await NTQQMsgApi.markallMsgAsRead(); return null; } diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index 4efeeef7..b9a82253 100644 --- a/src/onebot/action/msg/SendMsg/create-send-elements.ts +++ b/src/onebot/action/msg/SendMsg/create-send-elements.ts @@ -54,7 +54,7 @@ const _handlers: { // then the qq is a group member // Mlikiowa V2.0.0 Refactor Todo - const uid = await coreContext.getApiContext().UserApi.getUidByUin(atQQ); + const uid = await coreContext.apis.UserApi.getUidByUin(atQQ); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); }, @@ -64,7 +64,7 @@ const _handlers: { coreContext.context.logger.logWarn('回复消息不存在', id); return undefined; } - const NTQQMsgApi = coreContext.getApiContext().MsgApi; + const NTQQMsgApi = coreContext.apis.MsgApi; const replyMsg = (await NTQQMsgApi.getMsgsByMsgId( replyMsgM.Peer, [replyMsgM.MsgId!])).msgList[0]; return replyMsg ? diff --git a/src/onebot/action/msg/SendMsg/handle-forward-node.ts b/src/onebot/action/msg/SendMsg/handle-forward-node.ts index f16c88e8..cb4694b0 100644 --- a/src/onebot/action/msg/SendMsg/handle-forward-node.ts +++ b/src/onebot/action/msg/SendMsg/handle-forward-node.ts @@ -10,7 +10,7 @@ async function cloneMsg(coreContext: NapCatCore, msg: RawMessage): Promise { - const NTQQMsgApi = coreContext.getApiContext().MsgApi; + const NTQQMsgApi = coreContext.apis.MsgApi; const selfPeer = { chatType: ChatType.friend, peerUid: coreContext.selfInfo.uid, diff --git a/src/onebot/action/msg/SendMsg/index.ts b/src/onebot/action/msg/SendMsg/index.ts index 31b5f9c8..3f6439ae 100644 --- a/src/onebot/action/msg/SendMsg/index.ts +++ b/src/onebot/action/msg/SendMsg/index.ts @@ -37,7 +37,7 @@ export function normalize(message: OB11MessageMixType, autoEscape = false): OB11 export { createSendElements }; export async function sendMsg(coreContext: NapCatCore, peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) { - const NTQQMsgApi = coreContext.getApiContext().MsgApi; + const NTQQMsgApi = coreContext.apis.MsgApi; const logger = coreContext.context.logger; if (!sendElements.length) { throw ('消息体无法解析, 请检查是否发送了不支持的消息类型'); @@ -88,9 +88,9 @@ async function createContext(coreContext: NapCatCore, payload: OB11PostSendMsg, // This function determines the type of message by the existence of user_id / group_id, // not message_type. // This redundant design of Ob11 here should be blamed. - const NTQQGroupApi = coreContext.getApiContext().GroupApi; - const NTQQFriendApi = coreContext.getApiContext().FriendApi; - const NTQQUserApi = coreContext.getApiContext().UserApi; + const NTQQGroupApi = coreContext.apis.GroupApi; + const NTQQFriendApi = coreContext.apis.FriendApi; + const NTQQUserApi = coreContext.apis.UserApi; if ((contextMode === ContextMode.Group || contextMode === ContextMode.Normal) && payload.group_id) { const group = (await NTQQGroupApi.getGroups()).find(e => e.groupCode == payload.group_id?.toString()); return { @@ -122,9 +122,9 @@ export class SendMsg extends BaseAction { contextMode = ContextMode.Normal; protected async check(payload: OB11PostSendMsg): Promise { - const NTQQGroupApi = this.CoreContext.getApiContext().GroupApi; - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQGroupApi = this.CoreContext.apis.GroupApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; const messages = normalize(payload.message); const nodeElementLength = getSpecialMsgNum(payload, OB11MessageDataType.node); if (nodeElementLength > 0 && nodeElementLength != messages.length) { diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 2b9515b9..a7b49c37 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/src/onebot/action/msg/SetMsgEmojiLike.ts @@ -19,7 +19,7 @@ export class SetMsgEmojiLike extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const msg = MessageUnique.getMsgIdAndPeerByShortId(parseInt(payload.message_id.toString())); if (!msg) { throw new Error('msg not found'); diff --git a/src/onebot/action/user/GetCookies.ts b/src/onebot/action/user/GetCookies.ts index c0f849f3..8725b021 100644 --- a/src/onebot/action/user/GetCookies.ts +++ b/src/onebot/action/user/GetCookies.ts @@ -22,8 +22,8 @@ export class GetCookies extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQWebApi = this.CoreContext.getApiContext().WebApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQWebApi = this.CoreContext.apis.WebApi; // if (!payload.domain) { // throw new Error('缺少参数 domain'); // } diff --git a/src/onebot/action/user/GetFriendList.ts b/src/onebot/action/user/GetFriendList.ts index aa2811dd..7cfe747f 100644 --- a/src/onebot/action/user/GetFriendList.ts +++ b/src/onebot/action/user/GetFriendList.ts @@ -19,7 +19,7 @@ export default class GetFriendList extends BaseAction { async _handle(payload: Payload) { //全新逻辑 - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(payload?.no_cache === true || payload?.no_cache === 'true')); } } diff --git a/src/onebot/action/user/GetRecentContact.ts b/src/onebot/action/user/GetRecentContact.ts index 36140d5b..2722760a 100644 --- a/src/onebot/action/user/GetRecentContact.ts +++ b/src/onebot/action/user/GetRecentContact.ts @@ -17,8 +17,8 @@ export default class GetRecentContact extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload) { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; - const NTQQMsgApi = this.CoreContext.getApiContext().MsgApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; + const NTQQMsgApi = this.CoreContext.apis.MsgApi; const ret = await NTQQUserApi.getRecentContactListSnapShot(parseInt((payload.count || 10).toString())); const data = await Promise.all(ret.info.changedList.map(async (t) => { const FastMsg = await NTQQMsgApi.getMsgsByMsgId({ chatType: t.chatType, peerUid: t.peerUid }, [t.msgId]); diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index 5ebdee86..231687c3 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -18,7 +18,7 @@ export default class SendLike extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQUserApi = this.CoreContext.getApiContext().UserApi; + const NTQQUserApi = this.CoreContext.apis.UserApi; //logDebug('点赞参数', payload); try { const qq = payload.user_id.toString(); diff --git a/src/onebot/action/user/SetFriendAddRequest.ts b/src/onebot/action/user/SetFriendAddRequest.ts index 19fd24c9..b213cea4 100644 --- a/src/onebot/action/user/SetFriendAddRequest.ts +++ b/src/onebot/action/user/SetFriendAddRequest.ts @@ -19,7 +19,7 @@ export default class SetFriendAddRequest extends BaseAction { PayloadSchema = SchemaData; async _handle(payload: Payload): Promise { - const NTQQFriendApi = this.CoreContext.getApiContext().FriendApi; + const NTQQFriendApi = this.CoreContext.apis.FriendApi; const approve = payload.approve?.toString() !== 'false'; await NTQQFriendApi.handleFriendRequest(payload.flag, approve); return null; diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 5e2ecc43..a5d7209e 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -46,10 +46,10 @@ import { NapCatCore } from '@/core'; export class OB11Constructor { static async message(core: NapCatCore, msg: RawMessage, messagePostFormat: any): Promise { - const NTQQGroupApi = core.getApiContext().GroupApi; - const NTQQUserApi = core.getApiContext().UserApi; - const NTQQFileApi = core.getApiContext().FileApi; - const NTQQMsgApi = core.getApiContext().MsgApi; + const NTQQGroupApi = core.apis.GroupApi; + const NTQQUserApi = core.apis.UserApi; + const NTQQFileApi = core.apis.FileApi; + const NTQQMsgApi = core.apis.MsgApi; const logger = core.context.logger; const resMsg: OB11Message = { self_id: parseInt(core.selfInfo.uin), @@ -362,7 +362,7 @@ export class OB11Constructor { } static async PrivateEvent(core: NapCatCore, msg: RawMessage): Promise { - const NTQQUserApi = core.getApiContext().UserApi; + const NTQQUserApi = core.apis.UserApi; if (msg.chatType !== ChatType.friend) { return; } @@ -400,9 +400,9 @@ export class OB11Constructor { } static async GroupEvent(core: NapCatCore, msg: RawMessage): Promise { - const NTQQGroupApi = core.getApiContext().GroupApi; - const NTQQUserApi = core.getApiContext().UserApi; - const NTQQMsgApi = core.getApiContext().MsgApi; + const NTQQGroupApi = core.apis.GroupApi; + const NTQQUserApi = core.apis.UserApi; + const NTQQMsgApi = core.apis.MsgApi; const logger = core.context.logger; if (msg.chatType !== ChatType.group) { return; diff --git a/src/onebot/helper/log.ts b/src/onebot/helper/log.ts index a94b8038..2202acd3 100644 --- a/src/onebot/helper/log.ts +++ b/src/onebot/helper/log.ts @@ -24,7 +24,7 @@ export async function logOB11Message(coreContext: NapCatCore, ob11Message: OB11M // group = await coreContext.ApiContext.GroupApi.getGroup(ob11Message.group_id!.toString()); prefix += '转发消息[外部来源] '; } else { - group = await coreContext.ApiContext.GroupApi.getGroup(ob11Message.group_id!.toString()); + group = await coreContext.apis.GroupApi.getGroup(ob11Message.group_id!.toString()); prefix += `群[${group?.groupName}(${ob11Message.group_id})] `; } } @@ -35,7 +35,7 @@ export async function logOB11Message(coreContext: NapCatCore, ob11Message: OB11M if (segment.type === 'text') { msgParts.push(segment.data.text); } else if (segment.type === 'at') { - const groupMember = await coreContext.ApiContext.GroupApi.getGroupMember(ob11Message.group_id!, segment.data.qq!); + const groupMember = await coreContext.apis.GroupApi.getGroupMember(ob11Message.group_id!, segment.data.qq!); msgParts.push(spSegColor(`[@${groupMember?.cardName || groupMember?.nick}(${segment.data.qq})]`)); } else if (segment.type === 'reply') { msgParts.push(spSegColor(`[回复消息|id:${segment.data.id}]`)); diff --git a/src/onebot/helper/msg.ts b/src/onebot/helper/msg.ts index 2fec81c8..9a18f635 100644 --- a/src/onebot/helper/msg.ts +++ b/src/onebot/helper/msg.ts @@ -80,11 +80,11 @@ export class SendMsgElementConstructor { } static async pic(coreContext: NapCatCore, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise { - const NTQQGroupApi = coreContext.getApiContext().GroupApi; - const NTQQUserApi = coreContext.getApiContext().UserApi; - const NTQQFileApi = coreContext.getApiContext().FileApi; - const NTQQMsgApi = coreContext.getApiContext().MsgApi; - const NTQQFriendApi = coreContext.getApiContext().FriendApi; + const NTQQGroupApi = coreContext.apis.GroupApi; + const NTQQUserApi = coreContext.apis.UserApi; + const NTQQFileApi = coreContext.apis.FileApi; + const NTQQMsgApi = coreContext.apis.MsgApi; + const NTQQFriendApi = coreContext.apis.FriendApi; const logger = coreContext.context.logger; const { md5, fileName, path, fileSize } = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType); if (fileSize === 0) { @@ -115,11 +115,11 @@ export class SendMsgElementConstructor { } static async file(coreContext: NapCatCore, filePath: string, fileName: string = '', folderId: string = ''): Promise { - const NTQQGroupApi = coreContext.getApiContext().GroupApi; - const NTQQUserApi = coreContext.getApiContext().UserApi; - const NTQQFileApi = coreContext.getApiContext().FileApi; - const NTQQMsgApi = coreContext.getApiContext().MsgApi; - const NTQQFriendApi = coreContext.getApiContext().FriendApi; + const NTQQGroupApi = coreContext.apis.GroupApi; + const NTQQUserApi = coreContext.apis.UserApi; + const NTQQFileApi = coreContext.apis.FileApi; + const NTQQMsgApi = coreContext.apis.MsgApi; + const NTQQFriendApi = coreContext.apis.FriendApi; const logger = coreContext.context.logger; const { md5, fileName: _fileName, path, fileSize } = await NTQQFileApi.uploadFile(filePath, ElementType.FILE); if (fileSize === 0) { @@ -140,11 +140,11 @@ export class SendMsgElementConstructor { } static async video(coreContext: NapCatCore, filePath: string, fileName: string = '', diyThumbPath: string = '', videotype: viedo_type = viedo_type.VIDEO_FORMAT_MP4): Promise { - const NTQQGroupApi = coreContext.getApiContext().GroupApi; - const NTQQUserApi = coreContext.getApiContext().UserApi; - const NTQQFileApi = coreContext.getApiContext().FileApi; - const NTQQMsgApi = coreContext.getApiContext().MsgApi; - const NTQQFriendApi = coreContext.getApiContext().FriendApi; + const NTQQGroupApi = coreContext.apis.GroupApi; + const NTQQUserApi = coreContext.apis.UserApi; + const NTQQFileApi = coreContext.apis.FileApi; + const NTQQMsgApi = coreContext.apis.MsgApi; + const NTQQFriendApi = coreContext.apis.FriendApi; const logger = coreContext.context.logger; const { fileName: _fileName, path, fileSize, md5 } = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO); if (fileSize === 0) { @@ -228,11 +228,11 @@ export class SendMsgElementConstructor { } static async ptt(coreContext: NapCatCore, pttPath: string): Promise { - const NTQQGroupApi = coreContext.getApiContext().GroupApi; - const NTQQUserApi = coreContext.getApiContext().UserApi; - const NTQQFileApi = coreContext.getApiContext().FileApi; - const NTQQMsgApi = coreContext.getApiContext().MsgApi; - const NTQQFriendApi = coreContext.getApiContext().FriendApi; + const NTQQGroupApi = coreContext.apis.GroupApi; + const NTQQUserApi = coreContext.apis.UserApi; + const NTQQFileApi = coreContext.apis.FileApi; + const NTQQMsgApi = coreContext.apis.MsgApi; + const NTQQFriendApi = coreContext.apis.FriendApi; const logger = coreContext.context.logger; const { converted, diff --git a/src/onebot/helper/quick.ts b/src/onebot/helper/quick.ts index 02a0158a..ba9da31a 100644 --- a/src/onebot/helper/quick.ts +++ b/src/onebot/helper/quick.ts @@ -20,7 +20,7 @@ async function handleMsg(coreContext: NapCatCore, msg: OB11Message, quickAction: const reply = quickAction.reply; const peer: Peer = { chatType: ChatType.friend, - peerUid: await coreContext.getApiContext().UserApi.getUidByUin(msg.user_id.toString()) as string, + peerUid: await coreContext.apis.UserApi.getUidByUin(msg.user_id.toString()) as string, }; if (msg.message_type == 'private') { if (msg.sub_type === 'group') { @@ -35,7 +35,7 @@ async function handleMsg(coreContext: NapCatCore, msg: OB11Message, quickAction: let replyMessage: OB11MessageData[] = []; if (msg.message_type == 'group') { - group = await coreContext.getApiContext().GroupApi.getGroup(msg.group_id!.toString()); + group = await coreContext.apis.GroupApi.getGroup(msg.group_id!.toString()); replyMessage.push({ type: 'reply', data: { @@ -59,7 +59,7 @@ async function handleMsg(coreContext: NapCatCore, msg: OB11Message, quickAction: async function handleGroupRequest(coreContext: NapCatCore, request: OB11GroupRequestEvent, quickAction: QuickActionGroupRequest) { if (!isNull(quickAction.approve)) { - coreContext.getApiContext().GroupApi.handleGroupRequest( + coreContext.apis.GroupApi.handleGroupRequest( request.flag, quickAction.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject, quickAction.reason, @@ -69,7 +69,7 @@ async function handleGroupRequest(coreContext: NapCatCore, request: OB11GroupReq async function handleFriendRequest(coreContext: NapCatCore, request: OB11FriendRequestEvent, quickAction: QuickActionFriendRequest) { if (!isNull(quickAction.approve)) { - coreContext.getApiContext().FriendApi.handleFriendRequest(request.flag, !!quickAction.approve).then().catch(coreContext.context.logger.logError); + coreContext.apis.FriendApi.handleFriendRequest(request.flag, !!quickAction.approve).then().catch(coreContext.context.logger.logError); } } diff --git a/src/onebot/main.ts b/src/onebot/main.ts index 2f281b66..3833f60a 100644 --- a/src/onebot/main.ts +++ b/src/onebot/main.ts @@ -2,7 +2,8 @@ import { BuddyListener, BuddyReqType, ChatType, - GroupListener, GroupNotifyTypes, + GroupListener, + GroupNotifyTypes, InstanceContext, MsgListener, NapCatCore, @@ -12,7 +13,13 @@ import { OB11Config } from './helper/config'; import { NapCatPathWrapper } from '@/common/framework/napcat'; import { OneBotApiContextType } from '@/onebot/types'; import { OneBotFriendApi, OneBotGroupApi, OneBotUserApi } from './api'; -import { OB11ActiveHttpAdapter, OB11ActiveWebSocketAdapter, OB11NetworkManager, OB11PassiveHttpAdapter, OB11PassiveWebSocketAdapter } from '@/onebot/network'; +import { + OB11ActiveHttpAdapter, + OB11ActiveWebSocketAdapter, + OB11NetworkManager, + OB11PassiveHttpAdapter, + OB11PassiveWebSocketAdapter, +} from '@/onebot/network'; import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent'; import { MessageUnique } from '@/common/utils/MessageUnique'; import { OB11Constructor } from '@/onebot/helper/data'; @@ -53,7 +60,7 @@ export class NapCatOneBot11Adapter { } async InitOneBot() { - const NTQQUserApi = this.core.getApiContext().UserApi; + const NTQQUserApi = this.core.apis.UserApi; const selfInfo = this.core.selfInfo; const ob11Config = this.config.configData; @@ -117,7 +124,7 @@ export class NapCatOneBot11Adapter { const msgListener = new MsgListener(); msgListener.onInputStatusPush = async data => { - const uin = await this.core.ApiContext.UserApi.getUinByUidV2(data.fromUin); + const uin = await this.core.apis.UserApi.getUinByUidV2(data.fromUin); this.context.logger.log(`[Notice] [输入状态] ${uin} ${data.statusText}`); await this.networkManager.emitEvent(new OB11InputStatusEvent( this.core, @@ -181,7 +188,7 @@ export class NapCatOneBot11Adapter { return; } try { - const requesterUin = await this.core.ApiContext.UserApi.getUinByUidV2(req.friendUid); + const requesterUin = await this.core.apis.UserApi.getUinByUidV2(req.friendUid); await this.networkManager.emitEvent(new OB11FriendRequestEvent( this.core, parseInt(requesterUin!), @@ -230,7 +237,7 @@ export class NapCatOneBot11Adapter { GroupNotifyTypes.ADMIN_UNSET, GroupNotifyTypes.ADMIN_UNSET_OTHER ].includes(notify.type)) { - const member1 = await this.core.ApiContext.GroupApi.getGroupMember(notify.group.groupCode, notify.user1.uid); + const member1 = await this.core.apis.GroupApi.getGroupMember(notify.group.groupCode, notify.user1.uid); this.context.logger.logDebug('有管理员变动通知'); // refreshGroupMembers(notify.group.groupCode).then(); @@ -248,16 +255,16 @@ export class NapCatOneBot11Adapter { this.networkManager.emitEvent(groupAdminNoticeEvent) .catch(e => this.context.logger.logError('处理群管理员变动失败', e)); } else { - this.context.logger.logDebug('获取群通知的成员信息失败', notify, this.core.ApiContext.GroupApi.getGroup(notify.group.groupCode)); + this.context.logger.logDebug('获取群通知的成员信息失败', notify, this.core.apis.GroupApi.getGroup(notify.group.groupCode)); } } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) { this.context.logger.logDebug('有成员退出通知', notify); - const member1Uin = (await this.core.ApiContext.UserApi.getUinByUidV2(notify.user1.uid))!; + const member1Uin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid))!; let operatorId = member1Uin; let subType: GroupDecreaseSubType = 'leave'; if (notify.user2.uid) { // 是被踢的 - const member2Uin = await this.core.ApiContext.UserApi.getUinByUidV2(notify.user2.uid); + const member2Uin = await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid); if (member2Uin) { operatorId = member2Uin; } @@ -278,9 +285,9 @@ export class NapCatOneBot11Adapter { ].includes(notify.type) && notify.status == 1) { this.context.logger.logDebug('有加群请求'); try { - let requestUin = (await this.core.ApiContext.UserApi.getUinByUidV2(notify.user1.uid))!; + let requestUin = (await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid))!; if (isNaN(parseInt(requestUin))) { - requestUin = (await this.core.ApiContext.UserApi.getUserDetailInfo(notify.user1.uid)).uin; + requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin; } const groupRequestEvent = new OB11GroupRequestEvent( this.core, @@ -377,7 +384,7 @@ export class NapCatOneBot11Adapter { let operatorId = message.senderUin; for (const element of message.elements) { const operatorUid = element.grayTipElement?.revokeElement.operatorUid; - const operator = await this.core.ApiContext.GroupApi.getGroupMember(message.peerUin, operatorUid); + const operator = await this.core.apis.GroupApi.getGroupMember(message.peerUin, operatorUid); operatorId = operator?.uin || message.senderUin; } const groupRecallEvent = new OB11GroupRecallNoticeEvent(