Changeset 114:a2a47e4df6d5 for wokkel

Timestamp:

Oct 8, 2008, 8:48:32 PM (14 years ago)

Author:

Christopher Zorn <tofu@…>

Branch:

wokkel-muc-client-support-24

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/branches/wokkel-muc-client-support-24@84

Message:

add event for user leaving a room

File:

• wokkel/muc.py (modified) (6 diffs)

wokkel/muc.py

@@ -273 +273 @@
         self.server = server
         self.nick   = nick
-        self.status = None
+        self.status = 0
 
         self.entity_id = jid.internJID(name+'@'+server+'/'+nick)
@@ -297 +297 @@
         return self.roster.get(nick.lower())
 
+    def removeUser(self, user):
+        if self.inRoster(user):
+            del self.roster[user.nick.lower()]
         
 
@@ -383 +386 @@
         # add history
 
+
     def _setRoom(self, room):
-        self.rooms[room.entity_id.full().lower()] = room
+        self.rooms[room.entity_id.userhost().lower()] = room
 
     def _getRoom(self, room_jid):
-        return self.rooms.get(room_jid.full().lower())
+        return self.rooms.get(room_jid.userhost().lower())
 
     def _removeRoom(self, room_jid):
-        if self.rooms.has_key(room_jid.full().lower()):
-            del self.rooms[room_jid.full().lower()]
+        if self.rooms.has_key(room_jid.userhost().lower()):
+            del self.rooms[room_jid.userhost().lower()]
 
 
@@ -400 +404 @@
             return
         room_jid = jid.internJID(prs.getAttribute('from', ''))
-
+        self._userLeavesRoom(room_jid)
 
     def _onPresenceError(self, prs):
@@ -408 +412 @@
             return
         room_jid = jid.internJID(prs.getAttribute('from', ''))
-
-
+        # add an error hook here?
+        self._userLeavesRoom(room_jid)
+
+    def _userLeavesRoom(self, room_jid):
+        room = self._getRoom(room_jid)
+        if room is None:
+            # not in the room yet
+            return
+        # check if user is in roster
+        user = room.getUser(room_jid.resource)
+        if user is None:
+            return
+        if room.inRoster(user):
+            room.removeUser(user)
+            self.userLeftRoom(room, user)
+        
     def _onXPresence(self, prs):
         """
@@ -535 +553 @@
         pass
 
+    def userLeftRoom(self, room, user):
+        """User has left a room
+        """
+        pass
+
 
     def userUserUpdatedStatus(self, room, user, show, status):