Merge lp:~gingerchris/endroid/bugfixes into lp:endroid

[ChrisD]

Some bug fixes:
 * Add errback to the kick deferred
 * Improve the message identification code

Some bug fixes:
 * Add errback to the kick deferred
 * Improve the message identification code

[Martin Morrison (isoschiz)]

- Successful only has one l

review: Needs Fixing

[Martin Morrison (isoschiz)]

review: Approve

[lp:~gingerchris/endroid/bugfixes]

65. By Simon C on 2013-09-12

Remove trailing whitespace from exec plugin output

66. By Chris Davidson <email address hidden> on 2013-09-12

Some bug fixes:
 * Add errback to the kick deferred
 * Improve the message identification code

=== modified file 'src/endroid/usermanagement.py'
--- src/endroid/usermanagement.py	2013-09-11 11:12:08 +0000
+++ src/endroid/usermanagement.py	2013-09-12 16:00:33 +0000
@@ -527,9 +527,21 @@
         return d
 
     def kick(self, room, nick, reason=None):
-        """Kick the user with the specified nick from the room."""
-        logging.debug("Kicking {} from {}".format(nick, room))
-        self.wh.kick(JID(room), nick, reason)
+        """
+        Kick the user with the specified nick from the room.
+
+        Returns a deferred which can be monitored to determine if the kick was
+        successful.
+
+        """
+
+        def success(_):
+            logging.info("Kicked {} from {} ({})".format(nick, room, reason))
+        def failure(_):
+            logging.error("Failed to kick {} from {} ({})".format(
+                          nick, room, reason))
+
+        return self.wh.kick(JID(room), nick, reason).addCallbacks(success, failure)
 
     def joined_room(self, name):
         logging.info("Joined room {}".format(name))

=== modified file 'src/endroid/wokkelhandler.py'
--- src/endroid/wokkelhandler.py	2013-09-10 17:56:41 +0000
+++ src/endroid/wokkelhandler.py	2013-09-12 16:00:33 +0000
@@ -98,13 +98,26 @@
                         logging.info('SUC Message received from {}'.format(
                                      sender.full()))
                         self.messagehandler.receive_chat(m)
-        else:
-            if message.children[0].children[0].name == "invite":
-                ujid = message.children[0].children[0].attributes['from']
+        elif len(message.children) > 0:
+            # Try and identify this message type
+            msg_child = message.children[0]
+            if (msg_child.name == 'x' and len(msg_child.children) > 0 and
+                msg_child.children[0].name == 'invite'):
+                # Looks like an invite
+                ujid = msg_child.children[0].attributes['from']
                 rjid = message.attributes['from']
                 logging.info("Invitation received to " + rjid + " from " + ujid)
                 logging.info(("Rejected. To enable uncomment receiving "
                               "line and enable InviteBot"))
+            elif (msg_child.name == 'body' and len(msg_child.children) > 0 and
+                  'granted' in msg_child.children[0]): 
+                logging.info("Received affiliation change message: {}".format(
+                             msg_child.children[0]))
+            else:
+                logging.error("Received unknown message with child: "
+                              "{}".format(message.toXml()))
+        else:
+            logging.error("Received unknown message: {}".format(message.toXml()))
 
     # MUCClient methods to be overridden