Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
72df7958 by lovetox at 2021-11-01T22:00:16+01:00
Bookmarks: Add extensions support
- - - - -
2 changed files:
- nbxmpp/modules/bookmarks/util.py
- nbxmpp/structs.py
Changes:
=====================================
nbxmpp/modules/bookmarks/util.py
=====================================
@@ -63,12 +63,14 @@ def parse_bookmark(item):
nick = parse_nickname(conference.getTagData('nick'))
name = conference.getAttr('name') or None
password = conference.getTagData('password') or None
+ extensions = conference.getTag('extensions')
return BookmarkData(jid=jid,
name=name,
+ nick=nick,
autojoin=autojoin,
password=password,
- nick=nick)
+ extensions=extensions)
def parse_bookmarks(item, log):
@@ -127,6 +129,8 @@ def build_conference_node(bookmark):
conference = Node(tag='conference', attrs=attrs)
if bookmark.nick:
conference.setTagData('nick', bookmark.nick)
+ if bookmark.extensions is not None:
+ conference.addChild(node=bookmark.extensions)
return conference
=====================================
nbxmpp/structs.py
=====================================
@@ -88,6 +88,15 @@ class BobData(NamedTuple):
type: str
+class BookmarkData(NamedTuple):
+ jid: JID
+ name: Optional[str] = None
+ nick: Optional[str] = None
+ autojoin: bool = False
+ password: Optional[str] = None
+ extensions: Optional[Node] = None
+
+
VoiceRequest = namedtuple('VoiceRequest', 'form jid nick')
MucUserData = namedtuple('MucUserData', 'affiliation jid nick role actor
reason')
@@ -122,9 +131,6 @@ ActivityData = namedtuple('ActivityData', 'activity
subactivity text')
LocationData = namedtuple('LocationData', LOCATION_DATA)
LocationData.__new__.__defaults__ = (None,) * len(LocationData._fields)
-BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password')
-BookmarkData.__new__.__defaults__ = (None, None, None, None)
-
PGPPublicKey = namedtuple('PGPPublicKey', 'jid key date')
PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date')
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/72df7958c3065684b689ad91dc9d45669d0dc983
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/72df7958c3065684b689ad91dc9d45669d0dc983
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
