From 2f6b8ae7712dab302df0e1bb64bd3a061b2ecb22 Mon Sep 17 00:00:00 2001 From: souliane Date: Fri, 17 Oct 2014 20:26:01 +0200 Subject: [PATCH] memory: don't save last resource in entity data for the MUC jids --- src/memory/memory.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/memory/memory.py b/src/memory/memory.py index 18af8f7e..ec3706cb 100644 --- a/src/memory/memory.py +++ b/src/memory/memory.py @@ -423,7 +423,12 @@ class Memory(object): entity_data = self._getEntitiesData(entity_jid, profile)[entity_jid] resource = entity_jid.resource if resource: - self.updateEntityData(entity_jid.userhostJID(), C.ENTITY_LAST_RESOURCE, resource, profile) + try: + type_ = self.getEntityDatum(entity_jid.userhostJID(), 'type', profile) + except KeyError: + type_ = 'contact' + if type_ != 'chatroom': + self.updateEntityData(entity_jid.userhostJID(), C.ENTITY_LAST_RESOURCE, resource, profile) entity_data.setdefault("presence", {})[resource or ''] = (show, priority, statuses) def _getEntitiesData(self, entity_jid, profile):