Better use of logging

[sid.git] / sid / echo.py

diff --git a/sid/echo.py b/sid/echo.py
index aec0b9d9c954e65f7f6c4b3db1ef716b5e06f1b6..94836d0b4c4766cb0ebc33015676ddcb66c7f188 100644 (file)
--- a/sid/echo.py
+++ b/sid/echo.py
@@ -21,52 +21,61 @@ class Echo(Plugin):
 
     def __init__(self, bot):
         Plugin.__init__(self, bot)
-        self.online = set()
         self.inbox = dict()
+        self.presence = dict()
         # The groupchat_presence event is triggered whenever a
         # presence stanza is received from any chat room, including
         # any presences you send yourself. To limit event handling
         # to a single room, use the events muc::room@server::presence,
         # muc::room@server::got_online, or muc::room@server::got_offline.
-        bot.add_event_handler("muc::%s::got_offline" % self.bot.room, self._went_offline)
-        bot.add_event_handler("muc::%s::got_online" %  self.bot.room, self._went_online)
         bot.add_event_handler("muc::%s::presence" %    self.bot.room, self.log_presence)
 
     def log_presence(self, pres):
-        self.log.debug('{0}: {1}'.format(pres['muc']['nick'], pres['type']))
-
-    def _went_online(self, pres):
-        nick = pres['muc']['nick']
-        self.online.add(nick)
-        while self.inbox.get(nick, []):
-            self.bot.send_message(mto=self.bot.room,
-                              mbody=self.inbox.get(nick).pop(),
-                              mtype='groupchat')
-        self.inbox.pop(nick)
-
-    def _went_offline(self, pres):
+        self.log.debug('%s: %s', pres['muc']['nick'], pres['type'])
         nick = pres['muc']['nick']
-        if nick in self.online:
-            self.online.remove(nick)
+        self.presence.update({nick: (pres['muc']['role'], pres['type'])})
+        self.log.debug(self.presence)
+        if pres['type'] == 'available':
+            while self.inbox.get(nick, []):
+                self.send(self.bot.room,
+                          self.inbox.get(nick).pop(),
+                          mtype='groupchat')
+            self.inbox.pop(nick)
 
     @botcmd
     def tell(self, message, args):
-        """drop a message to be delivred when someone gets online.
+        """drop a message to be sent when someone gets online.
         !tell queue        : messages in queue
         !tell <nick> <msg> : append <msg> to <nick> in queue"""
         if not len(args):
-            return 'Missing arguments:\n{}'.format(self.tell.__doc__)
-        if len(args) == 1 and args[0] == 'queue':
-            return '\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v))
-                              for k, v in self.inbox.items()])
+            msg = 'Missing arguments:\n{}'.format(self.tell.__doc__)
+            self.reply(message, msg)
+            return
+        if len(args) == 1:
+            if args[0] == 'queue':
+                msg = '\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v))
+                                for k, v in self.inbox.items()])
+                self.reply(message, msg)
+                return
+            if args[0] == 'purge':
+                sender = message['from'].resource
+                if self.presence[sender][0] == 'moderator':
+                    self.online = set()
+                return
         if len(args) < 2:
-            return 'Please provide a message:\n{}'.format(self.tell.__doc__)
+            msg = 'Please provide a message:\n{}'.format(self.tell.__doc__)
+            self.reply(message, msg)
+            return
+        self._handle_msg(message)
+
+    def _handle_msg(self, message):
         sender = message['from'].resource
         recipient = message['body'].split()[1]
         tell_msg = ' '.join(message['body'].split()[2:])
-        self.log.debug('{0}: {1}'.format(recipient, tell_msg))
-        letter = '{0}, {1} told me to tell you: {2}'.format(recipient, sender, tell_msg)
-        if recipient in self.online:
+        self.log.debug('%s: %s', recipient, tell_msg)
+        letter = '{0}, {1} wanted you to know: {2}'.format(recipient, sender, tell_msg)
+        if (self.presence.get(recipient) and
+                self.presence[recipient][1] == 'available'):
             return
         if recipient in self.inbox.keys():
            self.inbox[recipient].append(letter)