修改依赖注入方法

This commit is contained in:
HibiKier 2022-10-16 22:36:13 +08:00
parent ba6668f144
commit 3d4a7950c5

View File

@ -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: 提示文本
"""