summaryrefslogtreecommitdiff
path: root/poezio/core/commands.py
diff options
context:
space:
mode:
Diffstat (limited to 'poezio/core/commands.py')
-rw-r--r--poezio/core/commands.py9
1 files changed, 6 insertions, 3 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,