diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index 237df7db..be5f920f 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -261,7 +261,7 @@ export class NTQQGroupApi { ( 'NodeIKernelGroupListener/onMemberInfoChange', 1, - forced ? 5000 : 500, + forced ? 5000 : 250, (params) => { return params === GroupCode; }, @@ -269,7 +269,7 @@ export class NTQQGroupApi { const EventFunc = this.core.eventWrapper.createEventFunction('NodeIKernelGroupService/getMemberInfo'); const retData = await EventFunc!(GroupCode, [uid], forced); if (retData.result !== 0) { - throw new Error(`获取群成员信息失败: ${retData.errMsg}`); + throw new Error(`${retData.errMsg}`); } const result = await Listener as unknown; let member: GroupMember | undefined; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index f75fc340..bf09fd77 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -120,7 +120,7 @@ export class NTQQUserApi { ...profile.simpleInfo.vasInfo, ...profile.commonExt, ...profile.simpleInfo.baseInfo, - qqLevel: profile.commonExt.qqLevel, + qqLevel: profile.commonExt?.qqLevel, age: profile.simpleInfo.baseInfo.age, pendantId: '', }; @@ -130,7 +130,7 @@ export class NTQQUserApi { async getUserDetailInfo(uid: string) { const ret = await this.fetchUserDetailInfo(uid, UserDetailSource.KDB); if (ret.uin === '0') { - console.log('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.') + this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.') return await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER); } return ret; @@ -207,9 +207,9 @@ export class NTQQUserApi { //后期改成流水线处理 async getUinByUidV2(Uid: string) { - let uin = (await this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid); + let uin = (await this.context.session.getGroupService().getUinByUids([Uid])).uins.get(Uid); if (uin) return uin; - uin = (await this.context.session.getGroupService().getUinByUids([Uid])).uins.get(Uid); + uin = (await this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid); if (uin) return uin; uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid); if (uin) return uin; diff --git a/src/onebot/action/group/GetGroupMemberInfo.ts b/src/onebot/action/group/GetGroupMemberInfo.ts index e3fecfb5..0c24f599 100644 --- a/src/onebot/action/group/GetGroupMemberInfo.ts +++ b/src/onebot/action/group/GetGroupMemberInfo.ts @@ -3,6 +3,7 @@ import { OB11Constructor } from '../../helper/data'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; +import { GroupMember } from '@/core'; const SchemaData = { type: 'object', @@ -23,23 +24,25 @@ class GetGroupMemberInfo extends BaseAction { async _handle(payload: Payload) { const NTQQUserApi = this.CoreContext.apis.UserApi; const NTQQGroupApi = this.CoreContext.apis.GroupApi; - const NTQQWebApi = this.CoreContext.apis.WebApi; const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache; const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString()); if (!uid) throw (`Uin2Uid Error ${payload.user_id}不存在`); - const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache); - if (!member) throw (`群(${payload.group_id})成员${payload.user_id}不存在`); - try { - const info = (await NTQQUserApi.getUserDetailInfo(member.uid)); - this.CoreContext.context.logger.logDebug('群成员详细信息结果', info); - Object.assign(member, info); - } catch (e) { - this.CoreContext.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息', e); + const [member, info] = await Promise.allSettled([ + NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache), + NTQQUserApi.getUserDetailInfo(uid), + ]); + if (member.status !== 'fulfilled') throw (`群(${payload.group_id})成员${payload.user_id}不存在 ${member.reason}`); + if (info.status === 'fulfilled') { + this.CoreContext.context.logger.logDebug("群成员详细信息结果", info.value); + Object.assign(member, info.value); + } else { + this.CoreContext.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息 ${info.reason}`); } const date = Math.round(Date.now() / 1000); - const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); - retMember.last_sent_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString()); - retMember.join_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString()); + const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member.value as GroupMember); + const Member = await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id); + retMember.last_sent_time = parseInt(Member?.lastSpeakTime || date.toString()); + retMember.join_time = parseInt(Member?.joinTime || date.toString()); return retMember; } }