mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-15 06:12:53 +08:00
修改依赖注入方法
This commit is contained in:
parent
ba6668f144
commit
3d4a7950c5
@ -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: 提示文本
|
||||
"""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user