Changeset 147:aa2cfee614e7 for wokkel/muc.py

Timestamp:

Aug 12, 2011, 2:11:43 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

Use generic.Request for room destruction request, add TestableStreamManager?.

File:

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

wokkel/muc.py

@@ -105 +105 @@
 
 
-class OwnerRequest(xmlstream.IQ):
-    """
-    A basic owner iq request.
-
-    @ivar method: Type attribute of the IQ request. Either C{'set'} or C{'get'}
-    @type method: C{str}
-    """
-
-    def __init__(self, xs, method='get'):
-        xmlstream.IQ.__init__(self, xs, method)
-        q = self.addElement((NS_MUC_OWNER, 'query'))
+class DestructionRequest(generic.Request):
+    """
+    Room destruction request.
+
+    @param reason: Optional reason for the destruction of this room.
+    @type reason: C{unicode}.
+
+    @param alternate: Optional room JID of an alternate venue.
+    @type alternate: L{jid.JID}
+
+    @param password: Optional password for entering the alternate venue.
+    @type password: C{unicode}
+    """
+
+    stanzaType = 'set'
+
+    def __init__(self, recipient, sender=None, reason=None, alternate=None,
+                       password=None):
+        generic.Request.__init__(self, recipient, sender)
+        self.reason = reason
+        self.alternate = alternate
+        self.password = password
+
+
+    def toElement(self):
+        element = generic.Request.toElement(self)
+        element.addElement((NS_MUC_OWNER, 'query'))
+        element.query.addElement('destroy')
+
+        if self.alternate:
+            element.query.destroy['jid'] = self.alternate.full()
+
+            if self.password:
+                element.query.destroy.addElement('password',
+                                                 content=self.password)
+
+        if self.reason:
+            element.query.destroy.addElement('reason', content=self.reason)
+
+        return element
 
 
@@ -1155 +1184 @@
 
 
-    def destroy(self, roomJID, reason=None, alternate=None):
+    def destroy(self, roomJID, reason=None, alternate=None, password=None):
         """
         Destroy a room.
 
-        @param roomJID: The bare JID of the room.
-        @type roomJID: L{jid.JID}
-
-        @param reason: The reason we are destroying the room.
+        @param roomJID: The JID of the room.
+        @type roomJID: L{jid.JID}
+
+        @param reason: The reason for the destruction of the room.
         @type reason: C{unicode}
 
-        @param alternate: The bare JID of the room suggested as an alternate
-                          venue.
+        @param alternate: The JID of the room suggested as an alternate venue.
         @type alternate: L{jid.JID}
 
@@ -1172 +1200 @@
         def destroyed(iq):
             self._removeRoom(roomJID)
-            return True
-
-        iq = OwnerRequest(self.xmlstream, method='set')
-        iq['to'] = roomJID.userhost()
-        d = iq.query.addElement('destroy')
-
-        if alternate is not None:
-            d['jid'] = alternate.userhost()
-        if reason is not None:
-            d.addElement('reason', None, reason)
-
-        return iq.send().addCallback(destroyed)
+
+        request = DestructionRequest(recipient=roomJID, reason=reason,
+                                     alternate=alternate, password=password)
+
+        d = self.request(request)
+        d.addCallback(destroyed)
+        return d