Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-12 07:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

release: 2.2.38

Browse Source
This commit is contained in:
手瓜一十雪
2024-09-02 17:31:27 +08:00
parent 59a1a95075
commit f6b02d96ec
10 changed files with 58 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/onebot/api/msg.ts
View File

@@ -219,7 +219,7 @@ export class OneBotMsgApi {
peerUid: msg.peerUid,
guildId: '',
};
if (!records) {
if (!records || !element.replyMsgTime || !element.senderUidStr) {
this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
return null;
}
@@ -234,29 +234,13 @@ export class OneBotMsgApi {
if (records.peerUin === '284840486') {
return createReplyData(records.msgId);
}
let replyMsg: RawMessage | undefined;
// Attempt 1
replyMsg = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer,element.replayMsgSeq, 1, true, true))
.msgList
.find(msg => msg.msgRandom === records.msgRandom);
let replyMsg = (await this.core.apis.MsgApi.queryMsgsWithFilterExWithSeqV2(peer, element.replayMsgSeq, element.replyMsgTime, [element.senderUidStr]))
.msgList.find(msg => msg.msgRandom === records.msgRandom);
if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
// Attempt 2
replyMsg = (await this.core.apis.MsgApi.getSingleMsg(peer, element.replayMsgSeq)).msgList[0];
if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
// Attempt 3
const replyMsgList = (await this.core.apis.MsgApi.getMsgExBySeq(peer, records.msgSeq)).msgList;
if (replyMsgList.length < 1) {
this.core.context.logger.logError('回复消息消息验证失败', element.replayMsgSeq);
return null;
}
replyMsg = replyMsgList.filter(e => e.msgSeq == records.msgSeq)
.sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
}
this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
return null;
}
return createReplyData(replyMsg.msgId);
},

50
src/onebot/index.ts
View File

@@ -242,31 +242,31 @@ export class NapCatOneBot11Adapter {
const msgListener = new NodeIKernelMsgListener();
msgListener.onRecvSysMsg = async msg => {
const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
if (sysMsg.msgSpec.length === 0) {
return;
}
const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
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);
}
}
// const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
// if (sysMsg.msgSpec.length === 0) {
// return;
// }
// const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
// 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);
// }
// }
};
msgListener.onInputStatusPush = async data => {