diff options
| author | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-08 13:49:57 +0100 |
|---|---|---|
| committer | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-08 14:01:09 +0100 |
| commit | bf2225468e8f496a45db477b596eb7d233cb813f (patch) | |
| tree | 86fefa7497fc2d1d9a75442bc993a3b2b50055af /poezio/core/commands.py | |
| parent | 6ab49c188a6e5bb95773165f0bdbd672b41c8c81 (diff) | |
| download | poezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.gz poezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.bz2 poezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.xz poezio-bf2225468e8f496a45db477b596eb7d233cb813f.zip | |
Revert work on tabs module to change tab.name to JID.
This reverts commits:
d693479d05f1ada999c0e29a9d9e2f021dd59e50
2d0cc092fcd154b2d14be0c5ac0ff338607824a0
89a61b84bdb29d3df8c08436c3484fddba8d2ef1
8194d9afbdec2daa1377e07ebb26bb99406473d0
e256c31875c8b67d85fe30d3e2c14c896066657a
a21335ac171a827a613dcce744898e822689c9d3
c96e528a8fd1313f75cb792a8e4826fbcfde1bec
0551867bfdb8dfa7dbd5964a15a1a950510e2c71
6ab49c188a6e5bb95773165f0bdbd672b41c8c81
Diffstat (limited to 'poezio/core/commands.py')
| -rw-r--r-- | poezio/core/commands.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py index 5b990091..e785a93b 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -335,7 +335,7 @@ class CommandCore: if room.find('@') == -1 and not server_root: tab = self.core.tabs.current_tab if isinstance(tab, tabs.MucTab): - if tab.name.full.find('@') != -1: + if tab.name.find('@') != -1: domain = safeJID(tab.name).domain room += '@%s' % domain return (room, set_nick) @@ -369,8 +369,7 @@ class CommandCore: # New tab if tab is None: tab = self.core.open_new_room(room, nick, password=password) - if tab is not None: - tab.join() + tab.join() else: self.core.focus_tab(tab) if tab.own_nick == nick and tab.joined: @@ -1024,17 +1023,14 @@ class CommandCore: """ if args is None: return self.help('message') - try: - jid = JID(args[0]) - except InvalidJID: - return self.core.information('Invalid JID.', 'Error') - if not jid.bare: + jid = safeJID(args[0]) + if not jid.user and not jid.domain and not jid.resource: return self.core.information('Invalid JID.', 'Error') tab = self.core.get_conversation_by_jid( jid.full, False, fallback_barejid=False) muc = self.core.tabs.by_name_and_class(jid.bare, tabs.MucTab) if not tab and not muc: - tab = self.core.open_conversation_window(jid, focus=True) + tab = self.core.open_conversation_window(jid.full, focus=True) elif muc: if jid.resource: tab = self.core.tabs.by_name_and_class(jid.full, |