Reaktor on_ping -> nag

3 files changed, 23 insertions, 5 deletions

diff --git a/IRC/ircasy.py b/IRC/ircasy.py
index 99fbc32..38f202f 100644
--- a/IRC/ircasy.py
+++ b/IRC/ircasy.py
@@ -110,6 +110,7 @@ class asybot(asychat):
     if command == 'PING':
       self.push('PONG :%s' % rest)
       self.log.debug("Replying to servers PING with PONG :%s" %rest)
+      self.on_ping(prefix, command, params, rest)
 
     elif command == 'PRIVMSG':
       self.on_privmsg(prefix, command, params, rest)
@@ -185,6 +186,9 @@ class asybot(asychat):
   def on_join(self, prefix, command, params, rest):
     pass
 
+  def on_ping(self, prefix, command, params, rest):
+    pass
+
   def on_privmsg(self, prefix, command, params, rest):
     pass
 
diff --git a/IRC/reaktor.py b/IRC/reaktor.py
index 9a3424a..799fe55 100755
--- a/IRC/reaktor.py
+++ b/IRC/reaktor.py
@@ -39,6 +39,12 @@ class Reaktor(asybot):
     for command in getconf('on_join', []):
       self.execute_command(command, None, prefix, params)
 
+  def on_ping(self, prefix, command, params, rest):
+    for command in getconf('on_ping', []):
+      prefix = '!' # => env = { _prefix: '!', _from: '' }
+      params = command.get('targets') # TODO why don't we get a list here and use ','.join() ?
+      self.execute_command(command, None, prefix, params)
+
   def on_privmsg(self, prefix, command, params, rest):
     for command in getconf('commands'):
       y = match(command['pattern'], rest)
diff --git a/config.py b/config.py
index 1741be2..98f17d6 100644
--- a/config.py
+++ b/config.py
@@ -71,11 +71,6 @@ public_commands = [
 ]
 commands = [
   default_command('reload'),
-  default_command('nag', env={
-    'workdir': workdir,
-    'hostsdir': '/home/tv/krebs/hosts',
-    'servicesdir': '/home/tv/krebs/services'
-  })
 ]
 
 on_join = [
@@ -85,3 +80,16 @@ on_join = [
     'env': { 'state_file': workdir + '/tell.txt' }
   }
 ]
+
+on_ping = [
+  {
+    'capname': 'nag',
+    'argv': [ 'commands/nag' ],
+    'env': {
+      'workdir': workdir,
+      'hostsdir': '/home/tv/krebs/hosts',
+      'servicesdir': '/home/tv/krebs/services'
+    },
+    'targets': irc_channels
+  }
+]