ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-24 09:05:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix command start bug

Browse Source
This commit is contained in:
Richard Chien 2018-07-03 17:32:12 +08:00
parent 1d0885ef2e
commit 4ab1f4a01b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
none/command.py
View File

@ -28,7 +28,7 @@ _sessions = {}
class Command: class Command:
__slots__ = ( __slots__ = (
'name', 'func', 'permission', 'only_to_me', 'args_parser_func') 'name', 'func', 'permission', 'only_to_me', 'args_parser_func')
def __init__(self, *, name: Tuple[str], func: Callable, permission: int, def __init__(self, *, name: Tuple[str], func: Callable, permission: int,
only_to_me: bool): only_to_me: bool):
@ -242,20 +242,26 @@ def _new_command_session(bot: CQHttp,
""" """
msg = str(ctx['message']).lstrip() msg = str(ctx['message']).lstrip()
matched_start = None
for start in bot.config.COMMAND_START: for start in bot.config.COMMAND_START:
if isinstance(start, type(re.compile(''))): if isinstance(start, type(re.compile(''))):
m = start.search(msg) m = start.search(msg)
if m: if m and m.start(0) == 0:
full_command = msg[len(m.group(0)):].lstrip() if matched_start is None or \
break len(m.group(0)) > len(matched_start):
matched_start = m.group(0)
elif isinstance(start, str): elif isinstance(start, str):
if msg.startswith(start): if msg.startswith(start):
full_command = msg[len(start):].lstrip() if matched_start is None or \
break len(start) > len(matched_start):
else: matched_start = start
if matched_start is None:
# it's not a command # it's not a command
return None return None
full_command = msg[len(matched_start):].lstrip()
if not full_command: if not full_command:
# command is empty # command is empty
return None return None