Philipp Hörist pushed to branch master at gajim / gajim

Commits: 947106bb by Philipp Hörist at 2017-11-09T20:57:03+01:00 Catch more errors on vCard request

- - - - -

1 changed file:

- gajim/common/connection_handlers.py

Changes:

===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -471,13 +471,18 @@ class ConnectionVcard: jid = frm_jid.getStripped()

stanza_error = stanza.getError() - if stanza_error in ('service-unavailable', 'item-not-found'): + if stanza_error in ('service-unavailable', 'item-not-found', + 'not-allowed'): app.log('avatar').info('vCard not available: %s %s', - jid, stanza_error) + frm_jid, stanza_error) return

- vcard = self._node_to_dict( - stanza.getTag('vCard', namespace=nbxmpp.NS_VCARD)) + vcard_node = stanza.getTag('vCard', namespace=nbxmpp.NS_VCARD) + if vcard_node is None: + app.log('avatar').info('vCard not available: %s', frm_jid) + app.log('avatar').debug(stanza) + return + vcard = self._node_to_dict(vcard_node)

if self.get_own_jid().bareMatch(jid): if 'NICKNAME' in vcard:

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/947106bb661f00feee4b79e69fee9d2d6f8...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/947106bb661f00feee4b79e69fee9d2d6f8... You're receiving this email because of your account on dev.gajim.org.