diff --git a/src/common/message-unique.ts b/src/common/message-unique.ts index 6a33c054..03d136ef 100644 --- a/src/common/message-unique.ts +++ b/src/common/message-unique.ts @@ -91,7 +91,7 @@ class MessageUniqueWrapper { return ret.map((t) => t?.MsgId).filter((t) => t !== undefined); } - createMsg(peer: Peer, msgId: string) { + createUniqueMsgId(peer: Peer, msgId: string) { const key = `${msgId}|${peer.chatType}|${peer.peerUid}`; const hash = crypto.createHash('md5').update(key).digest(); //设置第一个bit为0 保证shortId为正数 diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index 54e6ad56..83f017aa 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts @@ -38,7 +38,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction { const resMsg = await this.obContext.apis.MsgApi .parseMessage(msg); if (!resMsg) return; - resMsg.message_id = MessageUnique.createMsg({ + resMsg.message_id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid, diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 732acc48..12090162 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -47,7 +47,7 @@ export default class GetFriendMsgHistory extends BaseAction { if (isReverseOrder) msgList.reverse(); //转换序号 await Promise.all(msgList.map(async msg => { - msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId); + msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId); })); //烘焙消息 const ob11MsgList = (await Promise.all( diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 17dabae2..06c74301 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts @@ -42,7 +42,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction { - msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId); + msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId); })); //烘焙消息 const ob11MsgList = (await Promise.all( diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index e4cfa33a..74c97886 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/src/onebot/action/msg/GetMsg.ts @@ -39,7 +39,7 @@ class GetMsg extends BaseAction { const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg.msgList[0], 'array'); if (!retMsg) throw Error('消息为空'); try { - retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!; + retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgList[0].msgId)!; retMsg.message_seq = retMsg.message_id; retMsg.real_id = retMsg.message_id; } catch (e) { diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 2c65ae0d..e33390ba 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -114,7 +114,7 @@ export class SendMsg extends BaseAction { if (getSpecialMsgNum(payload, OB11MessageDataType.node)) { const returnMsg = await this.handleForwardedNodes(peer, messages as OB11MessageNode[]); if (returnMsg) { - const msgShortId = MessageUnique.createMsg({ + const msgShortId = MessageUnique.createUniqueMsgId({ guildId: '', peerUid: peer.peerUid, chatType: peer.chatType, @@ -170,7 +170,7 @@ export class SendMsg extends BaseAction { const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node)); if (nodeMsg) { nodeMsgIds.push(nodeMsg.msgId); - MessageUnique.createMsg(selfPeer, nodeMsg.msgId); + MessageUnique.createUniqueMsgId(selfPeer, nodeMsg.msgId); } //完成子卡片生成跳过后续 continue; @@ -188,7 +188,7 @@ export class SendMsg extends BaseAction { (await Promise.allSettled(MsgNodeList)).map((result) => { if (result.status === 'fulfilled' && result.value) { nodeMsgIds.push(result.value.msgId); - MessageUnique.createMsg(selfPeer, result.value.msgId); + MessageUnique.createUniqueMsgId(selfPeer, result.value.msgId); } }); } catch (e) { diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 05a4b2e4..a80d3d72 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -236,7 +236,7 @@ export class OneBotMsgApi { return { type: OB11MessageDataType.reply, data: { - id: MessageUnique.createMsg({ + id: MessageUnique.createUniqueMsgId({ peerUid: msg.peerUid, guildId: '', chatType: msg.chatType, @@ -365,7 +365,7 @@ export class OneBotMsgApi { async multiMsgItem => { multiMsgItem.parentMsgPeer = parentMsgPeer; multiMsgItem.parentMsgIdList = msg.parentMsgIdList; - multiMsgItem.id = MessageUnique.createMsg(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用 + multiMsgItem.id = MessageUnique.createUniqueMsgId(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用 return await this.parseMessage(multiMsgItem); }, ))).filter(item => item !== undefined), @@ -823,7 +823,7 @@ export class OneBotMsgApi { } const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, waitComplete, timeout); if (!returnMsg) throw new Error('发送消息失败'); - returnMsg.id = MessageUnique.createMsg({ + returnMsg.id = MessageUnique.createUniqueMsgId({ chatType: peer.chatType, guildId: '', peerUid: peer.peerUid, diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 7ca93370..7dcb1cc1 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -261,6 +261,7 @@ export class NapCatOneBot11Adapter { emojiLikeToOthers.msgSpec!.msgSeq.toString(), emojiLikeToOthers.attributes!.emojiId, ); + // eslint-disable-next-line @typescript-eslint/no-unused-expressions eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty); } } @@ -283,7 +284,7 @@ export class NapCatOneBot11Adapter { this.context.logger.logDebug(`消息时间${m.msgTime}早于启动时间${this.bootTime}，忽略上报`); continue; } - m.id = MessageUnique.createMsg( + m.id = MessageUnique.createUniqueMsgId( { chatType: m.chatType, peerUid: m.peerUid, @@ -311,7 +312,7 @@ export class NapCatOneBot11Adapter { if (!ob11Msg) return; ob11Msg.target_id = parseInt(msg.peerUin); if (this.configLoader.configData.reportSelfMessage) { - msg.id = MessageUnique.createMsg({ + msg.id = MessageUnique.createUniqueMsgId({ chatType: msg.chatType, peerUid: msg.peerUid, guildId: '',