diff --git a/src/core/src/apis/group.ts b/src/core/src/apis/group.ts index f9906e5e..c6195cb2 100644 --- a/src/core/src/apis/group.ts +++ b/src/core/src/apis/group.ts @@ -1,5 +1,5 @@ import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group, MemberExtSourceType, GroupNotifyTypes, ChatType, Peer, GroupListUpdateType } from '../entities'; -import { GeneralCallResult, NTQQUserApi, NodeIKernelGroupListener, napCatCore } from '@/core'; +import { GeneralCallResult, NTQQUserApi, NodeIKernelGroupListener, NodeIKernelGroupService, napCatCore } from '@/core'; import { NTEventDispatch } from '@/common/utils/EventTask'; import { log } from '@/common/utils/log'; import { groupMembers } from '../data'; @@ -159,9 +159,23 @@ export class NTQQGroupApi { return notifies; } static async getGroupMemberV2(GroupCode: string, uid: string, forced = false) { - //type ListenerType = NodeIKernelGroupListener['onGroupMemberInfoUpdate']; - // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', - return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced); + type ListenerType = NodeIKernelGroupListener['onMemberInfoChange']; + type EventType = NodeIKernelGroupService['getMemberInfo']; + // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', + //return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced); + const [ret, _groupCode, _changeType, _members] = await NTEventDispatch.CallNormalEvent + + ( + '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); } static async getGroupMembers(groupQQ: string, num = 3000): Promise> { const groupService = napCatCore.session.getGroupService(); diff --git a/src/core/src/services/NodeIKernelGroupService.ts b/src/core/src/services/NodeIKernelGroupService.ts index 754eb1c1..1030ecb9 100644 --- a/src/core/src/services/NodeIKernelGroupService.ts +++ b/src/core/src/services/NodeIKernelGroupService.ts @@ -50,7 +50,7 @@ export interface NodeIKernelGroupService { //26702(其实更早 但是我不知道) getGroupLatestEssenceList(groupCode: string): Promise; - + //26702(其实更早 但是我不知道) shareDigest(Req: { appId: string, @@ -112,7 +112,7 @@ export interface NodeIKernelGroupService { searchMember(sceneId: string, keywords: string[]): unknown; - getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): unknown; + getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise; //getMemberInfo [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ] kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise; diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts index 32e8c2e6..08b166e5 100644 --- a/src/onebot11/action/group/GetGroupMemberInfo.ts +++ b/src/onebot11/action/group/GetGroupMemberInfo.ts @@ -1,5 +1,4 @@ import { OB11GroupMember } from '../../types'; -import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data'; import { OB11Constructor } from '../../constructor'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; @@ -8,8 +7,7 @@ import { logDebug } from '@/common/utils/log'; import { WebApi } from '@/core/apis/webapi'; import { NTQQGroupApi } from '@/core'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; - -// no_cache get时传字符串 +import { selfInfo } from '@/core/data'; const SchemaData = { type: 'object', properties: { @@ -26,22 +24,15 @@ class GetGroupMemberInfo extends BaseAction { actionName = ActionName.GetGroupMemberInfo; PayloadSchema = SchemaData; protected async _handle(payload: Payload) { - - const group = await getGroup(payload.group_id.toString()); - const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role; - const isPrivilege = role === 3 || role === 4; - if (!group) { - throw (`群(${payload.group_id})不存在`); + const isNocache = payload.no_cache == true || payload.no_cache === 'true'; + let uid = await NTQQUserApi.getUidByUin(payload.user_id.toString()); + if (!uid) { + throw (`Uin2Uid Error ${payload.user_id}不存在`); } - if (payload.no_cache == true || payload.no_cache === 'true') { - groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString())); - } - const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString()); - //早返回 + let member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache); if (!member) { throw (`群(${payload.group_id})成员${payload.user_id}不存在`); } - //console.log('GetGroupMemberInfo', JSON.stringify(await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), member.uid, true), null, 4)); try { const info = (await NTQQUserApi.getUserDetailInfo(member.uid)); logDebug('群成员详细信息结果', info); @@ -50,6 +41,11 @@ class GetGroupMemberInfo extends BaseAction { logDebug('获取群成员详细信息失败, 只能返回基础信息', e); } const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); + let SelfInfoInGroup = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), selfInfo.uid, isNocache); + let isPrivilege = false; + if (SelfInfoInGroup) { + isPrivilege = SelfInfoInGroup.role === 3 || SelfInfoInGroup.role === 4; + } if (isPrivilege) { const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); for (let i = 0, len = webGroupMembers.length; i < len; i++) { diff --git a/src/onebot11/action/group/GetGroupMemberInfoOld.ts b/src/onebot11/action/group/GetGroupMemberInfoOld.ts new file mode 100644 index 00000000..d0afe615 --- /dev/null +++ b/src/onebot11/action/group/GetGroupMemberInfoOld.ts @@ -0,0 +1,84 @@ +import { OB11GroupMember } from '../../types'; +import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data'; +import { OB11Constructor } from '../../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', + properties: { + group_id: { type: ['number', 'string'] }, + user_id: { type: ['number', 'string'] }, + no_cache: { type: ['boolean', 'string'] }, + }, + required: ['group_id', 'user_id'] +} as const satisfies JSONSchema; + +type Payload = FromSchema; + +class GetGroupMemberInfo extends BaseAction { + actionName = ActionName.GetGroupMemberInfo; + PayloadSchema = SchemaData; + protected async _handle(payload: Payload) { + if (requireMinNTQQBuild('26702')) { + let 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); + } else { + throw (`群(${payload.group_id})成员${payload.user_id}不存在`); + } + } + const group = await getGroup(payload.group_id.toString()); + const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role; + const isPrivilege = role === 3 || role === 4; + if (!group) { + throw (`群(${payload.group_id})不存在`); + } + if (payload.no_cache == true || payload.no_cache === 'true') { + groupMembers.set(group.groupCode, await NTQQGroupApi.getGroupMembers(payload.group_id.toString())); + } + const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString()); + //早返回 + if (!member) { + throw (`群(${payload.group_id})成员${payload.user_id}不存在`); + } + //console.log('GetGroupMemberInfo', JSON.stringify(await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), member.uid, true), null, 4)); + try { + const info = (await NTQQUserApi.getUserDetailInfo(member.uid)); + logDebug('群成员详细信息结果', info); + Object.assign(member, info); + } catch (e) { + logDebug('获取群成员详细信息失败, 只能返回基础信息', e); + } + const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member); + if (isPrivilege) { + const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString()); + for (let i = 0, len = webGroupMembers.length; i < len; i++) { + if (webGroupMembers[i]?.uin && webGroupMembers[i].uin === retMember.user_id) { + retMember.join_time = webGroupMembers[i]?.join_time; + retMember.last_sent_time = webGroupMembers[i]?.last_speak_time; + retMember.qage = webGroupMembers[i]?.qage; + retMember.level = webGroupMembers[i]?.lv.level.toString(); + } + } + } else { + const LastestMsgList = await NTQQGroupApi.getLastestMsg(payload.group_id.toString(), [payload.user_id.toString()]); + if (LastestMsgList?.msgList?.length && LastestMsgList?.msgList?.length > 0) { + const last_send_time = LastestMsgList.msgList[0].msgTime; + if (last_send_time && last_send_time != '0' && last_send_time != '') { + retMember.last_sent_time = parseInt(last_send_time); + retMember.join_time = Math.round(Date.now() / 1000);//兜底数据 防止群管乱杀 + } + } + } + return retMember; + } +} +export default GetGroupMemberInfo; \ No newline at end of file diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 141209d4..1b22ed8e 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -291,7 +291,7 @@ export class NapCatOnebot11 { } }; groupListener.onMemberInfoChange = async (groupCode: string, changeType: number, members: Map) => { - console.log("ob11 onMemberInfoChange", groupCode, changeType, members) + // console.log("ob11 onMemberInfoChange", groupCode, changeType, members) if (changeType === 1) { let member; for (const [key, value] of members) {