GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rollback: use original msgId (string) as msg identifier

Browse Source
This commit is contained in:
Wesley F. Young 2024-08-28 19:57:20 +08:00
parent 2decc46bb8
commit 2790f5ff63
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/events.ts
View File

@ -1,4 +1,5 @@
import { import {
BuddyReqType,
ChatType, ChatType,
FileElement, FileElement,
FriendRequest, FriendRequest,
@ -7,11 +8,10 @@ import {
RawMessage, RawMessage,
SendStatusType, SendStatusType,
} from '@/core/entities'; } from '@/core/entities';
import { NodeIKernelMsgListener } from '@/core/listeners'; import { NodeIKernelBuddyListener, NodeIKernelMsgListener } from '@/core/listeners';
import EventEmitter from 'node:events'; import EventEmitter from 'node:events';
import TypedEmitter from 'typed-emitter/rxjs'; import TypedEmitter from 'typed-emitter/rxjs';
import { NapCatCore } from '@/core/index'; import { NapCatCore } from '@/core/index';
import { MessageUnique } from '@/common/message-unique';
import { LRUCache } from '@/common/lru-cache'; import { LRUCache } from '@/common/lru-cache';
import { proxiedListenerOf } from '@/common/proxy-handler'; import { proxiedListenerOf } from '@/common/proxy-handler';
@ -29,8 +29,7 @@ type NapCatInternalEvents = {
'buddy/poke': (initiatorUin: string, targetUin: string, displayMsg: string, 'buddy/poke': (initiatorUin: string, targetUin: string, displayMsg: string,
xMsg: RawMessage) => PromiseLike<void>; xMsg: RawMessage) => PromiseLike<void>;
'buddy/recall': (uin: string, internalMessageId: number, 'buddy/recall': (uin: string, messageId: string, msg: RawMessage) => PromiseLike<void>;
xMsg: RawMessage) => PromiseLike<void>;
'buddy/input-status': (data: Parameters<NodeIKernelMsgListener['onInputStatusPush']>[0]) => PromiseLike<void>; 'buddy/input-status': (data: Parameters<NodeIKernelMsgListener['onInputStatusPush']>[0]) => PromiseLike<void>;
@ -55,11 +54,11 @@ type NapCatInternalEvents = {
'group/member-decrease': (groupCode: string, targetUin: string, operatorUin: string, reason: 'leave' | 'kick' | 'unknown', 'group/member-decrease': (groupCode: string, targetUin: string, operatorUin: string, reason: 'leave' | 'kick' | 'unknown',
xGrayTipElement: GrayTipElement, xMsg: RawMessage) => PromiseLike<void>; xGrayTipElement: GrayTipElement, xMsg: RawMessage) => PromiseLike<void>;
'group/essence': (groupCode: string, internalMessageId: number, senderUin: string, operation: 'add' | 'delete', 'group/essence': (groupCode: string, messageId: string, senderUin: string, operation: 'add' | 'delete',
xGrayTipElement: GrayTipElement, xGrayTipElement: GrayTipElement,
xGrayTipSourceMsg: RawMessage /* this is not the message that is set to be essence msg */) => PromiseLike<void>; xGrayTipSourceMsg: RawMessage /* this is not the message that is set to be essence msg */) => PromiseLike<void>;
'group/recall': (groupCode: string, operatorUin: string, internalMessageId: number, 'group/recall': (groupCode: string, operatorUin: string, messageId: string,
xGrayTipSourceMsg: RawMessage /* This is not the message that is recalled */) => PromiseLike<void>; xGrayTipSourceMsg: RawMessage /* This is not the message that is recalled */) => PromiseLike<void>;
'group/title': (groupCode: string, targetUin: string, newTitle: string, 'group/title': (groupCode: string, targetUin: string, newTitle: string,
@ -68,7 +67,7 @@ type NapCatInternalEvents = {
'group/upload': (groupCode: string, uploaderUin: string, fileElement: FileElement, 'group/upload': (groupCode: string, uploaderUin: string, fileElement: FileElement,
xMsg: RawMessage) => PromiseLike<void>; xMsg: RawMessage) => PromiseLike<void>;
'group/emoji-like': (groupCode: string, operatorUin: string, internalMessageId: number, likes: { emojiId: string, count: number }[], 'group/emoji-like': (groupCode: string, operatorUin: string, messageId: string, likes: { emojiId: string, count: number }[],
// If it comes from onRecvMsg // If it comes from onRecvMsg
xGrayTipElement?: GrayTipElement, xMsg?: RawMessage, xGrayTipElement?: GrayTipElement, xMsg?: RawMessage,
// If it comes from onRecvSysMsg // If it comes from onRecvSysMsg
@ -94,14 +93,6 @@ export class NapCatEventChannel extends
msgListener.onRecvMsg = msgList => { msgListener.onRecvMsg = msgList => {
for (const msg of msgList) { for (const msg of msgList) {
msg.id = MessageUnique.createUniqueMsgId(
{
chatType: msg.chatType,
peerUid: msg.peerUid,
guildId: '',
},
msg.msgId,
);
if (msg.senderUin !== this.core.selfInfo.uin) { if (msg.senderUin !== this.core.selfInfo.uin) {
this.emit('message/receive', msg); this.emit('message/receive', msg);
} }
@ -115,11 +106,8 @@ export class NapCatEventChannel extends
// Handle message recall // Handle message recall
if (msg.recallTime !== '0' && !recallMsgCache.get(msg.msgId)) { if (msg.recallTime !== '0' && !recallMsgCache.get(msg.msgId)) {
recallMsgCache.put(msg.msgId, true); recallMsgCache.put(msg.msgId, true);
const originalMsgId = MessageUnique.getShortIdByMsgId(msg.msgId);
if (!originalMsgId) continue;
if (msg.chatType === ChatType.KCHATTYPEC2C) { if (msg.chatType === ChatType.KCHATTYPEC2C) {
this.emit('buddy/recall', msg.peerUin, originalMsgId, msg); this.emit('buddy/recall', msg.peerUin, msg.msgId, msg);
} else if (msg.chatType == ChatType.KCHATTYPEGROUP) { } else if (msg.chatType == ChatType.KCHATTYPEGROUP) {
let operatorId = msg.senderUin; let operatorId = msg.senderUin;
for (const element of msg.elements) { for (const element of msg.elements) {
@ -128,18 +116,13 @@ export class NapCatEventChannel extends
const operator = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, operatorUid); const operator = await this.core.apis.GroupApi.getGroupMember(msg.peerUin, operatorUid);
operatorId = operator?.uin || msg.senderUin; operatorId = operator?.uin || msg.senderUin;
} }
this.emit('group/recall', msg.peerUin, operatorId, originalMsgId, msg); this.emit('group/recall', msg.peerUin, operatorId, msg.msgId, msg);
} }
} }
// Handle message send // Handle message send
if (msg.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSentCache.get(msg.msgId)) { if (msg.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS && !msgIdSentCache.get(msg.msgId)) {
msgIdSentCache.put(msg.msgId, true); msgIdSentCache.put(msg.msgId, true);
msg.id = MessageUnique.createUniqueMsgId({
chatType: msg.chatType,
peerUid: msg.peerUid,
guildId: '',
}, msg.msgId);
this.emit('message/send', msg); this.emit('message/send', msg);
} }
} }