X-Git-Url: http://git.kaliko.me/?p=sid.git;a=blobdiff_plain;f=sid%2Fecho.py;h=94836d0b4c4766cb0ebc33015676ddcb66c7f188;hp=cbf2eabf272f098be976327fb760d3d3286a5a57;hb=f2f44c64470d0967913feb1bfb9868fa0c7d9e1b;hpb=2071fc235dc07a522911a760983f40ffd51b366f

diff --git a/sid/echo.py b/sid/echo.py
index cbf2eab..94836d0 100644
--- a/sid/echo.py
+++ b/sid/echo.py
@@ -31,13 +31,15 @@ class Echo(Plugin):
         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']))
+        self.log.debug('%s: %s', pres['muc']['nick'], pres['type'])
         nick = pres['muc']['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.inbox.get(nick).pop())
+                self.send(self.bot.room,
+                          self.inbox.get(nick).pop(),
+                          mtype='groupchat')
             self.inbox.pop(nick)
 
     @botcmd
@@ -46,12 +48,14 @@ class Echo(Plugin):
         !tell queue        : messages in queue
         !tell <nick> <msg> : append <msg> to <nick> in queue"""
         if not len(args):
-            self.send('Missing arguments:\n{}'.format(self.tell.__doc__))
+            msg = 'Missing arguments:\n{}'.format(self.tell.__doc__)
+            self.reply(message, msg)
             return
         if len(args) == 1:
             if args[0] == 'queue':
-                self.send('\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v))
-                                      for k, v in self.inbox.items()]))
+                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
@@ -59,13 +63,17 @@ class Echo(Plugin):
                     self.online = set()
                 return
         if len(args) < 2:
-            self.send('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)
+        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