From c289b7b3c85200915f79d4e6dcf16123a4b594a8 Mon Sep 17 00:00:00 2001
From: Kyomotoi <1172294279@qq.com>
Date: Thu, 15 Apr 2021 23:57:04 +0800
Subject: =?UTF-8?q?=E2=9C=A8=F0=9F=8E=A8=F0=9F=92=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增：以图搜图（完善）
新增：Service中on_regex

修复：codacy部分错误
---
 ATRI/plugins/essential.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'ATRI/plugins/essential.py')

diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py
index 0fbed92..833ce01 100644
--- a/ATRI/plugins/essential.py
+++ b/ATRI/plugins/essential.py
@@ -56,15 +56,14 @@ async def shutdown() -> None:
     try:
         shutil.rmtree(PLUGIN_INFO_DIR)
         logger.debug("成功！")
-    except:
+    except Exception:
         repo = (
             '清理插件信息失败',
             '请前往 ATRI/data/service/services 下',
             '将 services 整个文件夹删除'
         )
-        logger.error(repo)
         time.sleep(10)
-        pass
+        raise Exception(repo)
 
 
 @driver.on_bot_connect
@@ -342,8 +341,12 @@ recall_event = sv.on_notice()
 
 @recall_event.handle()
 async def _recall_event(bot: Bot, event: GroupRecallNoticeEvent) -> None:
+    try:
+        repo = await bot.get_msg(message_id=event.message_id)
+    except:
+        return
+    
     group = event.group_id
-    repo = await bot.get_msg(message_id=event.message_id)
     repo = str(repo["message"])
     check = await coolq_code_check(repo, group=group)
     if not check:
@@ -364,8 +367,12 @@ async def _recall_event(bot: Bot, event: GroupRecallNoticeEvent) -> None:
 
 @recall_event.handle()
 async def _rec(bot: Bot, event: FriendRecallNoticeEvent) -> None:
+    try:
+        repo = await bot.get_msg(message_id=event.message_id)
+    except:
+        return
+    
     user = event.user_id
-    repo = await bot.get_msg(message_id=event.message_id)
     repo = str(repo["message"])
     check = await coolq_code_check(repo, user)
     if not check:
-- 
cgit v1.2.3