# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1413810577 -7200
# Node ID 1f0ae61536aae8d2d74361f4722abe3894aaec7f
# Parent  3be9d8ab2e159198da06846d550a5f99fe5df60b
plugin XEP-0045: set the entity data "type" asap (userJoinedRoom is triggered before the join callback)

diff -r 3be9d8ab2e15 -r 1f0ae61536aa src/plugins/plugin_xep_0045.py
--- a/src/plugins/plugin_xep_0045.py	Mon Oct 20 12:57:27 2014 +0200
+++ b/src/plugins/plugin_xep_0045.py	Mon Oct 20 15:09:37 2014 +0200
@@ -128,7 +128,6 @@
             self.host.bridge.roomJoined(room.roomJID.userhost(), [user.nick for user in room.roster.values()], room.nick, profile)
 
         room_jid_s = room.roomJID.userhost()
-        self.host.memory.updateEntityData(room.roomJID, "type", "chatroom", profile)
         self.clients[profile].joined_rooms[room_jid_s] = room
         if room.locked:
             #FIXME: the current behaviour is to create an instant room
@@ -695,6 +694,7 @@
         log.debug('receivedGroupChat: room=%s user=%s body=%s' % (room, user, body))
 
     def userJoinedRoom(self, room, user):
+        self.host.memory.updateEntityData(room.roomJID, "type", "chatroom", self.parent.profile)
         if user.nick in self.__changing_nicks:
             self.__changing_nicks.remove(user.nick)
         else: