From 7ad09169ead36560e3089128d7c5ec7dd30e4fef Mon Sep 17 00:00:00 2001
From: Nepenthe <Ttjonne@outlook.com>
Date: Sun, 18 May 2025 18:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=BD=E8=B1=A1=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=A7=E6=89=BF=E5=85=B3=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;