From 9ed7cb942c6cafc745807ebce579d080ca298648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=8F=B6?= <1936472877@qq.com>
Date: Mon, 26 Aug 2024 12:54:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E6=94=B6=E9=A2=91=E9=81=93?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A8=E6=80=81=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/event/notice.ts |  2 +-
 src/qqBot.ts        | 11 ++++++++---
 src/types.ts        |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/event/notice.ts b/src/event/notice.ts
index 01a8dcf..ddb8f33 100644
--- a/src/event/notice.ts
+++ b/src/event/notice.ts
@@ -500,7 +500,7 @@ export class MessageReactionNoticeEvent extends NoticeEvent{
         this.guild_id = payload.guild_id
         this.channel_id = payload.channel_id
         this.user_id = payload.user_id
-        if(payload.target.type!==ReactionTargetType.Message) throw new Error(`unsupported reaction target type: ${payload.target.type}`)
+        if(![ReactionTargetType.Message, ReactionTargetType.ReactionTargetType_MSG].includes(payload.target.type)) throw new Error(`unsupported reaction target type: ${payload.target.type}`)
         this.message_id = payload.target.id
         this.emoji = payload.emoji
     }
diff --git a/src/qqBot.ts b/src/qqBot.ts
index 4e3cad0..6dd53d8 100644
--- a/src/qqBot.ts
+++ b/src/qqBot.ts
@@ -87,9 +87,14 @@ export class QQBot extends EventEmitter {
         const event_id = wsRes.id || '';
         if (!payload || !event) return;
         const transformEvent = QQEvent[event] || 'system'
-        const result=this.processPayload(event_id,transformEvent,payload)
-        if(!result) return this.logger.debug('解析事件失败',wsRes)
-        this.em(transformEvent, result);
+
+        try {
+            const result=this.processPayload(event_id,transformEvent,payload)
+            if(!result) return this.logger.debug('解析事件失败',wsRes)
+            this.em(transformEvent, result);
+        } catch (error) {
+            return this.logger.debug('解析事件失败',wsRes)
+        }
     }
     /**
      * 上传多媒体文件
diff --git a/src/types.ts b/src/types.ts
index 1f08cf8..126de7b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -166,6 +166,7 @@ export enum ReactionTargetType{
     Message,
     Thread,
     Comment,
-    Reply
+    Reply,
+    ReactionTargetType_MSG = 'ReactionTargetType_MSG'
 }