core: presence status + last resource refactored and kept in entitiesCache in memory.py, profile cache is purged on disconnection
This commit is contained in:
parent
d229d7feae
commit
8f622601c6
2 changed files with 63 additions and 45 deletions
|
|
@ -256,6 +256,7 @@ class SAT(service.Service):
|
|||
|
||||
return current.getConnectionDeferred()
|
||||
|
||||
self.memory.startProfileSession(profile)
|
||||
return self.memory.loadIndividualParams(profile).addCallback(afterMemoryInit)
|
||||
|
||||
def disconnect(self, profile_key):
|
||||
|
|
@ -290,7 +291,7 @@ class SAT(service.Service):
|
|||
del self.profiles[profile]
|
||||
except KeyError:
|
||||
error(_("Trying to remove reference to a client not referenced"))
|
||||
self.memory.purgeProfile(profile)
|
||||
self.memory.purgeProfileSession(profile)
|
||||
|
||||
def startService(self):
|
||||
info("Salut à toi ô mon frère !")
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
|
|||
statuses["default"] = statuses[None]
|
||||
del statuses[None]
|
||||
|
||||
self.host.memory.addPresenceStatus(entity, show or "",
|
||||
self.host.memory.setPresenceStatus(entity, show or "",
|
||||
int(priority), statuses, self.parent.profile)
|
||||
|
||||
#now it's time to notify frontends
|
||||
|
|
@ -265,7 +265,7 @@ class SatPresenceProtocol(xmppim.PresenceClientProtocol):
|
|||
if statuses.has_key(None): #we only want string keys
|
||||
statuses["default"] = statuses[None]
|
||||
del statuses[None]
|
||||
self.host.memory.addPresenceStatus(entity, "unavailable", 0, statuses, self.parent.profile)
|
||||
self.host.memory.setPresenceStatus(entity, "unavailable", 0, statuses, self.parent.profile)
|
||||
|
||||
#now it's time to notify frontends
|
||||
self.host.bridge.presenceUpdate(entity.full(), "unavailable", 0, statuses, self.parent.profile)
|
||||
|
|
|
|||
Loading…
Reference in a new issue