diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index 9445759b..c700b9ee 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -29,7 +29,7 @@ export class NTQQGroupApi { this.groups = await this.getGroups(); for (const group of this.groups) { this.groupCache.set(group.groupCode, group); - let data = await this.getGroupMembers(group.groupCode, 3000); + const data = await this.getGroupMembers(group.groupCode, 3000); this.groupMemberCache.set(group.groupCode, data); } this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`); @@ -42,12 +42,12 @@ export class NTQQGroupApi { type ListenerType = NodeIKernelGroupListener['onGroupListUpdate']; const [_retData, _updateType, groupList] = await this.core.eventWrapper.CallNormalEvent<(force: boolean) => Promise, ListenerType> ( - 'NodeIKernelGroupService/getGroupList', - 'NodeIKernelGroupListener/onGroupListUpdate', - 1, - 5000, - () => true, - forced, + 'NodeIKernelGroupService/getGroupList', + 'NodeIKernelGroupListener/onGroupListUpdate', + 1, + 5000, + () => true, + forced, ); return groupList; } @@ -167,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.apis.UserApi.getUidByUin(uin); + const uid = await this.core.apis.UserApi.getUidByUinV2(uin); if (uid) { uids.push(uid); } @@ -240,14 +240,14 @@ export class NTQQGroupApi { async getSingleScreenNotifies(num: number) { const [_retData, _doubt, _seq, notifies] = await this.core.eventWrapper.CallNormalEvent<(arg1: boolean, arg2: string, arg3: number) => Promise, (doubt: boolean, seq: string, notifies: GroupNotify[]) => void> ( - 'NodeIKernelGroupService/getSingleScreenNotifies', - 'NodeIKernelGroupListener/onGroupSingleScreenNotifies', - 1, - 5000, - () => true, - false, - '', - num, + 'NodeIKernelGroupService/getSingleScreenNotifies', + 'NodeIKernelGroupListener/onGroupSingleScreenNotifies', + 1, + 5000, + () => true, + false, + '', + num, ); return notifies; } @@ -258,16 +258,16 @@ export class NTQQGroupApi { // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', //return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced); const [, , , _members] = await this.core.eventWrapper.CallNormalEvent - ( - 'NodeIKernelGroupService/getMemberInfo', - 'NodeIKernelGroupListener/onMemberInfoChange', - 1, - 5000, - (groupCode: string, changeType: number, members: Map) => { - return groupCode == GroupCode && members.has(uid); - }, - GroupCode, [uid], forced, - ); + ( + 'NodeIKernelGroupService/getMemberInfo', + 'NodeIKernelGroupListener/onMemberInfoChange', + 1, + 5000, + (groupCode: string, changeType: number, members: Map) => { + return groupCode == GroupCode && members.has(uid); + }, + GroupCode, [uid], forced, + ); return _members.get(uid); } @@ -310,7 +310,7 @@ export class NTQQGroupApi { 'NodeIKernelGroupService/getGroupRecommendContactArkJson', 5000, GroupCode, - ); + ); return ret.arkJson; } diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 2a6909f0..f8ce3fd6 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -231,13 +231,13 @@ export class NTQQUserApi { //后期改成流水线处理 async getUidByUinV2(Uin: string) { - let uid = (await this.context.session.getProfileService().getUidByUin('FriendsServiceImpl', [Uin])).get(Uin); + let uid = (await this.context.session.getProfileService().getUidByUinV2('FriendsServiceImpl', [Uin])).get(Uin); if (uid) return uid; uid = (await this.context.session.getGroupService().getUidByUins([Uin])).uids.get(Uin); if (uid) return uid; uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin); if (uid) return uid; - // console.log((await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true))); + // console.log((await this.core.getApiContext().FriendApi.getBuddyIdMapCache(true))); uid = (await this.core.apis.FriendApi.getBuddyIdMapCache(true)).getValue(Uin);//从Buddy缓存获取Uid if (uid) return uid; uid = (await this.core.apis.FriendApi.getBuddyIdMap(true)).getValue(Uin); diff --git a/src/core/services/NodeIKernelProfileService.ts b/src/core/services/NodeIKernelProfileService.ts index 2e0885e7..92cc9b84 100644 --- a/src/core/services/NodeIKernelProfileService.ts +++ b/src/core/services/NodeIKernelProfileService.ts @@ -18,7 +18,7 @@ export enum ProfileBizType { export interface NodeIKernelProfileService { - getUidByUin(callfrom: string, uin: Array): Promise>;//uin->uid + getUidByUinV2(callfrom: string, uin: Array): Promise>;//uin->uid getUinByUid(callfrom: string, uid: Array): Promise>; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index e18a3f3e..bc25644e 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/src/onebot/action/file/GetFile.ts @@ -62,7 +62,7 @@ export class GetFileBase extends BaseAction { if (isGroup) { peer = { chatType: ChatType.group, peerUid: peerUin }; } - const PeerUid = await NTQQUserApi.getUidByUin(peerUin); + const PeerUid = await NTQQUserApi.getUidByUinV2(peerUin); if (PeerUid) { const isBuddy = await NTQQFriendApi.isBuddy(PeerUid); if (isBuddy) { diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 9c5a44b4..545520be 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -32,7 +32,7 @@ export default class GetFriendMsgHistory extends BaseAction { const NTQQMsgApi = this.CoreContext.apis.MsgApi; const NTQQFriendApi = this.CoreContext.apis.FriendApi; //处理参数 - const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); const MsgCount = payload.count || 20; const isReverseOrder = payload.reverseOrder || true; if (!uid) throw `记录${payload.user_id}不存在`; diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index 8a10fb58..8291d185 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts @@ -22,7 +22,7 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction 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()); + const peerUid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!peerUid) { throw `私聊${payload.user_id}不存在`; } diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index 9903b88c..7bac2431 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -25,7 +25,7 @@ class GetGroupMemberInfo extends BaseAction { 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()); + const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!uid) { throw (`Uin2Uid Error ${payload.user_id}不存在`); } diff --git a/src/onebot/action/group/SetGroupAdmin.ts b/src/onebot/action/group/SetGroupAdmin.ts index 2a1dfb12..8a33ad57 100644 --- a/src/onebot/action/group/SetGroupAdmin.ts +++ b/src/onebot/action/group/SetGroupAdmin.ts @@ -22,7 +22,7 @@ export default class SetGroupAdmin extends BaseAction { async _handle(payload: Payload): Promise { const NTQQGroupApi = this.CoreContext.apis.GroupApi; const NTQQUserApi = this.CoreContext.apis.UserApi; - const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const uid = await NTQQUserApi.getUidByUinV2(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); return null; diff --git a/src/onebot/action/group/SetGroupBan.ts b/src/onebot/action/group/SetGroupBan.ts index 1c62f7b6..9ba52f46 100644 --- a/src/onebot/action/group/SetGroupBan.ts +++ b/src/onebot/action/group/SetGroupBan.ts @@ -21,7 +21,7 @@ export default class SetGroupBan extends BaseAction { async _handle(payload: Payload): Promise { const NTQQGroupApi = this.CoreContext.apis.GroupApi; const NTQQUserApi = this.CoreContext.apis.UserApi; - const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!uid) throw new Error('uid error'); await NTQQGroupApi.banMember(payload.group_id.toString(), [{ uid: uid, timeStamp: parseInt(payload.duration.toString()) }]); diff --git a/src/onebot/action/group/SetGroupKick.ts b/src/onebot/action/group/SetGroupKick.ts index b8ad5d63..5546985d 100644 --- a/src/onebot/action/group/SetGroupKick.ts +++ b/src/onebot/action/group/SetGroupKick.ts @@ -23,7 +23,7 @@ export default class SetGroupKick extends BaseAction { 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()); + const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!uid) throw new Error('get Uid Error'); await NTQQGroupApi.kickMember(payload.group_id.toString(), [uid], rejectReq); return null; diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index 48d32d3a..06ffb9e9 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/src/onebot/action/msg/ForwardSingleMsg.ts @@ -20,7 +20,7 @@ class ForwardSingleMsg extends BaseAction { protected async getTargetPeer(payload: Payload): Promise { const NTQQUserApi = this.CoreContext.apis.UserApi; if (payload.user_id) { - const peerUid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const peerUid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!peerUid) { throw new Error(`无法找到私聊对象${payload.user_id}`); } diff --git a/src/onebot/action/msg/MarkMsgAsRead.ts b/src/onebot/action/msg/MarkMsgAsRead.ts index b66ae47e..ab7f6ddf 100644 --- a/src/onebot/action/msg/MarkMsgAsRead.ts +++ b/src/onebot/action/msg/MarkMsgAsRead.ts @@ -18,7 +18,7 @@ class MarkMsgAsRead extends BaseAction { 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()); + const peerUid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!peerUid) { throw `私聊${payload.user_id}不存在`; } diff --git a/src/onebot/action/msg/SendMsg/create-send-elements.ts b/src/onebot/action/msg/SendMsg/create-send-elements.ts index b9a82253..364741d0 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.apis.UserApi.getUidByUin(atQQ); + const uid = await coreContext.apis.UserApi.getUidByUinV2(atQQ); if (!uid) throw new Error('Get Uid Error'); return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, ''); }, diff --git a/src/onebot/action/msg/SendMsg/index.ts b/src/onebot/action/msg/SendMsg/index.ts index 3f6439ae..24491e63 100644 --- a/src/onebot/action/msg/SendMsg/index.ts +++ b/src/onebot/action/msg/SendMsg/index.ts @@ -99,7 +99,7 @@ async function createContext(coreContext: NapCatCore, payload: OB11PostSendMsg, }; } if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) { - const Uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const Uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); const isBuddy = await NTQQFriendApi.isBuddy(Uid!); //console.log("[调试代码] UIN:", payload.user_id, " UID:", Uid, " IsBuddy:", isBuddy); return { @@ -137,7 +137,7 @@ export class SendMsg extends BaseAction { // return { valid: false, message: `群${payload.group_id}不存在` }; // } if (payload.user_id && payload.message_type !== 'group') { - const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); const isBuddy = await NTQQFriendApi.isBuddy(uid!); // 此处有问题 if (!isBuddy) { diff --git a/src/onebot/action/user/SendLike.ts b/src/onebot/action/user/SendLike.ts index 231687c3..87d11e31 100644 --- a/src/onebot/action/user/SendLike.ts +++ b/src/onebot/action/user/SendLike.ts @@ -22,7 +22,7 @@ export default class SendLike extends BaseAction { //logDebug('点赞参数', payload); try { const qq = payload.user_id.toString(); - const uid: string = await NTQQUserApi.getUidByUin(qq) || ''; + const uid: string = await NTQQUserApi.getUidByUinV2(qq) || ''; const result = await NTQQUserApi.like(uid, parseInt(payload.times?.toString()) || 1); //logDebug('点赞结果', result); if (result.result !== 0) { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index a5d7209e..bf51183b 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -88,7 +88,7 @@ export class OB11Constructor { //resMsg.sender.nickname = user.info.nick; } else if (msg.chatType == ChatType.temp) { resMsg.sub_type = 'group'; - let ret = await NTQQMsgApi.getTempChatInfo(ChatType.temp, msg.senderUid); + const ret = await NTQQMsgApi.getTempChatInfo(ChatType.temp, msg.senderUid); if (ret.result === 0) { resMsg.group_id = parseInt(ret.tmpChatInfo!.groupCode); resMsg.sender.nickname = ret.tmpChatInfo!.fromNick; @@ -278,13 +278,13 @@ export class OB11Constructor { chatType: msg.chatType, guildId: '', }, - msg.msgId, - msg.msgSeq, - msg.senderUid, - element.elementId, - element.elementType.toString(), - element.pttElement.fileSize || '0', - element.pttElement.fileUuid || '', + msg.msgId, + msg.msgSeq, + msg.senderUid, + element.elementId, + element.elementType.toString(), + element.pttElement.fileSize || '0', + element.pttElement.fileUuid || '', ); //以uuid作为文件名 } else if (element.arkElement) { @@ -477,7 +477,7 @@ export class OB11Constructor { logger.logDebug(`收到我被踢出或退群提示, 群${msg.peerUid}`, groupElement); NTQQGroupApi.quitGroup(msg.peerUid).then(); try { - const adminUin = (await NTQQGroupApi.getGroupMember(msg.peerUid, groupElement.adminUid))?.uin || (await NTQQUserApi.getUidByUin(groupElement.adminUid)); + const adminUin = (await NTQQGroupApi.getGroupMember(msg.peerUid, groupElement.adminUid))?.uin || (await NTQQUserApi.getUidByUinV2(groupElement.adminUid)); if (adminUin) { return new OB11GroupDecreaseEvent( core, diff --git a/src/onebot/helper/quick.ts b/src/onebot/helper/quick.ts index ba9da31a..a5a73f3f 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.apis.UserApi.getUidByUin(msg.user_id.toString()) as string, + peerUid: await coreContext.apis.UserApi.getUidByUinV2(msg.user_id.toString()) as string, }; if (msg.message_type == 'private') { if (msg.sub_type === 'group') {