From c4d7d5a0d40ea210d82f9491047b99f444700a53 Mon Sep 17 00:00:00 2001 From: Alen Date: Tue, 20 Aug 2024 01:02:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A4=9A=E5=A4=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修改（疑似）旧设备回复消息验证失败的解决方案 2.修复Base64发送文件失败 3.修复群时间监听器未注册 --- src/core/core.ts | 3 +++ src/onebot/helper/data.ts | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/core.ts b/src/core/core.ts index 9069a603..8599bf87 100644 --- a/src/core/core.ts +++ b/src/core/core.ts @@ -196,6 +196,9 @@ export class NapCatCore { this.apis.GroupApi.groupMemberCache.set(groupCode, members); } }; + this.context.session.getGroupService().addKernelGroupListener( + new this.context.wrapper.NodeIKernelGroupListener(proxiedListenerOf(groupListener, this.context.logger)), + ); } checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean { if (memberNew.role !== memberOld?.role) { diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 7cb7e9e2..44dbe87f 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -149,7 +149,6 @@ export class OB11Constructor { message_data['type'] = OB11MessageDataType.reply; //log("收到回复消息", element.replyElement); try { - let oldMsgFlag = false; const records = msg.records.find(msgRecord => msgRecord.msgId === element?.replyElement?.sourceMsgIdInRecords); const peer = { chatType: msg.chatType, @@ -164,14 +163,17 @@ export class OB11Constructor { chatType: msg.chatType, }, element.replyElement.replayMsgSeq, 1, true, true)).msgList.find(msg => msg.msgRandom === records.msgRandom); if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) { - if (!replyMsg && records.msgRandom === '0') oldMsgFlag = true; replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replyElement.replayMsgSeq)).msgList[0]; } if (msg.peerUin == '284840486') { //合并消息内侧 消息具体定位不到 } - if ((!replyMsg || (records.msgRandom !== replyMsg.msgRandom && !oldMsgFlag || (oldMsgFlag && records.msgSeq !== replyMsg.msgSeq))) && msg.peerUin !== '284840486') { - throw new Error('回复消息消息验证失败'); + if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') { + const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, records.msgSeq)).msgList; + if (replyMsgList.length < 1) { + throw new Error('回复消息消息验证失败'); + } + replyMsg = replyMsgList.filter(e => e.msgSeq == records.msgSeq).sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0]; } message_data['data']['id'] = MessageUnique.createMsg({ peerUid: msg.peerUid, From 7a08187c5f85d885781f471add003fb03cae1350 Mon Sep 17 00:00:00 2001 From: Alen Date: Tue, 20 Aug 2024 07:28:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20Uid=E8=BD=ACUin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复Uid转Uin兜底逻辑 --- src/core/apis/user.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index bf09fd77..ab231863 100644 --- a/src/core/apis/user.ts +++ b/src/core/apis/user.ts @@ -127,13 +127,16 @@ export class NTQQUserApi { return RetUser; } - async getUserDetailInfo(uid: string) { - const ret = await this.fetchUserDetailInfo(uid, UserDetailSource.KDB); - if (ret.uin === '0') { - this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.') - return await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER); + async getUserDetailInfo(uid: string): Promise { + try { + let retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KDB); + if (retUser.uin !== '0') { + return retUser; + } + } catch (e) { } - return ret; + this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.'); + return this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER); } async modifySelfProfile(param: ModifyProfileParams) { From f484c6e5feb14aff01a181833e9bd6e9b37456df Mon Sep 17 00:00:00 2001 From: Alen <33656288+cnxysoft@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:28:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A4=9A=E5=A4=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复group_card事件上报 2.修复group_admin事件上报 --- src/onebot/helper/data.ts | 20 ++++++++++---------- src/onebot/index.ts | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts index 44dbe87f..9c3aaa10 100644 --- a/src/onebot/helper/data.ts +++ b/src/onebot/helper/data.ts @@ -30,6 +30,7 @@ import { EventType } from '../event/OB11BaseEvent'; import { encodeCQCode } from './cqcode'; import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent'; import { OB11GroupBanEvent } from '../event/notice/OB11GroupBanEvent'; +import { OB11GroupCardEvent } from '../event/notice/OB11GroupCardEvent'; import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent'; import { OB11GroupNoticeEvent } from '../event/notice/OB11GroupNoticeEvent'; import { calcQQLevel, sleep, UUIDConverter } from '@/common/utils/helper'; @@ -421,16 +422,15 @@ export class OB11Constructor { return; } //log("group msg", msg); - // Mlikiowa V2.0.34 Refactor Todo - // if (msg.senderUin && msg.senderUin !== '0') { - // const member = await getGroupMember(msg.peerUid, msg.senderUin); - // if (member && member.cardName !== msg.sendMemberName) { - // const newCardName = msg.sendMemberName || ''; - // const event = new OB11GroupCardEvent(parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName); - // member.cardName = newCardName; - // return event; - // } - // } + if (msg.senderUin && msg.senderUin !== '0') { + const member = await NTQQGroupApi.getGroupMember(msg.peerUid, msg.senderUin); + if (member && member.cardName !== msg.sendMemberName) { + const newCardName = msg.sendMemberName || ''; + const event = new OB11GroupCardEvent(core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName); + member.cardName = newCardName; + return event; + } + } for (const element of msg.elements) { const grayTipElement = element.grayTipElement; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index f5472b14..b12ba056 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -9,6 +9,7 @@ import { NapCatCore, RawMessage, SendStatusType, + GroupMemberRole, } from '@/core'; import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config'; import { OneBotApiContextType } from '@/onebot/types'; @@ -413,6 +414,29 @@ export class NapCatOneBot11Adapter { } }; + groupListener.onMemberInfoChange = async (groupCode, changeType, members) => { + //this.context.logger.logDebug('收到群成员信息变动通知', groupCode, changeType); + if (changeType === 0) { + 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 === GroupMemberRole.admin ? '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( new this.context.wrapper.NodeIKernelGroupListener(proxiedListenerOf(groupListener, this.context.logger)), );