summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-04-25 12:23:40 +0200
committermakefu <root@pigstarter.de>2014-04-25 12:23:40 +0200
commitc35d7c4e017baa57c14f1fb4b48f18e153ced549 (patch)
treee429dc025d8d9a3d11ddecc39232959efd371b62
parent56de31fe812d338ed49d2cfbb4c5dad9761bedf0 (diff)
parent2ac7e46d6f242e299d2ad2a3f631dd45d3d95cba (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--Reaktor/config.py2
-rw-r--r--Reaktor/titlebot/titlebot.py18
2 files changed, 10 insertions, 10 deletions
diff --git a/Reaktor/config.py b/Reaktor/config.py
index db4c8a3e..0a01c5cb 100644
--- a/Reaktor/config.py
+++ b/Reaktor/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<args>.*))?$',
+ 'pattern': '^identify' + '\\s*(?:\\s+(?P<args>.*))?$',
'argv' : [ 'commands/identify' ]}
]
commands = [
diff --git a/Reaktor/titlebot/titlebot.py b/Reaktor/titlebot/titlebot.py
index f85e69f2..396b9b58 100644
--- a/Reaktor/titlebot/titlebot.py
+++ b/Reaktor/titlebot/titlebot.py
@@ -33,7 +33,7 @@ def default_command(cmd):
'capname': cmd,
'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P<args>.*))?$',
'argv': [ 'commands/' + cmd ] }
-def dot_command(cmd):
+def titlebot_cmd(cmd):
return {
'capname': cmd,
'pattern': '^\\.' + cmd + '\\s*(?:\\s+(?P<args>.*))?$',
@@ -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<args>.*))?$',
+ 'pattern': '^identify' + '\\s*(?:\\s+(?P<args>.*))?$',
'argv' : [ 'commands/identify' ]}
]
commands = [
default_command('reload'),
- dot_command('clear')
+ titlebot_cmd('clear')
]