Fix core commands, broken in the previous commit.

6 files changed, 16 insertions, 16 deletions

diff --git a/plugins/gpg/__init__.py b/plugins/gpg/__init__.py
index 0f441653..3e1f8b0b 100644
--- a/plugins/gpg/__init__.py
+++ b/plugins/gpg/__init__.py
@@ -194,7 +194,7 @@ class Plugin(BasePlugin):
         that we cannot/do not want to encrypt/decrypt messages.
         """
         current_presence = self.core.get_status()
-        self.core.command_status('%s %s' % (current_presence.show or 'available', current_presence.message or '',))
+        self.core.command.status('%s %s' % (current_presence.show or 'available', current_presence.message or '',))
 
     def on_normal_presence(self, presence):
         """
@@ -293,7 +293,7 @@ class Plugin(BasePlugin):
         """
         args = args.split()
         if not args:
-            return self.core.command_help("gpg")
+            return self.core.command.help("gpg")
         if len(args) >= 2:
             jid = JID(args[1])
         else:
@@ -313,7 +313,7 @@ class Plugin(BasePlugin):
             self.contacts[JID(jid).full] = 'disabled'
         elif command == 'setkey':
             if len(args) != 3:
-                return self.core.command_help("gpg")
+                return self.core.command.help("gpg")
             if not self.config.has_section('keys'):
                 self.config.add_section('keys')
             self.config.set(jid.bare, args[2], 'keys')
diff --git a/plugins/irc.py b/plugins/irc.py
index fe172481..9a67ffe4 100644
--- a/plugins/irc.py
+++ b/plugins/irc.py
@@ -178,7 +178,7 @@ class Plugin(BasePlugin):
         rooms = self.config.get_by_tabname('rooms', server, default='').split(':')
         for room in rooms:
             room = '{}%{}@{}/{}'.format(room, server, gateway, nick)
-            self.core.command_join(room)
+            self.core.command.join(room)
 
     def initial_connect(self):
         gateway = self.config.get('gateway', 'irc.poez.io')
@@ -204,7 +204,7 @@ class Plugin(BasePlugin):
                     delayed = self.api.create_delayed_event(5, self.join, gw, sect)
                     self.api.add_timed_event(delayed)
                 if not already_opened:
-                    self.core.command_join(room_suffix + '/' + nick)
+                    self.core.command.join(room_suffix + '/' + nick)
                     delayed = self.api.create_delayed_event(5, login, gateway, section,
                                                             login_nick, login_command,
                                                             room_suffix[1:])
@@ -278,7 +278,7 @@ class Plugin(BasePlugin):
         /irc_join <room or server>
         """
         if not args:
-            return self.core.command_help('irc_join')
+            return self.core.command.help('irc_join')
         sections = self.config.sections()
         if 'irc' in sections:
             sections.remove('irc')
@@ -294,7 +294,7 @@ class Plugin(BasePlugin):
         server.
         """
         if args is None:
-            return self.core.command_help('irc_query')
+            return self.core.command.help('irc_query')
         current_tab_info = self.get_current_tab_irc_info()
         if not current_tab_info:
             return
@@ -305,9 +305,9 @@ class Plugin(BasePlugin):
             message = args[1]
         jid = '{}!{}@{}'.format(nickname, server, gateway)
         if message:
-            self.core.command_message('{} "{}"'.format(jid, message))
+            self.core.command.message('{} "{}"'.format(jid, message))
         else:
-            self.core.command_message('{}'.format(jid))
+            self.core.command.message('{}'.format(jid))
 
     def join_server_rooms(self, section):
         """
@@ -324,7 +324,7 @@ class Plugin(BasePlugin):
         suffix = '%{}@{}{}'.format(section, gateway, nick)
 
         for room in rooms:
-            self.core.command_join(room + suffix)
+            self.core.command.join(room + suffix)
 
     def join_room(self, name):
         """
@@ -339,7 +339,7 @@ class Plugin(BasePlugin):
         if self.config.get_by_tabname('nickname', server):
             room += '/' + self.config.get_by_tabname('nickname', server)
 
-        self.core.command_join(room)
+        self.core.command.join(room)
 
     def get_current_tab_irc_info(self):
         """
diff --git a/plugins/otr.py b/plugins/otr.py
index 2d59d544..72c80093 100644
--- a/plugins/otr.py
+++ b/plugins/otr.py
@@ -810,7 +810,7 @@ class Plugin(BasePlugin):
         """
         args = common.shell_split(arg)
         if not args:
-            return self.core.command_help('otr')
+            return self.core.command.help('otr')
         action = args.pop(0)
         tab = self.api.current_tab()
         name = tab.name
@@ -920,7 +920,7 @@ class Plugin(BasePlugin):
         /otrsmp <ask|answer|abort> [question] [secret]
         """
         if args is None or not args:
-            return self.core.command_help('otrsmp')
+            return self.core.command.help('otrsmp')
         length = len(args)
         action = args.pop(0)
         if length == 2:
diff --git a/plugins/ping.py b/plugins/ping.py
index c04f085c..fd3d467c 100644
--- a/plugins/ping.py
+++ b/plugins/ping.py
@@ -58,7 +58,7 @@ class Plugin(BasePlugin):
     @command_args_parser.raw
     def command_ping(self, arg):
         if not arg:
-            return self.core.command_help('ping')
+            return self.core.command.help('ping')
         jid = safeJID(arg)
         start = time.time()
         def callback(iq):
diff --git a/plugins/screen_detach.py b/plugins/screen_detach.py
index 793575d8..e6c02a88 100644
--- a/plugins/screen_detach.py
+++ b/plugins/screen_detach.py
@@ -99,7 +99,7 @@ class Plugin(BasePlugin, pyinotify.Notifier):
         if attached != self.attached:
             self.attached = attached
             status = 'available' if self.attached else 'away'
-            self.core.command_status(status)
+            self.core.command.status(status)
             if self.config.get('use_csi'):
                 if self.attached:
                     self.core.xmpp.plugin['xep_0352'].send_active()
diff --git a/plugins/tell.py b/plugins/tell.py
index 16cecacc..76c9d2f0 100644
--- a/plugins/tell.py
+++ b/plugins/tell.py
@@ -52,7 +52,7 @@ class Plugin(BasePlugin):
     def command_tell(self, args):
         """/tell <nick> <message>"""
         if args is None:
-            self.core.command_help('tell')
+            self.core.command.help('tell')
             return
         nick, msg = args
         tab = self.api.current_tab()