Modify update_roster() to only change the information provided.

Before: Not specifying the groups, name, etc would remove them from the
        roster entry.

After: Any parameters not specified are populated with the current
       roster entry's values.
This commit is contained in:
Lance Stout 2012-07-24 16:48:24 -07:00
parent 9a08dfc7d4
commit 70883086b7

View file

@ -179,8 +179,7 @@ class ClientXMPP(BaseXMPP):
self._stream_feature_order.remove((order, name)) self._stream_feature_order.remove((order, name))
self._stream_feature_order.sort() self._stream_feature_order.sort()
def update_roster(self, jid, name=None, subscription=None, groups=[], def update_roster(self, jid, **kwargs):
block=True, timeout=None, callback=None):
"""Add or change a roster item. """Add or change a roster item.
:param jid: The JID of the entry to modify. :param jid: The JID of the entry to modify.
@ -201,6 +200,16 @@ class ClientXMPP(BaseXMPP):
Will be executed when the roster is received. Will be executed when the roster is received.
Implies ``block=False``. Implies ``block=False``.
""" """
current = self.client_roster[jid]
name = kwargs.get('name', current['name'])
subscription = kwargs.get('subscription', current['subscription'])
groups = kwargs.get('groups', current['groups'])
block = kwargs.get('block', True)
timeout = kwargs.get('timeout', None)
callback = kwargs.get('callback', None)
return self.client_roster.update(jid, name, subscription, groups, return self.client_roster.update(jid, name, subscription, groups,
block, timeout, callback) block, timeout, callback)