From 0fd75b338f302534b2cc464c78da96854a4962e3 Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@hotmail.com>
Date: Tue, 27 Feb 2024 20:06:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A0=E7=BE=A4=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=20fix:=20=E5=8A=A0=E7=BE=A4=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A0=E5=A5=BD=E5=8F=8Bpost=5Ftype=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BArequest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/main.ts                                | 10 ++++++++++
 src/ntqqapi/types.ts                            |  1 +
 src/onebot11/event/request/OB11FriendRequest.ts |  2 +-
 src/onebot11/event/request/OB11GroupRequest.ts  |  2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index f7dfbc6..3a13c42 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -289,6 +289,16 @@ function onLoad() {
                             groupRequestEvent.flag = notify.seq;
                             postOB11Event(groupRequestEvent);
                         }
+                        else if(notify.type == GroupNotifyTypes.INVITE_ME){
+                            groupNotifies[notify.seq] = notify;
+                            let groupInviteEvent = new OB11GroupRequestEvent();
+                            groupInviteEvent.group_id = parseInt(notify.group.groupCode);
+                            let user_id = (await NTQQApi.getUserDetailInfo(notify.user2.uid))?.uin
+                            groupInviteEvent.user_id = parseInt(user_id);
+                            groupInviteEvent.sub_type = "invite";
+                            groupInviteEvent.flag = notify.seq;
+                            postOB11Event(groupInviteEvent);
+                        }
                     }
                 } catch (e) {
                     log("解析群通知失败", e.stack);
diff --git a/src/ntqqapi/types.ts b/src/ntqqapi/types.ts
index e1c4a0a..ef9fae1 100644
--- a/src/ntqqapi/types.ts
+++ b/src/ntqqapi/types.ts
@@ -300,6 +300,7 @@ export interface RawMessage {
 }
 
 export enum GroupNotifyTypes {
+    INVITE_ME = 1,
     INVITED_JOIN = 4,  // 有人接受了邀请入群
     JOIN_REQUEST = 7,
     ADMIN_SET = 8,
diff --git a/src/onebot11/event/request/OB11FriendRequest.ts b/src/onebot11/event/request/OB11FriendRequest.ts
index da5ff4e..9c9bc8e 100644
--- a/src/onebot11/event/request/OB11FriendRequest.ts
+++ b/src/onebot11/event/request/OB11FriendRequest.ts
@@ -3,7 +3,7 @@ import {EventType} from "../OB11BaseEvent";
 
 
 export class OB11FriendRequestEvent extends OB11BaseNoticeEvent {
-    // post_type = EventType.REQUEST
+    post_type = EventType.REQUEST
     user_id: number;
     request_type: "friend" = "friend";
     comment: string;
diff --git a/src/onebot11/event/request/OB11GroupRequest.ts b/src/onebot11/event/request/OB11GroupRequest.ts
index 5ed8e57..3cc9655 100644
--- a/src/onebot11/event/request/OB11GroupRequest.ts
+++ b/src/onebot11/event/request/OB11GroupRequest.ts
@@ -1,7 +1,9 @@
 import {OB11GroupNoticeEvent} from "../notice/OB11GroupNoticeEvent";
+import {EventType} from "../OB11BaseEvent";
 
 
 export class OB11GroupRequestEvent extends OB11GroupNoticeEvent{
+    post_type = EventType.REQUEST;
     request_type: "group" = "group";
     sub_type: "add" | "invite" = "add";
     comment: string;