ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-21 18:15:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ add kwargs support for matcher send/finish/pause/reject

Browse Source
This commit is contained in:
yanyongyu 2020-10-17 19:50:25 +08:00
parent 9ad629841b
commit 56c9c24dc6
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nonebot/matcher.py
View File

@ -298,66 +298,70 @@ class Matcher(metaclass=MatcherMeta):
return _decorator return _decorator
@classmethod @classmethod
async def send(cls, message: Union[str, Message, MessageSegment]): async def send(cls, message: Union[str, Message, MessageSegment], **kwargs):
""" """
:说明: :说明:
发送一条消息给当前交互用户 发送一条消息给当前交互用户
:参数: :参数:
* ``message: Union[str, Message, MessageSegment]``: 消息内容 * ``message: Union[str, Message, MessageSegment]``: 消息内容
* ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api
""" """
bot = current_bot.get() bot = current_bot.get()
event = current_event.get() event = current_event.get()
await bot.send(event=event, message=message) await bot.send(event=event, message=message, **kwargs)
@classmethod @classmethod
async def finish( async def finish(cls,
cls, message: Optional[Union[str, Message,
message: Optional[Union[str, Message, MessageSegment]] = None,
MessageSegment]] = None) -> NoReturn: **kwargs) -> NoReturn:
""" """
:说明: :说明:
发送一条消息给当前交互用户并结束当前事件响应器 发送一条消息给当前交互用户并结束当前事件响应器
:参数: :参数:
* ``message: Union[str, Message, MessageSegment]``: 消息内容 * ``message: Union[str, Message, MessageSegment]``: 消息内容
* ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api
""" """
bot = current_bot.get() bot = current_bot.get()
event = current_event.get() event = current_event.get()
if message: if message:
await bot.send(event=event, message=message) await bot.send(event=event, message=message, **kwargs)
raise FinishedException raise FinishedException
@classmethod @classmethod
async def pause( async def pause(cls,
cls, prompt: Optional[Union[str, Message,
prompt: Optional[Union[str, Message, MessageSegment]] = None,
MessageSegment]] = None) -> NoReturn: **kwargs) -> NoReturn:
""" """
:说明: :说明:
发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数
:参数: :参数:
* ``prompt: Union[str, Message, MessageSegment]``: 消息内容 * ``prompt: Union[str, Message, MessageSegment]``: 消息内容
* ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api
""" """
bot = current_bot.get() bot = current_bot.get()
event = current_event.get() event = current_event.get()
if prompt: if prompt:
await bot.send(event=event, message=prompt) await bot.send(event=event, message=prompt, **kwargs)
raise PausedException raise PausedException
@classmethod @classmethod
async def reject( async def reject(cls,
cls, prompt: Optional[Union[str, Message,
prompt: Optional[Union[str, Message, MessageSegment]] = None,
MessageSegment]] = None) -> NoReturn: **kwargs) -> NoReturn:
""" """
:说明: :说明:
发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数
:参数: :参数:
* ``prompt: Union[str, Message, MessageSegment]``: 消息内容 * ``prompt: Union[str, Message, MessageSegment]``: 消息内容
* ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api
""" """
bot = current_bot.get() bot = current_bot.get()
event = current_event.get() event = current_event.get()
if prompt: if prompt:
await bot.send(event=event, message=prompt) await bot.send(event=event, message=prompt, **kwargs)
raise RejectedException raise RejectedException
# 运行handlers # 运行handlers