From da7636e60c376db1d962457bca4bb5670a302960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Tue, 3 Dec 2024 21:50:12 +0800 Subject: [PATCH] fix: #592 --- src/onebot/action/extends/GetGroupAddRequest.ts | 2 +- src/onebot/action/group/GetGroupIgnoredNotifies.ts | 2 +- src/onebot/action/system/GetSystemMsg.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/onebot/action/extends/GetGroupAddRequest.ts b/src/onebot/action/extends/GetGroupAddRequest.ts index c886ed2f..8bdd65d8 100644 --- a/src/onebot/action/extends/GetGroupAddRequest.ts +++ b/src/onebot/action/extends/GetGroupAddRequest.ts @@ -18,7 +18,7 @@ export default class GetGroupAddRequest extends OneBotAction notify.type === 7) .map(async SSNotify => ({ - request_id: SSNotify.seq, + request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type, requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid), requester_nick: SSNotify.user1?.nickName, group_id: SSNotify.group?.groupCode, diff --git a/src/onebot/action/group/GetGroupIgnoredNotifies.ts b/src/onebot/action/group/GetGroupIgnoredNotifies.ts index 0faa1826..a639ed1e 100644 --- a/src/onebot/action/group/GetGroupIgnoredNotifies.ts +++ b/src/onebot/action/group/GetGroupIgnoredNotifies.ts @@ -11,7 +11,7 @@ export class GetGroupIgnoredNotifies extends OneBotAction { ignoredNotifies .filter(notify => notify.type === 7) .map(async SSNotify => ({ - request_id: SSNotify.seq, + request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type, requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid), requester_nick: SSNotify.user1?.nickName, group_id: SSNotify.group?.groupCode, diff --git a/src/onebot/action/system/GetSystemMsg.ts b/src/onebot/action/system/GetSystemMsg.ts index 435d17bb..f1a904c5 100644 --- a/src/onebot/action/system/GetSystemMsg.ts +++ b/src/onebot/action/system/GetSystemMsg.ts @@ -8,12 +8,12 @@ export class GetGroupSystemMsg extends OneBotAction { const NTQQUserApi = this.core.apis.UserApi; const NTQQGroupApi = this.core.apis.GroupApi; // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 - const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false,10); + const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false, 10); const retData: any = { InvitedRequest: [], join_requests: [] }; for (const SSNotify of SingleScreenNotifies) { if (SSNotify.type == 1) { retData.InvitedRequest.push({ - request_id: SSNotify.seq, + request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type, invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid), invitor_nick: SSNotify.user1?.nickName, group_id: SSNotify.group?.groupCode, @@ -23,7 +23,7 @@ export class GetGroupSystemMsg extends OneBotAction { }); } else if (SSNotify.type == 7) { retData.join_requests.push({ - request_id: SSNotify.seq, + request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type, requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid), requester_nick: SSNotify.user1?.nickName, group_id: SSNotify.group?.groupCode,