pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always feed a JID to open_conversation_window

Browse source
This commit is contained in:
mathieui 2019-08-24 14:17:38 +02:00
parent ea5977da4a
commit a157a21c87
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
poezio/core/commands.py
View file

@ -1040,7 +1040,7 @@ class CommandCore:
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(jid.full), focus=True)
elif muc:
if jid.resource:
tab = self.core.tabs.by_name_and_class(jid.full,

6
poezio/core/core.py
View file

@ -639,13 +639,13 @@ class Core:
"""
if isinstance(roster_row, Contact):
if not self.get_conversation_by_jid(roster_row.bare_jid, False):
self.open_conversation_window(roster_row.bare_jid)
self.open_conversation_window(JID(roster_row.bare_jid))
else:
self.focus_tab_named(roster_row.bare_jid)
if isinstance(roster_row, Resource):
if not self.get_conversation_by_jid(
roster_row.jid, False, fallback_barejid=False):
self.open_conversation_window(roster_row.jid)
self.open_conversation_window(JID(roster_row.jid))
else:
self.focus_tab_named(roster_row.jid)
self.refresh_window()
@ -1038,7 +1038,7 @@ class Core:
# nothing was found (and we lock it to the resource
# later)
conversation = self.open_conversation_window(
jid.bare, False)
JID(jid.bare), False)
else:
conversation = None
return conversation