Changeset 120:9548851ca5ac for wokkel

Timestamp:

Oct 20, 2008, 9:54:28 PM (11 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@116

Message:

implement error conditions

Location:

wokkel

Files:

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

wokkel/muc.py

@@ -89 +89 @@
 DEFER_TIMEOUT = 30 # basic timeout is 30 seconds
 
+class JidMalformed(Exception):
+    """
+    A jid malformed error from the server.
+
+    
+    """
+    condition    = 'modify'
+    mucCondition = 'jid-malformed'
+    
+class NotAuthorized(Exception):
+    """
+    """
+    condition    = 'auth'
+    mucCondition = 'not-authorized'
+
+class RegistrationRequired(Exception):
+    """
+    """
+    condition    = 'auth'
+    mucCondition = 'registration-required'
+
+
+class Forbidden(Exception):
+    """
+    """
+    condition    = 'auth'
+    mucCondition = 'forbidden'
+
+
+MUC_EXCEPTIONS = {
+    'jid-malformed': JidMalformed,
+    'forbidden': Forbidden,
+    'not-authorized': NotAuthorized,
+    'exception': Exception,
+    }
+
 class MUCError(error.StanzaError):
     """
     Exception with muc specific condition.
     """
-    def __init__(self, condition, mucCondition, feature=None, text=None):
+    def __init__(self, condition, mucCondition, type='error', feature=None, text=None):
         appCondition = domish.Element((NS_MUC, mucCondition))
         if feature:
             appCondition['feature'] = feature
         error.StanzaError.__init__(self, condition,
+                                         type=type,
                                          text=text,
                                          appCondition=appCondition)
@@ -421 +458 @@
         # add muc elements
         x = self.addElement('x', NS_MUC)
+        
         # add error 
-        self.addChild(error)
+        e = error.getElement()
+        self.addChild(e)
         
 
@@ -476 +515 @@
         # add an error hook here?
         self._userLeavesRoom(room_jid)
+        
+    def _getExceptionFromPresence(self, prs):
+        muc_condition = 'exception'
+
+        error = getattr(prs, 'error', None)
+        if error is not None:
+            for e in error.elements():
+                muc_condition = e.name
+
+        return MUC_EXCEPTIONS[muc_condition]
 
     def _userLeavesRoom(self, room_jid):
@@ -580 +629 @@
         # check for errors
         if prs.hasAttribute('type') and prs['type'] == 'error':            
-            d.errback(prs)
+            d.errback(self._getExceptionFromPresence(prs))
         else:    
             # change the state of the room
@@ -867 +916 @@
         return iq.send()
 
-    def getMemberList(self, room_jid):
-        """ Get a member list from a room.
-
-        @param room_jid: The room jabber/xmpp entity id for the requested member list.
-        @type  room_jid: L{jid.JID}
-
-        """
+
+    def _getAffiliationList(self, room_jid, affiliation):
         iq = AffiliationRequest(self.xmlstream,
                                 method='get',
-                                affiliation='member', 
+                                affiliation=affiliation, 
                                 )
         iq['to'] = room_jid.full()
         return iq.send()        
-        
+
+
+
+    def getMemberList(self, room_jid):
+        """ Get a member list from a room.
+
+        @param room_jid: The room jabber/xmpp entity id for the requested member list.
+        @type  room_jid: L{jid.JID}
+
+        """
+        return self._getAffiliationList(room_jid, 'member')
+
+
+    def getAdminList(self, room_jid):
+        """ Get an admin list from a room.
+
+        @param room_jid: The room jabber/xmpp entity id for the requested member list.
+        @type  room_jid: L{jid.JID}
+
+        """
+        return self._getAffiliationList(room_jid, 'admin')
+
+    def getBanList(self, room_jid):
+        """ Get an outcast list from a room.
+
+        @param room_jid: The room jabber/xmpp entity id for the requested member list.
+        @type  room_jid: L{jid.JID}
+
+        """
+        return self._getAffiliationList(room_jid, 'outcast')
+
+    def getOwnerList(self, room_jid):
+        """ Get an owner list from a room.
+
+        @param room_jid: The room jabber/xmpp entity id for the requested member list.
+        @type  room_jid: L{jid.JID}
+
+        """
+        return self._getAffiliationList(room_jid, 'owner')
+
 
     def getRegisterForm(self, room):
@@ -892 +975 @@
         iq['to'] = room.userhost()
         return iq.send()
+
+    def destroy(self, room_jid, reason=None):
+        """ Destroy a room. 
+        
+        @param room_jid: The room jabber/xmpp entity id.
+        @type  room_jid: L{jid.JID}
+        
+        """
+        def destroyed(iq):
+            self._removeRoom(room_jid)
+            return True
+
+        iq = OwnerRequest(self.xmlstream, method='set')
+        d  = iq.query.addElement('destroy')
+        d['jid'] = room_jid.userhost()
+        if reason is not None:
+            d.addElement('reason', None, reason)
+
+        return iq.send().addCallback(destroyed)
 
     def subject(self, to, subject):

wokkel/test/test_muc.py

@@ -158 +158 @@
         return d
 
+    
 
     def test_joinRoomForbidden(self):
@@ -164 +165 @@
 
         def cb(error):
-            self.failUnless(isinstance(error.value,muc.PresenceError), 'Wrong type')
-            self.failUnless(error.value['type']=='error', 'Not an error returned')
+            
+            self.failUnless(error.value.mucCondition=='forbidden','Wrong muc condition')
+