summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2014-04-25 13:42:45 +0200
committertv <tv@nomic.retiolum>2014-04-25 13:42:45 +0200
commit14751fbcb177f70cf8989f4d27c566b2576ebb70 (patch)
tree275db4d11bb9acc935d8c652b49bb1db2e589638
parent7bf0b790b95d97d33e57a4e52cf7681bc6366d98 (diff)
reaktor config: tell is a default_command
-rw-r--r--Reaktor/config.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/Reaktor/config.py b/Reaktor/config.py
index 7f3f9c40..5ea991b0 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -26,10 +26,11 @@ config_filename = abspath(__file__)
me = '\\b' + re.escape(name) + '\\b'
me_or_us = '(?:' + me + '|\\*)'
-def default_command(cmd, env={}):
+def default_command(cap, cmd=None, env={}):
+ if cmd == None: cmd=cap
return {
- 'capname': cmd,
- 'pattern': '^' + me_or_us + ':\\s*' + cmd + '\\s*(?:\\s+(?P<args>.*))?$',
+ 'capname': cap,
+ 'pattern': '^' + me_or_us + ':\\s*' + cap + '\\s*(?:\\s+(?P<args>.*))?$',
'argv': [ 'commands/' + cmd ],
'env': env
}
@@ -43,12 +44,9 @@ public_commands = [
default_command('rev'),
default_command('uptime'),
default_command('nocommand'),
- {
- 'capname': 'tell',
- 'pattern': '^' + me_or_us + ':\\s*' + 'tell' + '\\s*(?:\\s+(?P<args>.*))?$',
- 'argv': [ 'commands/tell-on_privmsg' ],
- 'env': { 'state_file': workdir + '/tell.txt' }
- },
+ default_command('tell', cmd='tell-on_privmsg', env={
+ 'state_file': workdir + '/tell.txt'
+ }),
# command not found
{ 'pattern': '^' + me_or_us + ':.*',
'argv': [ 'commands/respond','You are made of stupid!'] },