Changeset 126:f6c8a769e38e

Timestamp:

Oct 21, 2008, 12:57:32 AM (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@122

Message:

make sure we change status and add a test

Location:

wokkel

Files:

• muc.py (modified) (2 diffs)
• test/test_muc.py (modified) (2 diffs)

wokkel/muc.py

@@ -639 +639 @@
             # not in the room yet
             return
-
-        # check if user is in roster
-        user = room.getUser(room_jid.resource)
-        if user is None: # create a user that does not exist
-            user = User(room_jid.resource)
-            
-        
+        user = self._changeUserStatus(room, room_jid, status, show)
+
         if room.inRoster(user):
             # we changed status or nick 
@@ -930 +925 @@
         return d
     
+    def _changeUserStatus(self, r, room_jid, status, show):
+        # check if user is in roster
+        user = r.getUser(room_jid.resource)
+        if user is None: # create a user that does not exist
+            user = User(room_jid.resource)
+
+        if status is not None:
+            user.status = str(status)
+        if show is not None:
+            user.show   = str(show)
+
+        return user
+
     def _changed(self, d, room_jid, prs):
         """Callback for changing the nick and status.
         """
 
+        status = getattr(prs, 'status', None)
+        show   = getattr(prs, 'show', None)
+
         r = self._getRoom(room_jid)
+
+        user = self._changeUserStatus(r, room_jid, status, show)
 
         d.callback(r)

wokkel/test/test_muc.py

@@ -479 +479 @@
 
         """
-        give_voice = JID('ban@jabber.org/TroubleMakger')
+        give_voice = JID('voice@jabber.org/TroubleMakger')
         def cb(give_voice):
             self.failUnless(give_voice, 'Did not give voice user')
@@ -497 +497 @@
         return d
 
-        
+
+    def test_changeStatus(self):
+        """Change status
+        """
+        self._createRoom()
+        r = self.protocol._getRoom(self.room_jid)
+        u = muc.User(self.room_jid.resource)
+        r.addUser(u)
+
+        def cb(room):
+            self.assertEquals(self.test_room, room.name)
+            u = room.getUser(self.room_jid.resource)
+            self.failUnless(u is not None, 'User not found')
+            self.failUnless(u.status == 'testing MUC', 'Wrong status')
+            self.failUnless(u.show == 'xa', 'Wrong show')
+            
+        d = self.protocol.status(self.room_jid, 'xa', 'testing MUC')
+        d.addCallback(cb)
+
+        prs = self.stub.output[-1]
+
+        self.failUnless(prs.name=='presence', "Need to be presence")
+        self.failUnless(getattr(prs, 'x', None), 'No muc x element')
+
+        # send back user presence, they joined        
+        response = muc.UserPresence(frm=self.room_jid.full())
+        response.addElement('show', None, 'xa')
+        response.addElement('status', None, 'testing MUC')
+        self.stub.send(response)
+        return d