From dc1edc3f74d9b57579c454cbc21b7060836f2f49 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 25 Apr 2014 12:22:40 +0200 Subject: Reaktor:fix ^ --- config.py | 2 +- titlebot/titlebot.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.py b/config.py index db4c8a3..0a01c5c 100644 --- a/config.py +++ b/config.py @@ -46,7 +46,7 @@ public_commands = [ 'argv': [ 'commands/say', 'I\'m famous' ] }, # identify via direct connect { 'capname': 'identify', - 'pattern': 'identify' + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', 'argv' : [ 'commands/identify' ]} ] commands = [ diff --git a/titlebot/titlebot.py b/titlebot/titlebot.py index d04789c..dc4e28a 100644 --- a/titlebot/titlebot.py +++ b/titlebot/titlebot.py @@ -33,7 +33,7 @@ def default_command(cmd): 'capname': cmd, 'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P.*))?$', 'argv': [ 'commands/' + cmd ] } -def dot_command(cmd): +def titlebot_cmd(cmd): return { 'capname': cmd, 'pattern': '\\.' + cmd + '\\s*(?:\\s+(?P.*))?$', @@ -46,19 +46,19 @@ public_commands = [ default_command('rev'), default_command('uptime'), default_command('nocommand'), - dot_command('list'), - dot_command('help'), - dot_command('up'), - dot_command('new'), - dot_command('undo'), - dot_command('down'), + titlebot_cmd('list'), + titlebot_cmd('help'), + titlebot_cmd('up'), + titlebot_cmd('new'), + titlebot_cmd('undo'), + titlebot_cmd('down'), # identify via direct connect { 'capname': 'identify', - 'pattern': 'identify' + '\\s*(?:\\s+(?P.*))?$', + 'pattern': '^identify' + '\\s*(?:\\s+(?P.*))?$', 'argv' : [ 'commands/identify' ]} ] commands = [ default_command('reload'), - dot_command('clear') + titlebot_cmd('clear') ] -- cgit v1.2.3