From 53ededcb19fd0384e96dbe7677ced2faf0de500a Mon Sep 17 00:00:00 2001 From: Madhur Garg Date: Fri, 22 Mar 2019 17:15:02 +0530 Subject: Corrects functionality of /reconnect in all type of tabs. Fixes #3471 Corrects functionality of /reconnect in all type of tabs. Fixes #3471 Moved command_reconnect from particular tabs to core.commands. Fixes #3471 --- poezio/core/commands.py | 10 ++++++++++ poezio/core/core.py | 7 +++++++ poezio/tabs/rostertab.py | 17 ----------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/poezio/core/commands.py b/poezio/core/commands.py index b3ebb811..4dbb5611 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -509,6 +509,16 @@ class CommandCore: else: self.core.information('No bookmark to remove', 'Info') + @command_args_parser.ignored + def command_reconnect(self): + """ + /reconnect + """ + if self.core.xmpp.is_connected(): + self.core.disconnect(reconnect=True) + else: + self.core.xmpp.connect() + @command_args_parser.quoted(0, 3) def set(self, args): """ diff --git a/poezio/core/core.py b/poezio/core/core.py index 79b5d56f..6bb19d16 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -1758,6 +1758,13 @@ class Core: "currently using in this room (instead of default_nick).", shortdesc="Bookmark a room online.", completion=self.completion.bookmark) + self.register_command( + 'reconnect', + self.command.command_reconnect, + usage="[reconnect]", + desc='Disconnect from the remote server if you are ' + 'currently connected and then connect to it again.', + shortdesc='Disconnect and reconnect to the server.') self.register_command( 'set', self.command.set, diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py index 6e73051e..7c941aa9 100644 --- a/poezio/tabs/rostertab.py +++ b/poezio/tabs/rostertab.py @@ -165,13 +165,6 @@ class RosterInfoTab(Tab): self.command_password, usage='', shortdesc='Change your password') - - self.register_command( - 'reconnect', - self.command_reconnect, - desc='Disconnect from the remote server if you are ' - 'currently connected and then connect to it again.', - shortdesc='Disconnect and reconnect to the server.') self.register_command( 'disconnect', self.command_disconnect, @@ -532,16 +525,6 @@ class RosterInfoTab(Tab): self.core.xmpp.plugin['xep_0191'].get_blocked(callback=callback) - @command_args_parser.ignored - def command_reconnect(self): - """ - /reconnect - """ - if self.core.xmpp.is_connected(): - self.core.disconnect(reconnect=True) - else: - self.core.xmpp.connect() - @command_args_parser.ignored def command_disconnect(self): """ -- cgit v1.2.3