ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-10-31 15:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

⏪ revert command change

Browse Source
This commit is contained in:
yanyongyu
2021-02-07 20:57:08 +08:00
parent ef98a6f23c
commit 217b1a5fac
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
nonebot/plugin.py
View File

@@ -422,15 +422,12 @@ def on_command(cmd: Union[str, Tuple[str, ...]],
async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): async def _strip_cmd(bot: "Bot", event: "Event", state: T_State):
message = event.get_message() message = event.get_message()
text_processed = False segment = message.pop(0)
for index, segment in enumerate(message): new_message = message.__class__(
segment: "MessageSegment" = message.pop(index) str(segment)
if segment.is_text() and not text_processed: [len(state["_prefix"]["raw_command"]):].lstrip()) # type: ignore
segment, *_ = message.__class__( for new_segment in reversed(new_message):
str(segment)[len(state["_prefix"]["raw_command"]):].lstrip( message.insert(0, new_segment)
)) # type: ignore
text_processed = True
message.insert(index, segment)
handlers = kwargs.pop("handlers", []) handlers = kwargs.pop("handlers", [])
handlers.insert(0, _strip_cmd) handlers.insert(0, _strip_cmd)

5
nonebot/rule.py
View File

@@ -137,9 +137,8 @@ class TrieRule:
prefix = None prefix = None
suffix = None suffix = None
message = event.get_message() message = event.get_message()
message_seg: Optional["MessageSegment"] = next( message_seg = message[0]
filter(lambda x: x.is_text(), message), None) if message_seg.is_text():
if message_seg is not None:
prefix = cls.prefix.longest_prefix(str(message_seg).lstrip()) prefix = cls.prefix.longest_prefix(str(message_seg).lstrip())
message_seg_r = message[-1] message_seg_r = message[-1]
if message_seg_r.is_text(): if message_seg_r.is_text():