Mercurial > libervia-web

comparison src/server/server.py @ 637:7113d40533d6 frontends_multi_profiles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged souliane changes
author Goffi <goffi@goffi.org>
date Mon, 23 Feb 2015 18:47:27 +0100
parents 4f7550a083b4
children 2df91d0308ac
comparison
equal deleted inserted replaced
636:86ae737da6f3 637:7113d40533d6
210 def jsonrpc_updateContact(self, entity, name, groups): 210 def jsonrpc_updateContact(self, entity, name, groups):
211 """Update contact's roster item""" 211 """Update contact's roster item"""
212 profile = ISATSession(self.session).profile 212 profile = ISATSession(self.session).profile
213 self.sat_host.bridge.updateContact(entity, name, groups, profile) 213 self.sat_host.bridge.updateContact(entity, name, groups, profile)
214 214
215 def jsonrpc_subscription(self, sub_type, entity, name, groups): 215 def jsonrpc_subscription(self, sub_type, entity):
216 """Confirm (or infirm) subscription, 216 """Confirm (or infirm) subscription,
217 and setup user roster in case of subscription""" 217 and setup user roster in case of subscription"""
218 profile = ISATSession(self.session).profile 218 profile = ISATSession(self.session).profile
219 self.sat_host.bridge.subscription(sub_type, entity, profile) 219 self.sat_host.bridge.subscription(sub_type, entity, profile)
220 if sub_type == 'subscribed':
221 self.sat_host.bridge.updateContact(entity, name, groups, profile)
222 220
223 def jsonrpc_getWaitingSub(self): 221 def jsonrpc_getWaitingSub(self):
224 """Return list of room already joined by user""" 222 """Return list of room already joined by user"""
225 profile = ISATSession(self.session).profile 223 profile = ISATSession(self.session).profile
226 return self.sat_host.bridge.getWaitingSub(profile) 224 return self.sat_host.bridge.getWaitingSub(profile)