Make /status comply with the command args rule

- if there are more args than handled, no message will be set
- fix the 'status' plugin accordingly

Author: mathieui

plugins/status.py

@@ -5,17 +5,17 @@ class Plugin(BasePlugin):
     Adds several convenient aliases to /status command
     """
     def init(self):
-        self.add_command('dnd', lambda line: self.core.command_status('dnd '+line),
+        self.add_command('dnd', lambda line: self.core.command_status('dnd "'+line+'"'),
                 '/dnd [status message]\nDnd: Set your status as dnd (do not disturb).')
-        self.add_command('busy', lambda line: self.core.command_status('busy '+line),
+        self.add_command('busy', lambda line: self.core.command_status('busy "'+line+'"'),
                 '/busy [status message]\nBusy: Set your status as busy.')
-        self.add_command('chat', lambda line: self.core.command_status('chat '+line),
+        self.add_command('chat', lambda line: self.core.command_status('chat "'+line+'"'),
                 '/chat [status message]\nChat: Set your status as chatty.')
-        self.add_command('xa', lambda line: self.core.command_status('xa '+line),
+        self.add_command('xa', lambda line: self.core.command_status('xa "'+line+'"'),
                 '/xa [status message]\nXa: Set your status as xa (eXtended away).')
-        self.add_command('afk', lambda line: self.core.command_status('afk '+line),
+        self.add_command('afk', lambda line: self.core.command_status('afk "'+line+'"'),
                 '/afk [status message]\nAfk: Set your status as afk (away from keyboard).')
-        self.add_command('away', lambda line: self.core.command_status('away '+line),
+        self.add_command('away', lambda line: self.core.command_status('away "'+line+'"'),
                 '/away [status message]\nAway: Set your status as away.')
-        self.add_command('available', lambda line: self.core.command_status('available '+line),
+        self.add_command('available', lambda line: self.core.command_status('available "'+line+'"'),
                 '/available [status message]\nAvailable: Set your status as available.')

src/core.py

@@ -1551,8 +1551,6 @@ def command_status(self, arg):
         show = possible_show[args[0]]
         if len(args) == 2:
             msg = args[1]
-        elif len(args) > 2:
-            msg = arg[len(args[0])+1:]
         else:
             msg = None
         pres = self.xmpp.make_presence()