core (xmpp): RosterItem.jid is deprecated in Wokkel 0.7.1, use RosterItem.entity instead
This commit is contained in:
parent
af3ec67047
commit
2273421745
1 changed files with 6 additions and 6 deletions
|
|
@ -187,7 +187,7 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
|
||||||
#XXX: current behaviour: we don't want contact in our roster list
|
#XXX: current behaviour: we don't want contact in our roster list
|
||||||
# if there is no presence subscription
|
# if there is no presence subscription
|
||||||
# may change in the future
|
# may change in the future
|
||||||
self.removeItem(item.jid) # FIXME: to be checked
|
self.removeItem(item.entity) # FIXME: to be checked
|
||||||
else:
|
else:
|
||||||
self._registerItem(item)
|
self._registerItem(item)
|
||||||
|
|
||||||
|
|
@ -197,16 +197,16 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
|
||||||
item must be already registered in self._jids before this method is called
|
item must be already registered in self._jids before this method is called
|
||||||
@param item (RosterIem): item added
|
@param item (RosterIem): item added
|
||||||
"""
|
"""
|
||||||
log.debug(u"registering item: {}".format(item.jid.full()))
|
log.debug(u"registering item: {}".format(item.entity.full()))
|
||||||
if item.entity.resource:
|
if item.entity.resource:
|
||||||
log.warning(u"Received a roster item with a resource, this is not common but not restricted by RFC 6121, this case may be not well tested.")
|
log.warning(u"Received a roster item with a resource, this is not common but not restricted by RFC 6121, this case may be not well tested.")
|
||||||
if not item.subscriptionTo:
|
if not item.subscriptionTo:
|
||||||
if not item.subscriptionFrom:
|
if not item.subscriptionFrom:
|
||||||
log.info(_(u"There's no subscription between you and [{}]!").format(item.jid.full()))
|
log.info(_(u"There's no subscription between you and [{}]!").format(item.entity.full()))
|
||||||
else:
|
else:
|
||||||
log.info(_(u"You are not subscribed to [{}]!").format(item.jid.full()))
|
log.info(_(u"You are not subscribed to [{}]!").format(item.entity.full()))
|
||||||
if not item.subscriptionFrom:
|
if not item.subscriptionFrom:
|
||||||
log.info(_(u"[{}] is not subscribed to you!").format(item.jid.full()))
|
log.info(_(u"[{}] is not subscribed to you!").format(item.entity.full()))
|
||||||
|
|
||||||
for group in item.groups:
|
for group in item.groups:
|
||||||
self._groups.setdefault(group, set()).add(item.entity)
|
self._groups.setdefault(group, set()).add(item.entity)
|
||||||
|
|
@ -241,7 +241,7 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
|
||||||
item = request.item
|
item = request.item
|
||||||
self._jids[item.entity] = item
|
self._jids[item.entity] = item
|
||||||
self._registerItem(item)
|
self._registerItem(item)
|
||||||
self.host.bridge.newContact(item.jid.full(), self.getAttributes(item), item.groups, self.parent.profile)
|
self.host.bridge.newContact(item.entity.full(), self.getAttributes(item), item.groups, self.parent.profile)
|
||||||
|
|
||||||
def removeReceived(self, request):
|
def removeReceived(self, request):
|
||||||
entity = request.item.entity
|
entity = request.item.entity
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue