diff options
Diffstat (limited to 'poezio/core')
| -rw-r--r-- | poezio/core/commands.py | 9 | ||||
| -rw-r--r-- | poezio/core/core.py | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py index f7946b71..242b60a3 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -1024,14 +1024,17 @@ class CommandCore: """ if args is None: return self.help('message') - jid = safeJID(args[0]) - if not jid.user and not jid.domain and not jid.resource: + try: + jid = JID(args[0]) + except InvalidJID: + return self.core.information('Invalid JID.', 'Error') + if not jid.bare: 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.full, focus=True) + tab = self.core.open_conversation_window(jid, focus=True) elif muc: if jid.resource: tab = self.core.tabs.by_name_and_class(jid.full, diff --git a/poezio/core/core.py b/poezio/core/core.py index 91eb4877..2e0e0acb 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -1164,7 +1164,7 @@ class Core: provided, we open a StaticConversationTab, else a DynamicConversationTab """ - if safeJID(jid).resource: + if jid.resource: new_tab = tabs.StaticConversationTab(self, jid) else: new_tab = tabs.DynamicConversationTab(self, jid) |