From 3d4a7950c5a48df0fe825598aea2054f51cfaa53 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Sun, 16 Oct 2022 22:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/depends/__init__.py | 64 ++++++---------------------------------
 1 file changed, 10 insertions(+), 54 deletions(-)

diff --git a/utils/depends/__init__.py b/utils/depends/__init__.py
index d032dc6a..6fb779a0 100644
--- a/utils/depends/__init__.py
+++ b/utils/depends/__init__.py
@@ -1,4 +1,4 @@
-from typing import List, Callable
+from typing import List, Callable, Optional
 
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
 from nonebot.internal.matcher import Matcher
@@ -25,61 +25,17 @@ def cost_gold(gold: int):
     return Depends(dependency)
 
 
-def ImageList() -> List[str]:
-    """
-    说明:
-        获取图片列表
-    """
-    async def dependency(event: MessageEvent):
-        return get_message_img(event.message)
-
-    return Depends(dependency)
-
-
-def AtList() -> List[str]:
-    """
-    说明:
-        获取at列表
-    """
-    async def dependency(event: MessageEvent):
-        return get_message_at(event.message)
-
-    return Depends(dependency)
-
-
-def FaceList() -> List[str]:
-    """
-    说明:
-        获取face列表
-    """
-    async def dependency(event: MessageEvent):
-        return get_message_face(event.message)
-
-    return Depends(dependency)
-
-
-def PlaintText() -> str:
-    """
-    说明:
-        获取纯文本
-    """
-    async def dependency(event: MessageEvent):
-        return get_message_text(event.message)
-
-    return Depends(dependency)
-
-
-async def _match(matcher: Matcher, event: MessageEvent, msg: str, func: Callable):
+async def _match(matcher: Matcher, event: MessageEvent, msg: Optional[str], func: Callable):
     _list = func(event.message)
     if not _list and msg:
         await matcher.finish(msg)
     return _list
 
 
-def MatchImageList(msg: str) -> List[str]:
+def ImageList(msg: Optional[str] = None) -> List[str]:
     """
     说明:
-        获取图片列表且不能为空，为空时提示并结束事件
+        获取图片列表，含有msg时不能为空，为空时提示并结束事件
     参数:
         :param msg: 提示文本
     """
@@ -89,10 +45,10 @@ def MatchImageList(msg: str) -> List[str]:
     return Depends(dependency)
 
 
-def MatchAtList(msg: str) -> List[str]:
+def AtList(msg: Optional[str] = None) -> List[str]:
     """
     说明:
-        获取at列表且不能为空，为空时提示并结束事件
+        获取at列表，含有msg时不能为空，为空时提示并结束事件
     参数:
         :param msg: 提示文本
     """
@@ -102,10 +58,10 @@ def MatchAtList(msg: str) -> List[str]:
     return Depends(dependency)
 
 
-def MatchFaceList(msg: str) -> List[str]:
+def FaceList(msg: Optional[str] = None) -> List[str]:
     """
     说明:
-        获取face列表且不能为空，为空时提示并结束事件
+        获取face列表，含有msg时不能为空，为空时提示并结束事件
     参数:
         :param msg: 提示文本
     """
@@ -115,10 +71,10 @@ def MatchFaceList(msg: str) -> List[str]:
     return Depends(dependency)
 
 
-def MatchPlaintText(msg: str) -> str:
+def PlaintText(msg: Optional[str] = None) -> str:
     """
     说明:
-        获取纯文本且不能为空，为空时提示并结束事件
+        获取纯文本且，含有msg时不能为空，为空时提示并结束事件
     参数:
         :param msg: 提示文本
     """