storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve robustness of command parsing

Browse Source 
Merge pull request #273 from mweinelt/robust-commandparser
This commit is contained in:
Martin Weinelt 2021-05-18 01:15:29 +02:00 committed by GitHub
parent 1c283654fd
commit cb95e25178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mumbleBot.py
View File

@ -252,20 +252,16 @@ class MumbleBot:
# you want to split the username # you want to split the username
user = user.split()[0] user = user.split()[0]
if message.startswith(tuple(var.config.get('commands', 'command_symbol'))): command_symbols = var.config.get('commands', 'command_symbol')
# remove the symbol from the message match = re.match(fr'^[{re.escape(command_symbols)}](?P<command>\S+)(?:\s(?P<argument>.*))?', message)
message = message[1:].split(' ', 1) if match:
command = match.group("command").lower()
argument = match.group("argument") or ""
# use the first word as a command, the others one as parameters if not command:
if len(message) > 0:
command = message[0].lower()
parameter = ''
if len(message) > 1:
parameter = message[1].rstrip()
else:
return return
self.log.info('bot: received command ' + command + ' - ' + parameter + ' by ' + user) self.log.info(f'bot: received command "{command}" with arguments "{argument}" from {user}')
# Anti stupid guy function # Anti stupid guy function
if not self.is_admin(user) and not var.config.getboolean('bot', 'allow_private_message') and text.session: if not self.is_admin(user) and not var.config.getboolean('bot', 'allow_private_message') and text.session:
@ -279,8 +275,8 @@ class MumbleBot:
tr('user_ban')) tr('user_ban'))
return return
if not self.is_admin(user) and parameter: if not self.is_admin(user) and argument:
input_url = util.get_url_from_input(parameter) input_url = util.get_url_from_input(argument)
if input_url and var.db.has_option('url_ban', input_url): if input_url and var.db.has_option('url_ban', input_url):
self.mumble.users[text.actor].send_text_message( self.mumble.users[text.actor].send_text_message(
tr('url_ban')) tr('url_ban'))
@ -323,7 +319,7 @@ class MumbleBot:
tr('not_in_my_channel')) tr('not_in_my_channel'))
return return
self.cmd_handle[command_exc]['handle'](self, user, text, command_exc, parameter) self.cmd_handle[command_exc]['handle'](self, user, text, command_exc, argument)
except: except:
error_traceback = traceback.format_exc() error_traceback = traceback.format_exc()
error = error_traceback.rstrip().split("\n")[-1] error = error_traceback.rstrip().split("\n")[-1]