From 7ad09169ead36560e3089128d7c5ec7dd30e4fef Mon Sep 17 00:00:00 2001 From: Nepenthe Date: Sun, 18 May 2025 18:32:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=BD=E8=B1=A1?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=A7=E6=89=BF=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/onebot/event/notice/OB11BaseNoticeEvent.ts | 3 ++- src/onebot/event/request/OB11BaseRequestEvent.ts | 6 ++++++ src/onebot/event/request/OB11FriendRequest.ts | 6 ++---- src/onebot/event/request/OB11GroupRequest.ts | 12 ++++++------ 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/onebot/event/request/OB11BaseRequestEvent.ts diff --git a/src/onebot/event/notice/OB11BaseNoticeEvent.ts b/src/onebot/event/notice/OB11BaseNoticeEvent.ts index d8e34f78..ad9240b5 100644 --- a/src/onebot/event/notice/OB11BaseNoticeEvent.ts +++ b/src/onebot/event/notice/OB11BaseNoticeEvent.ts @@ -2,4 +2,5 @@ import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; export abstract class OB11BaseNoticeEvent extends OneBotEvent { post_type = EventType.NOTICE; -} \ No newline at end of file + abstract notice_type: string; +} diff --git a/src/onebot/event/request/OB11BaseRequestEvent.ts b/src/onebot/event/request/OB11BaseRequestEvent.ts new file mode 100644 index 00000000..b151816d --- /dev/null +++ b/src/onebot/event/request/OB11BaseRequestEvent.ts @@ -0,0 +1,6 @@ +import { EventType, OneBotEvent } from '../OneBotEvent'; + +export abstract class OB11BaseRequestEvent extends OneBotEvent { + post_type = EventType.REQUEST; + abstract request_type: string; +} diff --git a/src/onebot/event/request/OB11FriendRequest.ts b/src/onebot/event/request/OB11FriendRequest.ts index e270cb0a..3a9977c6 100644 --- a/src/onebot/event/request/OB11FriendRequest.ts +++ b/src/onebot/event/request/OB11FriendRequest.ts @@ -1,9 +1,7 @@ -import { OB11BaseNoticeEvent } from '@/onebot/event/notice/OB11BaseNoticeEvent'; -import { EventType } from '@/onebot/event/OneBotEvent'; import { NapCatCore } from '@/core'; +import { OB11BaseRequestEvent } from './OB11BaseRequestEvent'; -export class OB11FriendRequestEvent extends OB11BaseNoticeEvent { - override post_type = EventType.REQUEST; +export class OB11FriendRequestEvent extends OB11BaseRequestEvent { request_type = 'friend'; user_id: number; diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index 249fa1dc..b1312733 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/src/onebot/event/request/OB11GroupRequest.ts @@ -1,18 +1,18 @@ -import { OB11GroupNoticeEvent } from '@/onebot/event/notice/OB11GroupNoticeEvent'; -import { EventType } from '@/onebot/event/OneBotEvent'; import { NapCatCore } from '@/core'; +import { OB11BaseRequestEvent } from './OB11BaseRequestEvent'; -export class OB11GroupRequestEvent extends OB11GroupNoticeEvent { - override post_type = EventType.REQUEST; +export class OB11GroupRequestEvent extends OB11BaseRequestEvent { request_type = 'group'; - override user_id: number; + group_id: number; + user_id: number; comment: string; flag: string; sub_type: string; constructor(core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) { - super(core, groupId, userId); + super(core); + this.group_id = groupId; this.user_id = userId; this.sub_type = sub_type; this.comment = comment; From 870edb251349fce3c1d0db046937b8405879da37 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: Sun, 18 May 2025 18:52:07 +0800 Subject: [PATCH 2/6] fix: override Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/onebot/event/request/OB11FriendRequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onebot/event/request/OB11FriendRequest.ts b/src/onebot/event/request/OB11FriendRequest.ts index 3a9977c6..64b3f5b0 100644 --- a/src/onebot/event/request/OB11FriendRequest.ts +++ b/src/onebot/event/request/OB11FriendRequest.ts @@ -2,7 +2,7 @@ import { NapCatCore } from '@/core'; import { OB11BaseRequestEvent } from './OB11BaseRequestEvent'; export class OB11FriendRequestEvent extends OB11BaseRequestEvent { - request_type = 'friend'; + override request_type = 'friend'; user_id: number; comment: string; From 401684542a677f10c6a1e42e6e49674d4fb21129 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: Sun, 18 May 2025 18:53:01 +0800 Subject: [PATCH 3/6] fix: override Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/onebot/event/request/OB11GroupRequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index b1312733..0227d52f 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/src/onebot/event/request/OB11GroupRequest.ts @@ -2,7 +2,7 @@ import { NapCatCore } from '@/core'; import { OB11BaseRequestEvent } from './OB11BaseRequestEvent'; export class OB11GroupRequestEvent extends OB11BaseRequestEvent { - request_type = 'group'; + override request_type = 'group'; group_id: number; user_id: number; From bbc2391bf8494a1c52d569810ffc66e978cdee43 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: Sun, 18 May 2025 18:55:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/onebot/event/request/OB11BaseRequestEvent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onebot/event/request/OB11BaseRequestEvent.ts b/src/onebot/event/request/OB11BaseRequestEvent.ts index b151816d..c8e9d145 100644 --- a/src/onebot/event/request/OB11BaseRequestEvent.ts +++ b/src/onebot/event/request/OB11BaseRequestEvent.ts @@ -1,4 +1,4 @@ -import { EventType, OneBotEvent } from '../OneBotEvent'; +import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; export abstract class OB11BaseRequestEvent extends OneBotEvent { post_type = EventType.REQUEST; From 636568fd30bf5b8e969f2712bfdcd8d34f42029a 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: Sun, 18 May 2025 18:56:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E5=AD=97=E9=9D=A2=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/onebot/event/request/OB11GroupRequest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onebot/event/request/OB11GroupRequest.ts b/src/onebot/event/request/OB11GroupRequest.ts index 0227d52f..d4cb5551 100644 --- a/src/onebot/event/request/OB11GroupRequest.ts +++ b/src/onebot/event/request/OB11GroupRequest.ts @@ -2,7 +2,7 @@ import { NapCatCore } from '@/core'; import { OB11BaseRequestEvent } from './OB11BaseRequestEvent'; export class OB11GroupRequestEvent extends OB11BaseRequestEvent { - override request_type = 'group'; + override request_type: 'group' = 'group'; group_id: number; user_id: number; From 1870427c0fd997855bcd1e44d92e4164628e26c9 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: Sun, 18 May 2025 18:58:27 +0800 Subject: [PATCH 6/6] fix: readonly --- src/onebot/event/request/OB11BaseRequestEvent.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/onebot/event/request/OB11BaseRequestEvent.ts b/src/onebot/event/request/OB11BaseRequestEvent.ts index c8e9d145..efe69425 100644 --- a/src/onebot/event/request/OB11BaseRequestEvent.ts +++ b/src/onebot/event/request/OB11BaseRequestEvent.ts @@ -1,6 +1,6 @@ import { EventType, OneBotEvent } from '@/onebot/event/OneBotEvent'; export abstract class OB11BaseRequestEvent extends OneBotEvent { - post_type = EventType.REQUEST; + readonly post_type = EventType.REQUEST; abstract request_type: string; }