summaryrefslogtreecommitdiff
path: root/poezio/bookmarks.py
diff options
context:
space:
mode:
authorMaxime “pep” Buquet <pep@bouah.net>2019-09-02 13:27:31 +0200
committerMaxime “pep” Buquet <pep@bouah.net>2019-09-02 13:27:31 +0200
commitd8638d5e31dc2c25b9ca39283abecb526ef3f07c (patch)
tree0b4cfcf81d04fd293b8004b43637cda292ada5cd /poezio/bookmarks.py
parent7c7523e0ab0974e97d1e9bee17e961fefb06f42e (diff)
downloadpoezio-d8638d5e31dc2c25b9ca39283abecb526ef3f07c.tar.gz
poezio-d8638d5e31dc2c25b9ca39283abecb526ef3f07c.tar.bz2
poezio-d8638d5e31dc2c25b9ca39283abecb526ef3f07c.tar.xz
poezio-d8638d5e31dc2c25b9ca39283abecb526ef3f07c.zip
Eradicate more safeJID calls
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
Diffstat (limited to 'poezio/bookmarks.py')
-rw-r--r--poezio/bookmarks.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py
index 0406de94..ced6fde6 100644
--- a/poezio/bookmarks.py
+++ b/poezio/bookmarks.py
@@ -32,9 +32,8 @@ import functools
import logging
from typing import Optional, List, Union
-from slixmpp import JID
+from slixmpp import InvalidJID, JID
from slixmpp.plugins.xep_0048 import Bookmarks, Conference, URL
-from poezio.common import safeJID
from poezio.config import config
log = logging.getLogger(__name__)
@@ -288,7 +287,10 @@ class BookmarkList:
return
rooms = rooms.split(':')
for room in rooms:
- jid = safeJID(room)
+ try:
+ jid = JID(room)
+ except InvalidJID:
+ continue
if jid.bare == '':
continue
if jid.resource != '':