From 9a7e7d3862b6b51d1ea49304ba57b8a0ae822ace Mon Sep 17 00:00:00 2001
From: Rock Chin <junyan_qin@outlook.com>
Date: Mon, 12 Dec 2022 17:18:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=A7=E8=A1=8C=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E5=90=8E=E6=97=A0=E6=B3=95=E5=86=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/qqbot/manager.py | 54 +++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py
index 3318ed10..e9ee62e3 100644
--- a/pkg/qqbot/manager.py
+++ b/pkg/qqbot/manager.py
@@ -190,20 +190,21 @@ class QQBotManager:
             else:
                 processing.append("person_{}".format(event.sender.id))
 
-                # 超时则重试，重试超过次数则放弃
-                failed = 0
-                for i in range(self.retry):
-                    try:
-                        reply = self.process_message('person', event.sender.id, str(event.message_chain))
-                        break
-                    except FunctionTimedOut:
-                        failed += 1
-                        continue
+                try:
+                    # 超时则重试，重试超过次数则放弃
+                    failed = 0
+                    for i in range(self.retry):
+                        try:
+                            reply = self.process_message('person', event.sender.id, str(event.message_chain))
+                            break
+                        except FunctionTimedOut:
+                            failed += 1
+                            continue
 
-                if failed == self.retry:
-                    reply = "[bot]err:请求超时"
-
-                processing.remove("person_{}".format(event.sender.id))
+                    if failed == self.retry:
+                        reply = "[bot]err:请求超时"
+                finally:
+                    processing.remove("person_{}".format(event.sender.id))
 
         if reply != '':
             return await self.bot.send(event, reply)
@@ -225,20 +226,21 @@ class QQBotManager:
 
             processing.append("group_{}".format(event.sender.id))
 
-            # 超时则重试，重试超过次数则放弃
-            failed = 0
-            for i in range(self.retry):
-                try:
-                    reply = self.process_message('group', event.group.id, str(event.message_chain).strip())
-                    break
-                except FunctionTimedOut:
-                    failed += 1
-                    continue
+            try:
+                # 超时则重试，重试超过次数则放弃
+                failed = 0
+                for i in range(self.retry):
+                    try:
+                        reply = self.process_message('group', event.group.id, str(event.message_chain).strip())
+                        break
+                    except FunctionTimedOut:
+                        failed += 1
+                        continue
 
-            if failed == self.retry:
-                reply = "err:请求超时"
-
-            processing.remove("group_{}".format(event.sender.id))
+                if failed == self.retry:
+                    reply = "err:请求超时"
+            finally:
+                processing.remove("group_{}".format(event.sender.id))
 
         if reply != '':
             return await self.bot.send(event, reply)