fix: code

src/core/apis/group.ts

@@ -33,6 +33,7 @@ export class NTQQGroupApi {
         this.groups = await this.getGroups();
         for (const group of this.groups) {
             this.groupCache.set(group.groupCode, group);
+            this.refreshGroupMemberCache(group.groupCode).then().catch(e => this.context.logger.logError(e));
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
         // process.pid 调试点
@@ -54,11 +55,13 @@ export class NTQQGroupApi {
             pageLimit: 300,
         }, pskey);
     }
+
     async getGroupShutUpMemberList(groupCode: string) {
         const data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', (group_id) => group_id === groupCode, 1, 1000);
         this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
         return (await data)[1];
     }
+
     async clearGroupNotifiesUnreadCount(uk: boolean) {
         return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
     }
@@ -140,18 +143,44 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
 
+    async refreshGroupMemberCache(groupCode: string) {
+        try {
+            const members = await this.getGroupMemberAll(groupCode, true);
+            // 首先填入基础信息
+            const existingMembers = this.groupMemberCache.get(groupCode) ?? new Map<string, GroupMember>();
+            members.result.infos.forEach((value, key) => {
+                existingMembers.set(value.uid, { ...value, ...existingMembers.get(value.uid) });
+            });
+            // 后台补全复杂信息
+            let event = (async () => {
+                let data = (await Promise.allSettled(members.result.ids.map(e => this.core.apis.UserApi.getUserDetailInfo(e.uid)))).filter(e => e.status === 'fulfilled').map(e => e.value);
+                data.forEach(e => {
+                    const existingMember = members.result.infos.get(e.uid);
+                    if (existingMember) {
+                        members.result.infos.set(e.uid, { ...existingMember, ...e });
+                    }
+                });
+                this.groupMemberCache.set(groupCode, members.result.infos);
+            })().then().catch(e => this.context.logger.logError(e));
+            // 处理首次空缺
+            if (!this.groupMemberCache.get(groupCode)) {
+                await event;
+            }
+        } catch (e) {
+            this.context.logger.logError(`刷新群成员缓存失败, ${e}`);
+        }
+    }
+
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();
+
+        // 检查群缓存
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
-            try {
-                members = await this.getGroupMembers(groupCodeStr);
-                this.groupMemberCache.set(groupCodeStr, members);
-            } catch (e) {
-                return null;
-            }
+            await this.refreshGroupMemberCache(groupCodeStr);
         }
+
         function getMember() {
             let member: GroupMember | undefined;
             if (isNumeric(memberUinOrUidStr)) {
@@ -162,9 +191,11 @@ export class NTQQGroupApi {
             return member;
         }
 
+
         let member = getMember();
+        // 不存在群友缓存 尝试刷新
         if (!member) {
-            members = await this.getGroupMembers(groupCodeStr);
+            await this.refreshGroupMemberCache(groupCode.toString());
             member = getMember();
         }
         return member;
@@ -253,29 +284,6 @@ export class NTQQGroupApi {
         return notifies;
     }
 
-    async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
-        const Listener = this.core.eventWrapper.registerListen(
-            'NodeIKernelGroupListener/onMemberInfoChange',
-            (params, _, members) => params === GroupCode && members.size > 0,
-            1,
-            forced ? 5000 : 250,
-        );
-        const retData = await (
-            this.core.eventWrapper
-                .createEventFunction('NodeIKernelGroupService/getMemberInfo')
-        )!(GroupCode, [uid], forced);
-        if (retData.result !== 0) {
-            throw new Error(`${retData.errMsg}`);
-        }
-        const result = await Listener as unknown;
-        let member: GroupMember | undefined;
-        if (Array.isArray(result) && result?.[2] instanceof Map) {
-            const members = result[2] as Map<string, GroupMember>;
-            member = members.get(uid);
-        }
-        return member;
-    }
-
     async searchGroup(groupCode: string) {
         const [, ret] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelSearchService/searchGroup',
@@ -316,89 +324,6 @@ export class NTQQGroupApi {
         return undefined;
     }
 
-    async tryGetGroupMembersV2(groupQQ: string, modeListener = false, num = 30, timeout = 100): Promise<{
-        infos: Map<string, GroupMember>;
-        finish: boolean;
-        hasNext: boolean | undefined;
-    }> {
-        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
-        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
-            .catch(() => { });
-        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
-        if (result.errCode !== 0) {
-            throw new Error('获取群成员列表出错,' + result.errMsg);
-        }
-        let resMode2;
-        if (modeListener) {
-            const ret = (await once)?.[0];
-            if (ret) {
-                resMode2 = ret;
-            }
-        }
-        this.context.session.getGroupService().destroyMemberListScene(sceneId);
-        return {
-            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
-            finish: result.result.finish,
-            hasNext: resMode2?.hasNext,
-        };
-    }
-
-    async GetGroupMembersV3(groupQQ: string, num = 3000, timeout = 2500): Promise<{
-        infos: Map<string, GroupMember>;
-        finish: boolean;
-        hasNext: boolean | undefined;
-        listenerMode: boolean;
-    }> {
-        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
-        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
-            .catch(() => { });
-        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
-        if (result.errCode !== 0) {
-            throw new Error('获取群成员列表出错,' + result.errMsg);
-        }
-        let resMode2;
-        if (result.result.finish && result.result.infos.size === 0) {
-            const ret = (await once)?.[0];
-            if (ret) {
-                resMode2 = ret;
-            }
-        }
-        this.context.session.getGroupService().destroyMemberListScene(sceneId);
-        return {
-            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
-            finish: result.result.finish,
-            hasNext: resMode2?.hasNext,
-            listenerMode: resMode2?.hasNext !== undefined
-        };
-    }
-
-    async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
-        if (no_cache) {
-            return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
-        }
-        let res = await this.GetGroupMembersV3(groupQQ, num);
-        let ret = res.infos;
-        if (res.infos.size === 0 && !res.listenerMode) {
-            res = await this.GetGroupMembersV3(groupQQ, num);
-            ret = res.infos;
-        }
-        if (res.infos.size === 0) {
-            ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
-        }
-        return ret;
-    }
-
-    async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
-        const groupService = this.context.session.getGroupService();
-        const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const result = await groupService.getNextMemberList(sceneId, undefined, num);
-        if (result.errCode !== 0) {
-            throw new Error('获取群成员列表出错,' + result.errMsg);
-        }
-        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`);
-        return result.result.infos;
-    }
-
     async getGroupFileCount(group_ids: Array<string>) {
         return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }

src/core/apis/user.ts

@@ -90,7 +90,7 @@ export class NTQQUserApi {
         };
         return RetUser;
     }
-
+    
     async getUserDetailInfo(uid: string): Promise<User> {
         let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {

src/core/index.ts

@@ -24,10 +24,10 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { hostname, systemName, systemVersion } from '@/common/system';
 import { NTEventWrapper } from '@/common/event';
-import { DataSource, GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/types';
+import { GroupMember, KickedOffLineInfo, SelfInfo, SelfStatusInfo } from '@/core/types';
 import { NapCatConfigLoader } from '@/core/helper/config';
 import os from 'node:os';
-import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
+import { NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { NTQQPacketApi } from './apis/packet';
 export * from './wrapper';
@@ -163,7 +163,6 @@ export class NapCatCore {
         msgListener.onAddSendMsg = (msg) => {
             this.context.logger.logMessage(msg, this.selfInfo);
         };
-        //await sleep(2500);
         this.context.session.getMsgService().addKernelMsgListener(
             proxiedListenerOf(msgListener, this.context.logger),
         );
@@ -185,92 +184,6 @@ export class NapCatCore {
         this.context.session.getProfileService().addKernelProfileListener(
             proxiedListenerOf(profileListener, this.context.logger),
         );
-
-        // 群相关
-        const groupListener = new NodeIKernelGroupListener();
-        groupListener.onGroupListUpdate = (updateType, groupList) => {
-            // console.log("onGroupListUpdate", updateType, groupList)
-            groupList.map(g => {
-                const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode);
-                //群成员数量变化 应该刷新缓存
-                if (existGroup && g.memberCount === existGroup.memberCount) {
-                    Object.assign(existGroup, g);
-                } else {
-                    this.apis.GroupApi.groupCache.set(g.groupCode, g);
-                    // 获取群成员
-                }
-                const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
-                this.context.session.getGroupService().getNextMemberList(sceneId, undefined, 3000).then( /* r => {
-                    // console.log(`get group ${g.groupCode} members`, r);
-                    // r.result.infos.forEach(member => {
-                    // });
-                    // groupMembers.set(g.groupCode, r.result.infos);
-                } */);
-                this.context.session.getGroupService().destroyMemberListScene(sceneId);
-            });
-        };
-        groupListener.onMemberListChange = (arg) => {
-            // TODO: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
-            const groupCode = arg.sceneId.split('_')[0];
-            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);
-                    if (existMember) {
-                        Object.assign(existMember, member);
-                    } else {
-                        existMembers.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            } else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
-            }
-        };
-        groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
-            if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
-                // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
-                setTimeout(() => {
-                    this.apis.GroupApi.groupCache.delete(groupCode);
-                }, 5000);
-
-            }
-            const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode);
-            if (existMembers) {
-                members.forEach((member, uid) => {
-                    const existMember = existMembers.get(uid);
-                    if (existMember) {
-                        // 检查管理变动
-                        member.isChangeRole = this.checkAdminEvent(groupCode, member, existMember);
-                        // 更新成员信息
-                        Object.assign(existMember, member);
-                    } else {
-                        existMembers.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            } else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, members);
-            }
-        };
-        this.context.session.getGroupService().addKernelGroupListener(
-            proxiedListenerOf(groupListener, this.context.logger),
-        );
-    }
-
-    checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean {
-        if (memberNew.role !== memberOld?.role) {
-            this.context.logger.logDebug(`群 ${groupCode} ${memberNew.nick} 角色变更为 ${memberNew.role === 3 ? '管理员' : '群员'}`);
-            return true;
-        }
-        return false;
     }
 }
 

src/core/packet/transformer/proto/message/groupAdmin.ts

@@ -0,0 +1,18 @@
+import { ProtoField, ScalarType } from "@napneko/nap-proto-core";
+
+export const GroupAdminExtra = {
+    adminUid: ProtoField(1, ScalarType.STRING),
+    isPromote: ProtoField(2, ScalarType.BOOL),
+}
+
+export const GroupAdminBody = {
+    extraDisable: ProtoField(1, () => GroupAdminExtra),
+    extraEnable: ProtoField(2, () => GroupAdminExtra),
+}
+
+export const GroupAdmin = {
+    groupUin: ProtoField(1, ScalarType.UINT32),
+    flag: ProtoField(2, ScalarType.UINT32),
+    isPromote: ProtoField(3, ScalarType.BOOL),
+    body: ProtoField(4, () => GroupAdminBody),
+}

src/onebot/action/group/GetGroupMemberList.ts

@@ -19,11 +19,13 @@ export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]>
         const groupIdStr = payload.group_id.toString();
         const noCache = payload.no_cache ? this.stringToBoolean(payload.no_cache) : false;
         const memberCache = this.core.apis.GroupApi.groupMemberCache;
-        let groupMembers;
-        try {
-            groupMembers = await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr, 3000, noCache);
-        } catch (error) {
-            groupMembers = memberCache.get(groupIdStr) ?? await this.core.apis.GroupApi.getGroupMembersV2(groupIdStr);
+        let groupMembers = memberCache.get(groupIdStr);
+        if (noCache || !groupMembers) {
+            await this.core.apis.GroupApi.refreshGroupMemberCache(groupIdStr);
+            groupMembers = memberCache.get(groupIdStr);
+            if (!groupMembers) {
+                throw new Error(`Failed to get group member list for group ${groupIdStr}`);
+            }
         }
         const memberPromises = Array.from(groupMembers.values()).map(item =>
             OB11Construct.groupMember(groupIdStr, item)

src/onebot/api/group.ts

@@ -7,15 +7,10 @@ import {
     MessageElement,
     NapCatCore,
     NTGrayTipElementSubTypeV2,
-    NTMsgType,
     RawMessage,
-    TipGroupElement,
-    TipGroupElementType,
 } from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11GroupBanEvent } from '@/onebot/event/notice/OB11GroupBanEvent';
-import { OB11GroupIncreaseEvent } from '@/onebot/event/notice/OB11GroupIncreaseEvent';
-import { OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
 import fastXmlParser from 'fast-xml-parser';
 import { OB11GroupMsgEmojiLikeEvent } from '@/onebot/event/notice/OB11MsgEmojiLikeEvent';
 import { MessageUnique } from '@/common/message-unique';
@@ -66,67 +61,6 @@ export class OneBotGroupApi {
         return undefined;
     }
 
-    // async parseGroupIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-    //     this.core.context.logger.logDebug('收到新人被邀请进群消息', grayTipElement);
-    //     const xmlElement = grayTipElement.xmlElement;
-    //     if (xmlElement?.content) {
-    //         const regex = /jp="(\d+)"/g;
-
-    //         const matches = [];
-    //         let match = null;
-
-    //         while ((match = regex.exec(xmlElement.content)) !== null) {
-    //             matches.push(match[1]);
-    //         }
-    //         if (matches.length === 2) {
-    //             const [inviter, invitee] = matches;
-    //             return new OB11GroupIncreaseEvent(
-    //                 this.core,
-    //                 parseInt(GroupCode),
-    //                 parseInt(invitee),
-    //                 parseInt(inviter),
-    //                 'invite',
-    //             );
-    //         }
-    //     }
-    //     return undefined;
-    // }
-
-    // async parseGroupMemberIncreaseEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-    //     const groupElement = grayTipElement?.groupElement;
-    //     if (!groupElement) return undefined;
-    //     const member = await this.core.apis.UserApi.getUserDetailInfo(groupElement.memberUid);
-    //     const memberUin = member?.uin;
-    //     const adminMember = await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid);
-    //     if (memberUin) {
-    //         const operatorUin = adminMember?.uin ?? memberUin;
-    //         return new OB11GroupIncreaseEvent(
-    //             this.core,
-    //             parseInt(GroupCode),
-    //             parseInt(memberUin),
-    //             parseInt(operatorUin),
-    //         );
-    //     } else {
-    //         return undefined;
-    //     }
-    // }
-
-    // async parseGroupKickEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-    //     const groupElement = grayTipElement?.groupElement;
-    //     if (!groupElement) return undefined;
-    //     const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, groupElement.adminUid))?.uin ?? (await this.core.apis.UserApi.getUidByUinV2(groupElement.adminUid));
-    //     if (adminUin) {
-    //         return new OB11GroupDecreaseEvent(
-    //             this.core,
-    //             parseInt(GroupCode),
-    //             parseInt(this.core.selfInfo.uin),
-    //             parseInt(adminUin),
-    //             'kick_me',
-    //         );
-    //     }
-    //     return undefined;
-    // }
-
     async parseGroupEmojiLikeEventByGrayTip(
         groupCode: string,
         grayTipElement: GrayTipElement
@@ -187,31 +121,6 @@ export class OneBotGroupApi {
         return undefined;
     }
 
-    // async parseGroupElement(msg: RawMessage, groupElement: TipGroupElement, elementWrapper: GrayTipElement) {
-    //     if (groupElement.type == TipGroupElementType.KMEMBERADD) {
-    //         const MemberIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, elementWrapper);
-    //         if (MemberIncreaseEvent) return MemberIncreaseEvent;
-    //     } else if (groupElement.type === TipGroupElementType.KSHUTUP) {
-    //         const BanEvent = await this.obContext.apis.GroupApi.parseGroupBanEvent(msg.peerUid, elementWrapper);
-    //         if (BanEvent) return BanEvent;
-    //     } else if (groupElement.type == TipGroupElementType.KQUITTE) {
-    //         this.core.apis.GroupApi.quitGroup(msg.peerUid).then();
-    //         try {
-    //             const KickEvent = await this.obContext.apis.GroupApi.parseGroupKickEvent(msg.peerUid, elementWrapper);
-    //             if (KickEvent) return KickEvent;
-    //         } catch (e) {
-    //             return new OB11GroupDecreaseEvent(
-    //                 this.core,
-    //                 parseInt(msg.peerUid),
-    //                 parseInt(this.core.selfInfo.uin),
-    //                 0,
-    //                 'leave',
-    //             );
-    //         }
-    //     }
-    //     return undefined;
-    // }
-
     async parsePaiYiPai(msg: RawMessage, jsonStr: string) {
         const json = JSON.parse(jsonStr);
 

src/onebot/api/msg.ts

@@ -32,6 +32,8 @@ import { GroupChange, PushMsgBody } from "@/core/packet/transformer/proto";
 import { NapProtoMsg } from '@napneko/nap-proto-core';
 import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
+import { GroupAdmin } from '@/core/packet/transformer/proto/message/groupAdmin';
+import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeEvent';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -965,11 +967,10 @@ export class OneBotMsgApi {
     }
 
     async parseSysMessage(msg: number[]) {
-        // Todo Refactor
         const SysMessage = new NapProtoMsg(PushMsgBody).decode(Uint8Array.from(msg));
         if (SysMessage.contentHead.type == 33 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
-            console.log(JSON.stringify(groupChange));
+            this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString()).then().catch();
             return new OB11GroupIncreaseEvent(
                 this.core,
                 groupChange.groupUin,
@@ -979,6 +980,7 @@ export class OneBotMsgApi {
             );
         } else if (SysMessage.contentHead.type == 34 && SysMessage.body?.msgContent) {
             const groupChange = new NapProtoMsg(GroupChange).decode(SysMessage.body.msgContent);
+            this.core.apis.GroupApi.refreshGroupMemberCache(groupChange.groupUin.toString()).then().catch();
             return new OB11GroupDecreaseEvent(
                 this.core,
                 groupChange.groupUin,
@@ -986,31 +988,26 @@ export class OneBotMsgApi {
                 groupChange.operatorUid ? +await this.core.apis.UserApi.getUinByUidV2(groupChange.operatorUid) : 0,
                 this.groupChangDecreseType2String(groupChange.decreaseType),
             );
+        } else if (SysMessage.contentHead.type == 44 && SysMessage.body?.msgContent) {
+            const groupAmin = new NapProtoMsg(GroupAdmin).decode(SysMessage.body.msgContent);
+            this.core.apis.GroupApi.refreshGroupMemberCache(groupAmin.groupUin.toString()).then().catch();
+            let enabled = false;
+            let uid = '';
+            if (groupAmin.body.extraEnable != null) {
+                uid = groupAmin.body.extraEnable.adminUid;
+                enabled = true;
+            } else if (groupAmin.body.extraDisable != null) {
+                uid = groupAmin.body.extraDisable.adminUid;
+                enabled = false;
+            }
+            return new OB11GroupAdminNoticeEvent(
+                this.core,
+                groupAmin.groupUin,
+                +await this.core.apis.UserApi.getUinByUidV2(uid),
+                enabled ? 'set' : 'unset'
+            );
         } else if (SysMessage.contentHead.type == 528 && SysMessage.contentHead.subType == 39 && SysMessage.body?.msgContent) {
             return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);
         }
-
-        /*
-        if (msgType === 732 && subType === 16 && subSubType === 16) {
-            const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
-            if (greyTip.subTypeId === 36) {
-                const emojiLikeToOthers = EmojiLikeToOthersWrapper1
-                    .fromBinary(greyTip.rest)
-                    .wrapper!
-                    .body!;
-                if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
-                    return;
-                }
-                const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
-                    greyTip.groupCode.toString(),
-                    await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
-                    emojiLikeToOthers.msgSpec!.msgSeq.toString(),
-                    emojiLikeToOthers.attributes!.emojiId,
-                );
-                // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-                eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
-            }
-        }
-        */
     }
 }

src/onebot/index.ts

@@ -1,8 +1,6 @@
 import {
     BuddyReqType,
     ChatType,
-    DataSource,
-    NTGroupMemberRole,
     GroupNotifyMsgStatus,
     GroupNotifyMsgType,
     InstanceContext,
@@ -41,8 +39,6 @@ import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent
 import { MessageUnique } from '@/common/message-unique';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
-import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
-// import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
@@ -355,7 +351,6 @@ export class NapCatOneBot11Adapter {
         const groupListener = new NodeIKernelGroupListener();
 
         groupListener.onGroupNotifiesUpdated = async (_, notifies) => {
-            //console.log('ob11 onGroupNotifiesUpdated', notifies[0]);
             await this.core.apis.GroupApi.clearGroupNotifiesUnreadCount(false);
             if (
                 ![
@@ -373,174 +368,76 @@ export class NapCatOneBot11Adapter {
 
                     const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type;
                     this.context.logger.logDebug('收到群通知', notify);
-
                     if (
-                        [
-                            GroupNotifyMsgType.SET_ADMIN,
-                            GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_CANCELED,
-                            GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_ADMIN,
-                        ].includes(notify.type)
+                        [GroupNotifyMsgType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS].includes(notify.type) &&
+                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
                     ) {
-                        const member1 = await this.core.apis.GroupApi.getGroupMember(
-                            notify.group.groupCode,
-                            notify.user1.uid
-                        );
-                        this.context.logger.logDebug('有管理员变动通知');
-                        // refreshGroupMembers(notify.group.groupCode).then();
-                        this.context.logger.logDebug('开始获取变动的管理员');
-                        if (member1) {
-                            this.context.logger.logDebug('变动管理员获取成功');
-                            const groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent(
-                                this.core,
-                                parseInt(notify.group.groupCode),
-                                parseInt(member1.uin),
-                                [
-                                    GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_CANCELED,
-                                    GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_ADMIN,
-                                ].includes(notify.type)
-                                    ? 'unset'
-                                    : 'set'
-                            );
-                            this.networkManager
-                                .emitEvent(groupAdminNoticeEvent)
-                                .catch((e) =>
-                                    this.context.logger.logError('处理群管理员变动失败', e)
-                                );
-                        } else {
-                            this.context.logger.logDebug(
-                                '获取群通知的成员信息失败',
-                                notify,
-                                this.core.apis.GroupApi.getGroup(notify.group.groupCode)
-                            );
-                        }
-                    } else
-                        // if (
-                        //     notify.type == GroupNotifyMsgType.MEMBER_LEAVE_NOTIFY_ADMIN ||
-                        //     notify.type == GroupNotifyMsgType.KICK_MEMBER_NOTIFY_ADMIN
-                        // ) {
-                        //     this.context.logger.logDebug('有成员退出通知', notify);
-                        //     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.apis.UserApi.getUinByUidV2(notify.user2.uid);
-                        //         if (member2Uin) {
-                        //             operatorId = member2Uin;
-                        //         }
-                        //         subType = 'kick';
-                        //     }
-                        //     const groupDecreaseEvent = new OB11GroupDecreaseEvent(
-                        //         this.core,
-                        //         parseInt(notify.group.groupCode),
-                        //         parseInt(member1Uin),
-                        //         parseInt(operatorId),
-                        //         subType
-                        //     );
-                        //     this.networkManager
-                        //         .emitEvent(groupDecreaseEvent)
-                        //         .catch((e) =>
-                        //             this.context.logger.logError('处理群成员退出失败', e)
-                        //         );
-                        //     // notify.status == 1 表示未处理 2表示处理完成
-                        // } else
-                        if (
-                            [GroupNotifyMsgType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS].includes(notify.type) &&
-                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                        ) {
-                            this.context.logger.logDebug('有加群请求');
-                            try {
-                                let requestUin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
-                                if (isNaN(parseInt(requestUin))) {
-                                    requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin;
-                                }
-                                const groupRequestEvent = new OB11GroupRequestEvent(
-                                    this.core,
-                                    parseInt(notify.group.groupCode),
-                                    parseInt(requestUin),
-                                    'add',
-                                    notify.postscript,
-                                    flag
-                                );
-                                this.networkManager
-                                    .emitEvent(groupRequestEvent)
-                                    .catch((e) =>
-                                        this.context.logger.logError('处理加群请求失败', e)
-                                    );
-                            } catch (e) {
-                                this.context.logger.logError(
-                                    '获取加群人QQ号失败 Uid:',
-                                    notify.user1.uid,
-                                    e
-                                );
+                        this.context.logger.logDebug('有加群请求');
+                        try {
+                            let requestUin = await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid);
+                            if (isNaN(parseInt(requestUin))) {
+                                requestUin = (await this.core.apis.UserApi.getUserDetailInfo(notify.user1.uid)).uin;
                             }
-                        } else if (
-                            notify.type == GroupNotifyMsgType.INVITED_BY_MEMBER &&
-                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                        ) {
-                            this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
-                            const groupInviteEvent = new OB11GroupRequestEvent(
+                            const groupRequestEvent = new OB11GroupRequestEvent(
                                 this.core,
                                 parseInt(notify.group.groupCode),
-                                parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)),
-                                'invite',
-                                notify.postscript,
-                                flag
-                            );
-                            this.networkManager
-                                .emitEvent(groupInviteEvent)
-                                .catch((e) =>
-                                    this.context.logger.logError('处理邀请本人加群失败', e)
-                                );
-                        } else if (
-                            notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS &&
-                            notify.status == GroupNotifyMsgStatus.KUNHANDLE
-                        ) {
-                            this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
-                            const groupInviteEvent = new OB11GroupRequestEvent(
-                                this.core,
-                                parseInt(notify.group.groupCode),
-                                parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
+                                parseInt(requestUin),
                                 'add',
                                 notify.postscript,
                                 flag
                             );
                             this.networkManager
-                                .emitEvent(groupInviteEvent)
+                                .emitEvent(groupRequestEvent)
                                 .catch((e) =>
-                                    this.context.logger.logError('处理邀请本人加群失败', e)
+                                    this.context.logger.logError('处理加群请求失败', e)
                                 );
+                        } catch (e) {
+                            this.context.logger.logError(
+                                '获取加群人QQ号失败 Uid:',
+                                notify.user1.uid,
+                                e
+                            );
                         }
+                    } else if (
+                        notify.type == GroupNotifyMsgType.INVITED_BY_MEMBER &&
+                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
+                    ) {
+                        this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
+                        const groupInviteEvent = new OB11GroupRequestEvent(
+                            this.core,
+                            parseInt(notify.group.groupCode),
+                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)),
+                            'invite',
+                            notify.postscript,
+                            flag
+                        );
+                        this.networkManager
+                            .emitEvent(groupInviteEvent)
+                            .catch((e) =>
+                                this.context.logger.logError('处理邀请本人加群失败', e)
+                            );
+                    } else if (
+                        notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS &&
+                        notify.status == GroupNotifyMsgStatus.KUNHANDLE
+                    ) {
+                        this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
+                        const groupInviteEvent = new OB11GroupRequestEvent(
+                            this.core,
+                            parseInt(notify.group.groupCode),
+                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
+                            'add',
+                            notify.postscript,
+                            flag
+                        );
+                        this.networkManager
+                            .emitEvent(groupInviteEvent)
+                            .catch((e) =>
+                                this.context.logger.logError('处理邀请本人加群失败', e)
+                            );
+                    }
                 }
             }
         };
-
-        groupListener.onMemberInfoChange = async (groupCode, dataSource, members) => {
-            //this.context.logger.logDebug('收到群成员信息变动通知', groupCode, changeType);
-            if (dataSource === DataSource.LOCAL) {
-                const existMembers = this.core.apis.GroupApi.groupMemberCache.get(groupCode);
-                if (!existMembers) return;
-                members.forEach((member) => {
-                    const existMember = existMembers.get(member.uid);
-                    if (!existMember?.isChangeRole) return;
-                    this.context.logger.logDebug('变动管理员获取成功');
-                    const groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent(
-                        this.core,
-                        parseInt(groupCode),
-                        parseInt(member.uin),
-                        member.role === NTGroupMemberRole.KADMIN ? 'set' : 'unset'
-                    );
-                    this.networkManager
-                        .emitEvent(groupAdminNoticeEvent)
-                        .catch((e) =>
-                            this.context.logger.logError('处理群管理员变动失败', e)
-                        );
-                    existMember.isChangeRole = false;
-                    this.context.logger.logDebug('群管理员变动处理完毕');
-                });
-            }
-        };
-
         this.context.session
             .getGroupService()
             .addKernelGroupListener(proxiedListenerOf(groupListener, this.context.logger));