From 3c2c1963f4f90a18f2c6798ad6fb433ddf50e792 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?=
 <nanaeonn@outlook.com>
Date: Tue, 22 Oct 2024 12:11:02 +0800
Subject: [PATCH] release: 3.1.2

---
 manifest.json                                 |  2 +-
 package.json                                  |  4 +--
 src/common/version.ts                         |  2 +-
 .../action/extends/GetGroupAddRequest.ts      | 31 +++++++++++--------
 src/onebot/action/types.ts                    |  2 +-
 src/webui/ui/NapCat.ts                        |  2 +-
 static/assets/renderer.js                     |  2 +-
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/manifest.json b/manifest.json
index e4364378..d3e08c94 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "icon": "./logo.png",
   "authors": [
     {
diff --git a/package.json b/package.json
index d169ab6c..02ddbec8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -37,7 +37,7 @@
     "commander": "^12.1.0",
     "async-mutex": "^0.5.0",
     "file-type": "^19.0.0",
-    "json-schema-to-ts": "^3.1.1",
+    "json-schema-to-ts": "^3.1.2",
     "image-size": "^1.1.1",
     "cors": "^2.8.5"
   },
diff --git a/src/common/version.ts b/src/common/version.ts
index 3e12183b..2e876435 100644
--- a/src/common/version.ts
+++ b/src/common/version.ts
@@ -1 +1 @@
-export const napCatVersion = '3.1.1';
+export const napCatVersion = '3.1.2';
diff --git a/src/onebot/action/extends/GetGroupAddRequest.ts b/src/onebot/action/extends/GetGroupAddRequest.ts
index b015c6d1..5e1f3edb 100644
--- a/src/onebot/action/extends/GetGroupAddRequest.ts
+++ b/src/onebot/action/extends/GetGroupAddRequest.ts
@@ -1,3 +1,4 @@
+import { GroupNotifyMsgStatus } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 
@@ -11,18 +12,22 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
     async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-        // const data = await this.core.apis.GroupApi.getGroupIgnoreNotifies();
-        // log(data);
-        // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
-        // const returnData: OB11GroupRequestNotify[] = [];
-        // for (const notify of notifies) {
-        //   const uin = || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
-        //   returnData.push({
-        //     group_id: parseInt(notify.group.groupCode),
-        //     user_id: parseInt(uin),
-        //     flag: notify.seq
-        //   });
-        // }
-        return null;
+        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
+        const retData: any = {
+            join_requests: await Promise.all(
+                ignoredNotifies
+                    .filter(notify => notify.type === 7)
+                    .map(async SSNotify => ({
+                        request_id: SSNotify.seq,
+                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
+                        requester_nick: SSNotify.user1?.nickName,
+                        group_id: SSNotify.group?.groupCode,
+                        group_name: SSNotify.group?.groupName,
+                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                    }))),
+        };
+
+        return retData;
     }
 }
diff --git a/src/onebot/action/types.ts b/src/onebot/action/types.ts
index cec81f57..a67a4c29 100644
--- a/src/onebot/action/types.ts
+++ b/src/onebot/action/types.ts
@@ -137,7 +137,7 @@ export enum ActionName {
 
     GetGuildList = 'get_guild_list',
     GetGuildProfile = 'get_guild_service_profile',
-    // GetGroupIgnoreAddRequest = 'get_group_ignore_add_request',
+    GetGroupIgnoreAddRequest = 'get_group_ignore_add_request',
     // Debug = 'debug',
     // TestApi01 = 'test_api_01',
     // UploadForwardMsg = "upload_forward_msg",
diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts
index fc3a4b57..c065055b 100644
--- a/src/webui/ui/NapCat.ts
+++ b/src/webui/ui/NapCat.ts
@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V3.1.1', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.1.2', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([
diff --git a/static/assets/renderer.js b/static/assets/renderer.js
index 793716cc..2957965f 100644
--- a/static/assets/renderer.js
+++ b/static/assets/renderer.js
@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.1.1", "napcat-update-button", "secondary")
+          SettingButton("V3.1.2", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([