Changeset 162:8bffd58d7b6d for wokkel/muc.py

Timestamp:

Jan 8, 2012, 9:26:06 AM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Expose locked state of a room on join response with room created status.

When the presence in response to a join includes the room created status code
(201), the client should configure the room before it can be used. To enable
this, the locked state of the room is now exposed through the Room.locked
attribute.

Also, update example MUC client to deal with newly created, locked rooms.

File:

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

wokkel/muc.py

@@ -1134 +1134 @@
     @type nick: C{unicode}
 
-    @ivar state: The status code of the room.
-    @type state: L{int}
-
     @ivar occupantJID: The JID of the occupant in the room. Generated from
         roomJID and nick.
     @type occupantJID: L{jid.JID}
-    """
-
-
-    def __init__(self, roomJID, nick, state=None):
+
+    @ivar locked: Flag signalling a locked room. A locked room first needs
+        to be configured before it can be used. See
+        L{MUCClientProtocol.getConfiguration} and
+        L{MUCClientProtocol.configure}.
+    @type locked: C{bool}
+    """
+
+    locked = False
+
+    def __init__(self, roomJID, nick):
         """
         Initialize the room.
@@ -1149 +1153 @@
         self.roomJID = roomJID
         self.setNick(nick)
-        self.state = state
-
-        self.status = 0
-
         self.roster = {}
 
@@ -1456 +1456 @@
             We have presence that says we joined a room.
             """
-            room.state = 'joined'
+            if STATUS_CODE.ROOM_CREATED in presence.mucStatuses:
+                room.locked = True
+
             return room
 
@@ -1463 +1465 @@
             return failure
 
-        room = Room(roomJID, nick, state='joining')
+        room = Room(roomJID, nick)
         self._addRoom(room)