Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

2 changed files:

Changes:

  • nbxmpp/modules/bookmarks/util.py
    ... ... @@ -63,12 +63,14 @@ def parse_bookmark(item):
    63 63 
         nick = parse_nickname(conference.getTagData('nick'))
    64 64 
         name = conference.getAttr('name') or None
    65 65 
         password = conference.getTagData('password') or None
    66 
    +    extensions = conference.getTag('extensions')
    66 67
    67 68 
         return BookmarkData(jid=jid,
    68 69 
                             name=name,
    70 
    +                        nick=nick,
    69 71 
                             autojoin=autojoin,
    70 72 
                             password=password,
    71 
    -                        nick=nick)
    73 
    +                        extensions=extensions)
    72 74
    73 75
    74 76 
     def parse_bookmarks(item, log):
    ... ... @@ -127,6 +129,8 @@ def build_conference_node(bookmark):
    127 129 
         conference = Node(tag='conference', attrs=attrs)
    128 130 
         if bookmark.nick:
    129 131 
             conference.setTagData('nick', bookmark.nick)
    132 
    +    if bookmark.extensions is not None:
    133 
    +        conference.addChild(node=bookmark.extensions)
    130 134 
         return conference
    131 135
    132 136

  • nbxmpp/structs.py
    ... ... @@ -88,6 +88,15 @@ class BobData(NamedTuple):
    88 88 
         type: str
    89 89
    90 90
    91 
    +class BookmarkData(NamedTuple):
    92 
    +    jid: JID
    93 
    +    name: Optional[str] = None
    94 
    +    nick: Optional[str] = None
    95 
    +    autojoin: bool = False
    96 
    +    password: Optional[str] = None
    97 
    +    extensions: Optional[Node] = None
    98 
    +
    99 
    +
    91 100 
     VoiceRequest = namedtuple('VoiceRequest', 'form jid nick')
    92 101
    93 102 
     MucUserData = namedtuple('MucUserData', 'affiliation jid nick role actor reason')
    ... ... @@ -122,9 +131,6 @@ ActivityData = namedtuple('ActivityData', 'activity subactivity text')
    122 131 
     LocationData = namedtuple('LocationData', LOCATION_DATA)
    123 132 
     LocationData.__new__.__defaults__ = (None,) * len(LocationData._fields)
    124 133
    125 
    -BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password')
    126 
    -BookmarkData.__new__.__defaults__ = (None, None, None, None)
    127 
    -
    128 134 
     PGPPublicKey = namedtuple('PGPPublicKey', 'jid key date')
    129 135
    130 136 
     PGPKeyMetadata = namedtuple('PGPKeyMetadata', 'jid fingerprint date')

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.