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

Fix command split bug

Browse Source
This commit is contained in:
Richard Chien 2018-07-03 23:13:34 +08:00
parent 4ab1f4a01b
commit 2a2a7a2ae3
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
none/command.py
View File

@ -244,17 +244,21 @@ def _new_command_session(bot: CQHttp,
matched_start = None matched_start = None
for start in bot.config.COMMAND_START: for start in bot.config.COMMAND_START:
# loop through COMMAND_START to find the longest matched start
curr_matched_start = None
if isinstance(start, type(re.compile(''))): if isinstance(start, type(re.compile(''))):
m = start.search(msg) m = start.search(msg)
if m and m.start(0) == 0: if m and m.start(0) == 0:
if matched_start is None or \ curr_matched_start = m.group(0)
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):
if matched_start is None or \ curr_matched_start = start
len(start) > len(matched_start):
matched_start = start if curr_matched_start is not None and \
(matched_start is None or
len(curr_matched_start) > len(matched_start)):
# a longer start, use it
matched_start = curr_matched_start
if matched_start is None: if matched_start is None:
# it's not a command # it's not a command
@ -271,13 +275,19 @@ def _new_command_session(bot: CQHttp,
if not cmd_name: if not cmd_name:
for sep in bot.config.COMMAND_SEP: for sep in bot.config.COMMAND_SEP:
# loop through COMMAND_SEP to find the most optimized split
curr_cmd_name = None
if isinstance(sep, type(re.compile(''))): if isinstance(sep, type(re.compile(''))):
cmd_name = tuple(sep.split(cmd_name_text)) curr_cmd_name = tuple(sep.split(cmd_name_text))
break
elif isinstance(sep, str): elif isinstance(sep, str):
cmd_name = tuple(cmd_name_text.split(sep)) curr_cmd_name = tuple(cmd_name_text.split(sep))
break
else: if curr_cmd_name is not None and \
(not cmd_name or len(curr_cmd_name) > len(cmd_name)):
# a more optimized split, use it
cmd_name = curr_cmd_name
if not cmd_name:
cmd_name = (cmd_name_text,) cmd_name = (cmd_name_text,)
cmd = _find_command(cmd_name) cmd = _find_command(cmd_name)