Remove more safeJID calls

Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <pep@bouah.net>
parent e256c318
Pipeline #2025 passed with stages
in 2 minutes and 24 seconds
......@@ -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,
......
......@@ -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)
......
......@@ -534,7 +534,9 @@ class ChatTab(Tab):
"""
Log the messages in the archives.
"""
name = safeJID(self.name).bare
if self.name is None:
return None
name = self.name.bare
if not logger.log_message(name, nickname, txt, date=time, typ=typ):
self.core.information('Unable to write in the log file', 'Error')
......@@ -811,7 +813,7 @@ class OneToOneTab(ChatTab):
return
self.__status = status
hide_status_change = config.get_by_tabname('hide_status_change',
safeJID(self.name).bare)
self.name.bare)
now = datetime.now()
dff = now - self.last_remote_message
if hide_status_change > -1 and dff.total_seconds() > hide_status_change:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment