From bf17d46157adbd066b1f3923370bde0e8b71eea5 Mon Sep 17 00:00:00 2001
From: idranme <idranme@outlook.com>
Date: Fri, 30 Aug 2024 12:38:39 +0800
Subject: [PATCH] fix

---
 src/ntqqapi/ntcall.ts   |  5 ++---
 src/onebot11/adapter.ts | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/ntqqapi/ntcall.ts b/src/ntqqapi/ntcall.ts
index 709360b..ea8248b 100644
--- a/src/ntqqapi/ntcall.ts
+++ b/src/ntqqapi/ntcall.ts
@@ -135,9 +135,8 @@ interface InvokeOptions<ReturnType> {
 export function invoke<
   R extends Awaited<ReturnType<NTService[S][M] extends (...args: any) => any ? NTService[S][M] : any>>,
   S extends keyof NTService = any,
-  M extends keyof NTService[S] & string = any,
-  O = string
->(method: `${O extends `${S}/${M}` ? `${S}/${M}` : string}`, args?: unknown[], options: InvokeOptions<R> = {}) {
+  M extends keyof NTService[S] & string = any
+>(method: `${unknown extends `${S}/${M}` ? `${S}/${M}` : string}`, args?: unknown[], options: InvokeOptions<R> = {}) {
   const className = options.className ?? NTClass.NT_API
   const channel = options.channel ?? NTChannel.IPC_UP_2
   const timeout = options.timeout ?? 5000
diff --git a/src/onebot11/adapter.ts b/src/onebot11/adapter.ts
index 5c9e6c1..4713df5 100644
--- a/src/onebot11/adapter.ts
+++ b/src/onebot11/adapter.ts
@@ -127,32 +127,29 @@ class OneBot11Adapter extends Service {
             }
             subType = 'kick'
           }
-          const groupDecreaseEvent = new OB11GroupDecreaseEvent(
+          const event = new OB11GroupDecreaseEvent(
             parseInt(notify.group.groupCode),
             parseInt(member1Uin),
             parseInt(operatorId),
             subType,
           )
-          this.dispatch(groupDecreaseEvent)
+          this.dispatch(event)
         }
-        else if ([GroupNotifyType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS].includes(notify.type) && notify.status === GroupNotifyStatus.KUNHANDLE) {
+        else if (notify.type === GroupNotifyType.REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS && notify.status === GroupNotifyStatus.KUNHANDLE) {
           this.ctx.logger.info('有加群请求')
-          let requestUin = (await this.ctx.ntUserApi.getUinByUid(notify.user1.uid))
-          if (isNaN(parseInt(requestUin))) {
-            requestUin = (await this.ctx.ntUserApi.getUserDetailInfo(notify.user1.uid)).uin
-          }
-          const groupRequestEvent = new OB11GroupRequestEvent(
+          const requestUin = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
+          const event = new OB11GroupRequestEvent(
             parseInt(notify.group.groupCode),
             parseInt(requestUin) || 0,
             flag,
             notify.postscript,
           )
-          this.dispatch(groupRequestEvent)
+          this.dispatch(event)
         }
         else if (notify.type === GroupNotifyType.INVITED_BY_MEMBER && notify.status === GroupNotifyStatus.KUNHANDLE) {
           this.ctx.logger.info('收到邀请我加群通知')
           const userId = await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)
-          const groupInviteEvent = new OB11GroupRequestEvent(
+          const event = new OB11GroupRequestEvent(
             parseInt(notify.group.groupCode),
             parseInt(userId) || 0,
             flag,
@@ -160,7 +157,18 @@ class OneBot11Adapter extends Service {
             undefined,
             'invite'
           )
-          this.dispatch(groupInviteEvent)
+          this.dispatch(event)
+        }
+        else if (notify.type === GroupNotifyType.INVITED_NEED_ADMINI_STRATOR_PASS && notify.status === GroupNotifyStatus.KUNHANDLE) {
+          this.ctx.logger.info('收到群员邀请加群通知')
+          const userId = await this.ctx.ntUserApi.getUinByUid(notify.user1.uid)
+          const event = new OB11GroupRequestEvent(
+            parseInt(notify.group.groupCode),
+            parseInt(userId) || 0,
+            flag,
+            notify.postscript
+          )
+          this.dispatch(event)
         }
       } catch (e: any) {
         this.ctx.logger.error('解析群通知失败', e.stack)