fix: remove all remaining safejids (fix #3457)

3 files changed, 59 insertions, 22 deletions

diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py
index 4f4833fc..31902fa6 100644
--- a/poezio/tabs/bookmarkstab.py
+++ b/poezio/tabs/bookmarkstab.py
@@ -12,9 +12,8 @@ from poezio import windows
 from poezio.bookmarks import Bookmark, BookmarkList
 from poezio.core.structs import Command
 from poezio.tabs import Tab
-from poezio.common import safeJID
 
-from slixmpp import JID
+from slixmpp import JID, InvalidJID
 
 log = logging.getLogger(__name__)
 
@@ -82,10 +81,11 @@ class BookmarksTab(Tab):
                 'Duplicate bookmarks in list (saving aborted)', 'Error')
             return
         for bm in self.new_bookmarks:
-            if safeJID(bm.jid):
+            try:
+                JID(bm.jid)
                 if not self.bookmarks[bm.jid]:
                     self.bookmarks.append(bm)
-            else:
+            except InvalidJID:
                 self.core.information(
                     'Invalid JID for bookmark: %s/%s' % (bm.jid, bm.nick),
                     'Error')
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index 2cc6aa2f..873bf0d3 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -11,17 +11,17 @@ There are two different instances of a ConversationTab:
     the time.
 
 """
-import asyncio
 import curses
 import logging
 from typing import Dict, Callable
 
+from slixmpp import JID, InvalidJID
+
 from poezio.tabs.basetabs import OneToOneTab, Tab
 
 from poezio import common
 from poezio import windows
 from poezio import xhtml
-from poezio.common import safeJID
 from poezio.config import config
 from poezio.core.structs import Command
 from poezio.decorators import refresh_wrapper
@@ -166,7 +166,13 @@ class ConversationTab(OneToOneTab):
             status = iq['last_activity']['status']
             from_ = iq['from']
             msg = '\x19%s}The last activity of %s was %s ago%s'
-            if not safeJID(from_).user:
+            user = ''
+            try:
+                user = JID(from_).user
+            except InvalidJID:
+                pass
+
+            if not user:
                 msg = '\x19%s}The uptime of %s is %s.' % (
                     dump_tuple(get_theme().COLOR_INFORMATION_TEXT), from_,
                     common.parse_secs_to_str(seconds))
@@ -188,7 +194,10 @@ class ConversationTab(OneToOneTab):
     @command_args_parser.ignored
     def command_info(self):
         contact = roster[self.get_dest_jid()]
-        jid = safeJID(self.get_dest_jid())
+        try:
+            jid = JID(self.get_dest_jid())
+        except InvalidJID:
+            jid = JID('')
         if contact:
             if jid.resource:
                 resource = contact[jid.full]
@@ -300,7 +309,10 @@ class ConversationTab(OneToOneTab):
 
     def on_lose_focus(self):
         contact = roster[self.get_dest_jid()]
-        jid = safeJID(self.get_dest_jid())
+        try:
+            jid = JID(self.get_dest_jid())
+        except InvalidJID:
+            jid = JID('')
         if contact:
             if jid.resource:
                 resource = contact[jid.full]
@@ -321,7 +333,10 @@ class ConversationTab(OneToOneTab):
 
     def on_gain_focus(self):
         contact = roster[self.get_dest_jid()]
-        jid = safeJID(self.get_dest_jid())
+        try:
+            jid = JID(self.get_dest_jid())
+        except InvalidJID:
+            jid = JID('')
         if contact:
             if jid.resource:
                 resource = contact[jid.full]
diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py
index 5556cf77..6dd48726 100644
--- a/poezio/tabs/rostertab.py
+++ b/poezio/tabs/rostertab.py
@@ -16,11 +16,11 @@ from os import getenv, path
 from pathlib import Path
 from typing import Dict, Callable
 
+from slixmpp import JID, InvalidJID
 from slixmpp.exceptions import IqError, IqTimeout
 
-from poezio import common
 from poezio import windows
-from poezio.common import safeJID, shell_split
+from poezio.common import shell_split
 from poezio.config import config
 from poezio.contact import Contact, Resource
 from poezio.decorators import refresh_wrapper
@@ -531,7 +531,11 @@ class RosterInfoTab(Tab):
         """
         if args is None:
             return self.core.command.help('name')
-        jid = safeJID(args[0]).bare
+        try:
+            jid = JID(args[0]).bare
+        except InvalidJID:
+            self.core.information(f'Invalid JID: {args[0]}', 'Error')
+            return
         name = args[1] if len(args) == 2 else ''
 
         contact = roster[jid]
@@ -571,7 +575,11 @@ class RosterInfoTab(Tab):
             else:
                 return self.core.command.help('groupadd')
         else:
-            jid = safeJID(args[0]).bare
+            try:
+                jid = JID(args[0]).bare
+            except InvalidJID:
+                self.core.information(f'Invalid JID: {args[0]}', 'Error')
+                return
             group = args[1]
 
         contact = roster[jid]
@@ -614,7 +622,11 @@ class RosterInfoTab(Tab):
         """
         if args is None:
             return self.core.command.help('groupmove')
-        jid = safeJID(args[0]).bare
+        try:
+            jid = JID(args[0]).bare
+        except InvalidJID:
+            self.core.information(f'Invalid JID: {args[0]}', 'Error')
+            return
         group_from = args[1]
         group_to = args[2]
 
@@ -671,7 +683,11 @@ class RosterInfoTab(Tab):
         if args is None:
             return self.core.command.help('groupremove')
 
-        jid = safeJID(args[0]).bare
+        try:
+            jid = JID(args[0]).bare
+        except InvalidJID:
+            self.core.information(f'Invalid JID: {args[0]}', 'Error')
+            return
         group = args[1]
 
         contact = roster[jid]
@@ -1037,7 +1053,7 @@ class RosterInfoTab(Tab):
         if isinstance(selected_row, Contact):
             jid = selected_row.bare_jid
         elif isinstance(selected_row, Resource):
-            jid = safeJID(selected_row.jid).bare
+            jid = JID(selected_row.jid).bare
         else:
             return
         self.on_slash()
@@ -1119,8 +1135,11 @@ def jid_and_name_match(contact, txt):
     if not txt:
         return True
     txt = txt.lower()
-    if txt in safeJID(contact.bare_jid).bare.lower():
-        return True
+    try:
+        if txt in JID(contact.bare_jid).bare.lower():
+            return True
+    except InvalidJID:
+        pass
     if txt in contact.name.lower():
         return True
     return False
@@ -1133,9 +1152,12 @@ def jid_and_name_match_slow(contact, txt):
     """
     if not txt:
         return True  # Everything matches when search is empty
-    user = safeJID(contact.bare_jid).bare
-    if diffmatch(txt, user):
-        return True
+    try:
+        user = JID(contact.bare_jid).bare
+        if diffmatch(txt, user):
+            return True
+    except InvalidJID:
+        pass
     if contact.name and diffmatch(txt, contact.name):
         return True
     return False