Merge branch 'command-system-regressions' into 'master'

Fix various regressions in the command system

See merge request !63

src/chat_control_base.py

@@ -54,6 +54,13 @@ from common.connection_handlers_events import MessageOutgoingEvent
 from command_system.implementation.middleware import ChatCommandProcessor
 from command_system.implementation.middleware import CommandTools
 
+# The members of these modules are not referenced directly anywhere in this
+# module, but still they need to be kept around. Importing them automatically
+# registers the contained CommandContainers with the command system, thereby
+# populating the list of available commands.
+import command_system.implementation.standard
+import command_system.implementation.execute
+
 try:
     import gtkspell
     HAS_GTK_SPELL = True

src/command_system/framework.py

@@ -15,7 +15,7 @@
 
 """
 Provides a tiny framework with simple, yet powerful and extensible
-architecture to implement commands in a streight and flexible,
+architecture to implement commands in a straight and flexible,
 declarative way.
 """
 
@@ -67,7 +67,7 @@ class CommandProcessor(object):
     """
 
     # This defines a command prefix (or an initializer), which should
-    # preceede a a text in order it to be processed as a command.
+    # precede a text in order for it to be processed as a command.
     COMMAND_PREFIX = '/'
 
     def process_as_command(self, text):

src/command_system/implementation/middleware.py

@@ -75,7 +75,7 @@ class ChatCommandProcessor(CommandProcessor):
             self.command_succeeded = True
 
     def looks_like_command(self, text, body, name, arguments):
-        # Command escape stuff ggoes here. If text was prepended by the
+        # Command escape stuff goes here. If text was prepended by the
         # command prefix twice, like //not_a_command (if prefix is set
         # to /) then it will be escaped, that is sent just as a regular
         # message with one (only one) prefix removed, so message will be

src/command_system/implementation/standard.py

@@ -24,7 +24,7 @@ import dialogs
 from common import gajim
 from common import helpers
 from common.exceptions import GajimGeneralException
-from common.logger import Constants
+from common.logger import KindConstant
 
 from ..errors import CommandError
 from ..framework import CommandContainer, command, doc
@@ -32,10 +32,6 @@ from ..mapping import generate_usage
 
 from .hosts import ChatCommands, PrivateChatCommands, GroupChatCommands
 
-# This holds constants fron the logger, which we'll be using in some of our
-# commands.
-lc = Constants()
-
 class StandardCommonCommands(CommandContainer):
     """
     This command container contains standard commands which are common
@@ -104,10 +100,10 @@ class StandardCommonCommands(CommandContainer):
                 raise CommandError(_("Limit must be an integer"))
 
         for row in results:
-            contact, time, kind, show, message, subject = row
+            contact, time, kind, show, message, subject, log_line_id = row
 
             if not contact:
-                if kind == lc.KIND_CHAT_MSG_SENT:
+                if kind == KindConstant.CHAT_MSG_SENT:
                     contact = gajim.nicks[self.account]
                 else:
                     contact = self.contact.name