1 files changed, 57 insertions, 12 deletions
diff --git a/Reaktor/config.py b/Reaktor/config.py
index 2dd6ac2f..b1158271 100644
--- a/Reaktor/config.py
+++ b/Reaktor/config.py
@@ -1,37 +1,82 @@
+from os.path import abspath, expanduser
+import re
 
-debug = True
+debug = False
 
-# CAVEAT name should not contains regex magic
 name = 'crabmanner'
 
+#workdir = expanduser('~') + '/state'
+workdir = '/home/reaktor/state'
+
 irc_alarm_timeout = 300
 irc_hammer_interval = 10
 irc_kill_timeout = 360
 irc_nickname = name
 irc_server = 'irc.freenode.org'
 irc_port = 6667
+irc_restart_timeout = 5
 irc_channels = [
   '#krebs'
 ]
+admin_file=workdir+'/admin.lst'
+auth_file=workdir+'/auth.lst'
+
+config_filename = abspath(__file__)
+
+# me is used, so name cannot kill our patterns below
+me = '\\b' + re.escape(name) + '\\b'
+me_or_us = '(?:' + me + '|\\*)'
 
-def default_command(cmd):
+def default_command(cap, cmd=None, env=None):
+  if not env: env = {}
+  if cmd == None: cmd=cap
   return {
-    'capname': cmd,
-    'pattern': '^(?:' + name + '|\\*):\\s*' + cmd + '\\s*(?:\\s+(?P<args>.*))?$',
-    'argv': [ 'commands/' + cmd ] }
+    'capname': cap,
+    'pattern': '^' + me_or_us + ':\\s*' + cap + '\\s*(?:\\s+(?P<args>.*))?$',
+    'argv': [ 'commands/' + cmd ],
+    'env': env
+  }
 
-commands = [
-  default_command('caps'),
+def simple_command(cap, cmd=None, env={}):
+  if cmd == None: cmd=cap
+  return {
+    'capname': cap,
+    'pattern': '^' + cap + '\\s*(?:\\s+(?P<args>.*))?$',
+    'argv' : [ 'commands/' + cmd ],
+    'env': env
+  }
+
+public_commands = [
+  default_command('caps', env={
+    'config_filename': config_filename
+  }),
   default_command('hello'),
-  default_command('reload'),
   default_command('badcommand'),
   default_command('rev'),
   default_command('uptime'),
   default_command('nocommand'),
+  default_command('tell', cmd='tell-on_privmsg', env={
+    'state_file': workdir + '/tell.txt'
+  }),
   # command not found
-  { 'pattern': '^(?:' + name + '|\\*):.*',
+  { 'pattern': '^' + me_or_us + ':.*',
     'argv': [ 'commands/respond','You are made of stupid!'] },
   # "highlight"
-  { 'pattern': '.*\\b' + name + '\\b.*',
-    'argv': [ 'commands/say', 'I\'m famous' ] }
+  { 'pattern': '.*' + me + '.*',
+    'argv': [ 'commands/say', 'I\'m famous' ] },
+  # identify via direct connect
+  simple_command('identify', env={
+    'config_filename': config_filename
+  })
+]
+commands = [
+  default_command('reload')
+]
+
+on_join = [
+  {
+    'capname': 'tell',
+    'argv': [ 'commands/tell-on_join' ],
+    'env': { 'state_file': workdir + '/tell.txt' }
+  }
 ]