Merge lp:~paul-stanley/endroid/assorted_bug_fixes into lp:endroid

[Paul Stanley]

1. Fix bug in database update function when more than 1 field is being updated
2. Make sure exceptions when loading plugins are logged fully in order to aide locating the source of the exception
3. Make sure that listrooms only shows rooms that the user is allowed in
4. Fix couple of bugs in plugins

Assorted endroid fixes:
1. Fix bug in database update function when more than 1 field is being updated
2. Make sure exceptions when loading plugins are logged fully in order to aide locating the source of the exception
3. Make sure that listrooms only shows rooms that the user is allowed in
4. Fix couple of bugs in plugins

[Phil Connell (pconnell)]

Minor thing to fix inline; don't forget to hit 'set commit message' after re-proposing (otherwise it won't be auto-merged when approved).

review: Needs Fixing

[Phil Connell (pconnell)]

review: Approve

=== modified file 'src/endroid/database.py'
--- src/endroid/database.py	2014-07-28 15:50:00 +0000
+++ src/endroid/database.py	2016-01-08 16:01:14 +0000
@@ -75,6 +75,10 @@
     @staticmethod
     def _buildConditions(conditions):
         return " and ".join(Database._sanitize(c) + "=?" for c in conditions) or "1"
+
+    @staticmethod
+    def _buildSetConditions(fields):
+        return ", ".join(Database._sanitize(c) + "=?" for c in fields)
                     
     def create_table(self, name, fields):
         """
@@ -160,7 +164,7 @@
 
         """
         n = Database._sanitize(self._tName(name))
-        query = "UPDATE {0} SET {1} WHERE ({2});".format(n, Database._buildConditions(fields), Database._buildConditions(conditions))
+        query = "UPDATE {0} SET {1} WHERE ({2});".format(n, Database._buildSetConditions(fields), Database._buildConditions(conditions))
         tup = Database._tupleFromFieldValues(fields)
         tup = tup + Database._tupleFromFieldValues(conditions)
         Database.raw(query, tup)

=== modified file 'src/endroid/pluginmanager.py'
--- src/endroid/pluginmanager.py	2014-09-15 16:37:31 +0000
+++ src/endroid/pluginmanager.py	2016-01-08 16:01:14 +0000
@@ -309,7 +309,7 @@
                           + "\". Check that it exists in your PYTHONPATH.")
             return
         except Exception as e:
-            logging.error(e)
+            logging.exception(e)
             logging.error("**Failed to import plugin {}".format(modname))
             return
         else:
@@ -325,7 +325,7 @@
             else:
                 plugin = PluginMeta.registry[modname]()
         except Exception as k:
-            logging.error(k)
+            logging.exception(k)
             logging.error("**Could not import plugin {}. Module doesn't seem to"
                           "define a Plugin".format(modname))
             return
@@ -399,7 +399,7 @@
                 # replaced by a proxy
                 self._loaded[modname] = plugin
             except Exception as e:
-                logging.error(e)
+                logging.exception(e)
                 logging.error('\t**Error initializing "{}".  See log for '
                               'details.'.format(modname))
                 return False

=== modified file 'src/endroid/plugins/command.py'
--- src/endroid/plugins/command.py	2014-08-20 11:57:49 +0000
+++ src/endroid/plugins/command.py	2016-01-08 16:01:14 +0000
@@ -264,7 +264,10 @@
         msg.dec_handlers()
     
     def _command_muc(self, msg):
-        self._command(self._muc_handlers, msg.body, msg)
+        # Some clients seem to send an empty message when joining a chat room
+        # - Ignore it
+        if msg.body is not None:
+            self._command(self._muc_handlers, msg.body, msg)
 
     def _command_chat(self, msg):
         self._command(self._chat_handlers, msg.body, msg)

=== modified file 'src/endroid/plugins/correct.py'
--- src/endroid/plugins/correct.py	2013-08-19 14:52:48 +0000
+++ src/endroid/plugins/correct.py	2016-01-08 16:01:14 +0000
@@ -31,9 +31,12 @@
         sender. Checks whether the phrase matches the substitution regex, and
         if so, attempts to correct using the correct() method.
         """
-        match = REOBJ.match(msg.body)
+        try:
+            match = REOBJ.match(msg.body)
+        except re.error:
+            match = None
 
-        if match:
+        if match and msg.sender in self.lastmsg:
             self.correct(msg, self.lastmsg[msg.sender], match)
         else:
             msg.unhandled()

=== modified file 'src/endroid/plugins/whosonline.py'
--- src/endroid/plugins/whosonline.py	2014-08-14 10:01:44 +0000
+++ src/endroid/plugins/whosonline.py	2016-01-08 16:01:14 +0000
@@ -24,7 +24,11 @@
 
     @command
     def listrooms(self, msg, arg):
-        rooms = self.usermanagement.get_available_rooms() or ["I'm not in any rooms!"]
+        # Only list rooms that the user is allowed in
+        rooms = [room
+                 for room in self.usermanagement.get_available_rooms()
+                 if msg.sender in self.usermanagement.get_users(room)] or [
+                                                       "I'm not in any rooms!"]
         msg.reply('\n'.join(rooms))
 
     @command(synonyms=('isonline',), helphint='{user}')