Moved the send logic to Plugin

[sid.git] / sid / sid.py

diff --git a/sid/sid.py b/sid/sid.py
index 726f7fa9888fac496725022596f23fb0463f31aa..53fd5696976f4a60d2d01ec7ec75dfaeb4066aaf 100644 (file)
--- a/sid/sid.py
+++ b/sid/sid.py
@@ -103,14 +103,12 @@ class MUCBot(sleekxmpp.ClientXMPP):
         if args:
             self.log.debug('arg: {0}'.format(args))
         try:
-            reply = self.commands[cmd](msg, args)
+            self.commands[cmd](msg, args)
         except Exception as err:
             reply = ''.join(traceback.format_exc())
             self.log.exception('An error occurred processing: {0}: {1}'.format(body, reply))
-            self.log.info(self.log.level)
-            if self.log.level >= 20 or not reply:
-                return
-        self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
+            if self.log.level < 20 and reply:
+                self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
 
     def start(self, event):
         """
@@ -182,4 +180,4 @@ class MUCBot(sleekxmpp.ClientXMPP):
                 text = self.commands[args[0]].__doc__.strip() or 'undocumented'
             else:
                 text = 'That command is not defined.'
-        return text
+        self.send_message(mto=message['from'].bare, mbody=text, mtype='groupchat')