erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin XEP-0045, XEP-0054, XEP-0096: deprecated bridge method are not used anymore

Browse source
This commit is contained in:
Goffi 2016-08-28 18:20:55 +02:00
commit 0de4df1051
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/plugins/plugin_xep_0054.py
View file

@ -252,30 +252,26 @@ class XEP_0054(object):
defer.returnValue(dictionary)
def _VCardCb(self, answer, client):
def _getCardCb(self, iq_elt, to_jid, client):
"""Called after the first get IQ"""
log.debug(_("VCard found"))
if answer.firstChildElement().name == "vCard":
try:
from_jid = jid.JID(answer["from"])
except KeyError:
from_jid = client.jid.userhostJID()
d = self.vCard2Dict(client, answer.firstChildElement(), from_jid)
d.addCallback(lambda data: self.host.bridge.actionResult("RESULT", answer['id'], data, client.profile))
else:
log.error(_("FIXME: vCard not found as first child element"))
self.host.bridge.actionResult("SUPPRESS", answer['id'], {}, client.profile) # FIXME: maybe an error message would be better
def _VCardEb(self, failure, client):
"""Called when something is wrong with registration"""
try:
self.host.bridge.actionResult("SUPPRESS", failure.value.stanza['id'], {}, client.profile) # FIXME: maybe an error message would be better
log.warning(_(u"Can't find VCard of %s") % failure.value.stanza['from'])
self.updateCache(client, jid.JID(failure.value.stanza['from']), "avatar", '')
except (AttributeError, KeyError):
# 'ConnectionLost' object has no attribute 'stanza' + sometimes 'from' key doesn't exist
log.warning(_(u"Can't find VCard: %s") % failure.getErrorMessage())
vcard_elt = iq_elt.elements(NS_VCARD, "vCard").next()
except StopIteration:
log.warning(u"Can't find vCard element in answer for jid {jid}", jid=to_jid.full())
return
try:
from_jid = jid.JID(iq_elt["from"])
except KeyError:
from_jid = client.jid.userhostJID()
d = self.vCard2Dict(client, vcard_elt, from_jid)
return d
def _getCardEb(self, failure_, to_jid, client):
"""Called when something is wrong with registration"""
log.warning(u"Can't get vCard for {jid}: {failure}".format(jid=to_jid.full, failure=failure_))
self.updateCache(client, to_jid, "avatar", '')
def _getCard(self, target_s, profile_key=C.PROF_KEY_NONE):
client = self.host.getClient(profile_key)
@ -293,7 +289,7 @@ class XEP_0054(object):
reg_request["from"] = client.jid.full()
reg_request["to"] = to_jid.userhost()
reg_request.addElement('vCard', NS_VCARD)
reg_request.send(to_jid.userhost()).addCallbacks(self._VCardCb, self._VCardEb, callbackArgs=[client], errbackArgs=[client])
reg_request.send(to_jid.userhost()).addCallbacks(self._getCardCb, self._getCardEb, callbackArgs=[to_jid, client], errbackArgs=[to_jid, client])
return reg_request["id"]
def getAvatarFile(self, avatar_hash):