refactor: /get_group_member_info

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'];
+    type ListenerType = NodeIKernelGroupListener['onMemberInfoChange'];
-   // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', 
+    type EventType = NodeIKernelGroupService['getMemberInfo'];
-    return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced);
+    // NTEventDispatch.CreatListenerFunction('NodeIKernelGroupListener/onGroupMemberInfoUpdate', 
+    //return napCatCore.session.getGroupService().getMemberInfo(GroupCode, [uid], forced);
+    const [ret, _groupCode, _changeType, _members] = await NTEventDispatch.CallNormalEvent
+      <EventType, ListenerType>
+      (
+        'NodeIKernelGroupService/getMemberInfo',
+        'NodeIKernelGroupListener/onMemberInfoChange',
+        1,
+        5000,
+        (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
+          return groupCode == GroupCode && members.has(uid);
+        },
+        GroupCode, [uid], forced
+      );
+    return _members.get(uid);
   }
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
     const groupService = napCatCore.session.getGroupService();

src/core/src/services/NodeIKernelGroupService.ts

@@ -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<GeneralCallResult>;
   //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
 
   kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>;

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';
-
+import { selfInfo } from '@/core/data';
-// no_cache get时传字符串
 const SchemaData = {
   type: 'object',
   properties: {
@@ -26,22 +24,15 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
   actionName = ActionName.GetGroupMemberInfo;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-
+    const isNocache = payload.no_cache == true || payload.no_cache === 'true';
-    const group = await getGroup(payload.group_id.toString());
+    let uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
-    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
+    if (!uid) {
-    const isPrivilege = role === 3 || role === 4;
+      throw (`Uin2Uid Error ${payload.user_id}不存在`);
-    if (!group) {
-      throw (`群(${payload.group_id})不存在`);
     }
-    if (payload.no_cache == true || payload.no_cache === 'true') {
+    let member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
-      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);
@@ -50,6 +41,11 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
       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++) {

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<typeof SchemaData>;
+
+class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
+  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;

src/onebot11/main.ts

@@ -291,7 +291,7 @@ export class NapCatOnebot11 {
       }
     };
     groupListener.onMemberInfoChange = async (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
-      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) {