From 050c9d9b547f6a809a36edd4a16d1195f4f7c19c Mon Sep 17 00:00:00 2001 From: idranme Date: Tue, 3 Sep 2024 21:43:18 +0800 Subject: [PATCH] fix --- src/ntqqapi/types/group.ts | 1 + src/onebot11/adapter.ts | 2 +- src/onebot11/entities.ts | 2 ++ src/onebot11/types.ts | 6 ++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ntqqapi/types/group.ts b/src/ntqqapi/types/group.ts index 6512575..b7d860b 100644 --- a/src/ntqqapi/types/group.ts +++ b/src/ntqqapi/types/group.ts @@ -36,6 +36,7 @@ export interface Group { memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q" } members: GroupMember[] // 原始数据是没有这个的,为了方便自己加了这个字段 + createTime: string } export enum GroupMemberRole { diff --git a/src/onebot11/adapter.ts b/src/onebot11/adapter.ts index 4713df5..e8e2885 100644 --- a/src/onebot11/adapter.ts +++ b/src/onebot11/adapter.ts @@ -110,10 +110,10 @@ class OneBot11Adapter extends Service { for (const notify of notifies) { try { const notifyTime = parseInt(notify.seq) / 1000 - const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type if (notifyTime < this.startTime) { continue } + const flag = notify.group.groupCode + '|' + notify.seq + '|' + notify.type if ([GroupNotifyType.MEMBER_LEAVE_NOTIFY_ADMIN, GroupNotifyType.KICK_MEMBER_NOTIFY_ADMIN].includes(notify.type)) { this.ctx.logger.info('有成员退出通知', notify) const member1Uin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid) diff --git a/src/onebot11/entities.ts b/src/onebot11/entities.ts index dd7ab0a..99984c1 100644 --- a/src/onebot11/entities.ts +++ b/src/onebot11/entities.ts @@ -768,6 +768,8 @@ export namespace OB11Entities { return { group_id: parseInt(group.groupCode), group_name: group.groupName, + group_memo: group.remarkName, + group_create_time: +group.createTime, member_count: group.memberCount, max_member_count: group.maxMember, } diff --git a/src/onebot11/types.ts b/src/onebot11/types.ts index 87c9b9d..2d737ee 100644 --- a/src/onebot11/types.ts +++ b/src/onebot11/types.ts @@ -54,8 +54,10 @@ export interface OB11GroupMember { export interface OB11Group { group_id: number group_name: string - member_count?: number - max_member_count?: number + group_memo: string + group_create_time: number + member_count: number + max_member_count: number } interface OB11Sender {