copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Catch more errors on vCard request

Browse source
This commit is contained in:
Philipp Hörist 2017-11-09 20:57:03 +01:00
parent 6e91a05590
commit 947106bb66
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gajim/common/connection_handlers.py
View file

@ -471,13 +471,18 @@ class ConnectionVcard:
jid = frm_jid.getStripped() jid = frm_jid.getStripped()
stanza_error = stanza.getError() 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', app.log('avatar').info('vCard not available: %s %s',
jid, stanza_error) frm_jid, stanza_error)
return return
vcard = self._node_to_dict( vcard_node = stanza.getTag('vCard', namespace=nbxmpp.NS_VCARD)
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 self.get_own_jid().bareMatch(jid):
if 'NICKNAME' in vcard: if 'NICKNAME' in vcard: