fix: remove all remaining safejids (fix #3457)

2 files changed, 26 insertions, 9 deletions

diff --git a/poezio/windows/bookmark_forms.py b/poezio/windows/bookmark_forms.py
index b8a60763..fb8ad589 100644
--- a/poezio/windows/bookmark_forms.py
+++ b/poezio/windows/bookmark_forms.py
@@ -4,13 +4,13 @@ Windows used inthe bookmarkstab
 import curses
 from typing import List, Tuple, Optional
 
-from poezio.windows import base_wins
+from slixmpp import JID, InvalidJID
+
 from poezio.windows.base_wins import Win
 from poezio.windows.inputs import Input
 from poezio.windows.data_forms import FieldInput, FieldInputMixin
 
 from poezio.theming import to_curses_attr, get_theme
-from poezio.common import safeJID
 from poezio.bookmarks import Bookmark, BookmarkList
 
 
@@ -33,14 +33,20 @@ class BookmarkJIDInput(FieldInput, Input):
     def __init__(self, field: Bookmark) -> None:
         FieldInput.__init__(self, field)
         Input.__init__(self)
-        jid = safeJID(field.jid)
+        try:
+            jid = JID(field.jid)
+        except InvalidJID:
+            jid = JID('')
         jid.resource = field.nick or None
         self.text = jid.full
         self.pos = len(self.text)
         self.color = get_theme().COLOR_NORMAL_TEXT
 
     def save(self) -> None:
-        jid = safeJID(self.get_text())
+        try:
+            jid = JID(self.get_text())
+        except InvalidJID:
+            jid = JID('')
         self._field.jid = jid.bare
         self._field.nick = jid.resource
 
diff --git a/poezio/windows/info_wins.py b/poezio/windows/info_wins.py
index 5278e3b8..23d28cc1 100644
--- a/poezio/windows/info_wins.py
+++ b/poezio/windows/info_wins.py
@@ -8,9 +8,9 @@ from __future__ import annotations
 from typing import Optional, Dict, TYPE_CHECKING, Any
 
 import logging
-log = logging.getLogger(__name__)
 
-from poezio.common import safeJID
+from slixmpp import JID, InvalidJID
+
 from poezio.config import config
 
 from poezio.windows.base_wins import Win
@@ -22,6 +22,8 @@ if TYPE_CHECKING:
     from poezio.tabs import MucTab
     from poezio.windows import TextWin
 
+log = logging.getLogger(__name__)
+
 
 class InfoWin(Win):
     """
@@ -101,7 +103,10 @@ class PrivateInfoWin(InfoWin):
                         to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
 
     def write_room_name(self, name):
-        jid = safeJID(name)
+        try:
+            jid = JID(name)
+        except InvalidJID:
+            jid = JID('')
         room_name, nick = jid.bare, jid.resource
         theme = get_theme()
         self.addstr(nick, to_curses_attr(theme.COLOR_PRIVATE_NAME))
@@ -158,7 +163,10 @@ class ConversationInfoWin(InfoWin):
         # from someone not in our roster. In this case, we display
         # only the maximum information from the message we can get.
         log.debug('Refresh: %s', self.__class__.__name__)
-        jid = safeJID(jid)
+        try:
+            jid = JID(jid)
+        except InvalidJID:
+            jid = JID('')
         if contact:
             if jid.resource:
                 resource = contact[jid.full]
@@ -363,7 +371,10 @@ class ConversationStatusMessageWin(InfoWin):
 
     def refresh(self, jid, contact):
         log.debug('Refresh: %s', self.__class__.__name__)
-        jid = safeJID(jid)
+        try:
+            jid = JID(jid)
+        except InvalidJID:
+            jid = JID('')
         if contact:
             if jid.resource:
                 resource = contact[jid.full]