Changeset 119:053b615f0e11 for wokkel

Timestamp:

Oct 20, 2008, 9:01:07 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@115

Message:

basic user methods are implemented, admin and owner are left

File:

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

wokkel/muc.py

@@ -166 +166 @@
 
 
-class AffiliationRequest(xmlstream.IQ):
-    """
-    Register room request.
+class AdminRequest(xmlstream.IQ):
+    """
+    A basic admin 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_ADMIN, 'query'))
+
+
+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 AffiliationRequest(AdminRequest):
+    """
+    Register room request.
+
+    @ivar method: Type attribute of the IQ request. Either C{'set'} or C{'get'}
+    @type method: C{str}
+
     @ivar affiliation: The affiliation type to send to room.
     @type affiliation: C{str}
@@ -179 +208 @@
 
     def __init__(self, xs, method='get', affiliation='none', a_jid=None, reason=None):
-        xmlstream.IQ.__init__(self, xs, method)
-        
-        q = self.addElement((NS_MUC_ADMIN, 'query'))
-        i = q.addElement('item')
+        AdminRequest.__init__(self, xs, method)
+
+        i = self.query.addElement('item')
 
         i['affiliation'] = affiliation
@@ -713 +741 @@
         return d
     
-    def _changedNick(self, d, room_jid, prs):
-        """Callback for changing the nick.
+    def _changed(self, d, room_jid, prs):
+        """Callback for changing the nick and status.
         """
 
@@ -747 +775 @@
         # add observer for joining the room
         self.xmlstream.addOnetimeObserver(PRESENCE+"[@from='%s']" % (r.entity_id.full()), 
-                                          self._changedNick, 1, d, room_jid)
+                                          self._changed, 1, d, room_jid)
 
         return d
@@ -768 +796 @@
     
 
-    
+    def status(self, room_jid, show=None, status=None):
+        """Change user status.
+
+        See: http://xmpp.org/extensions/xep-0045.html#changepres
+
+        @param room_jid: The room jabber/xmpp entity id for the requested configuration form.
+        @type  room_jid: L{jid.JID}
+
+        @param show: The availability of the entity. Common values are xa, available, etc
+        @type  show: L{unicode}
+
+        @param show: The current status of the entity. 
+        @type  show: L{unicode}
+
+        """
+        r = self._getRoom(room_jid)
+        if r is None:
+            raise Exception, 'Room not found'
+
+        p = BasicPresence(to=r.entityId()) 
+        if status is not None:
+            p.addElement('status', None, status)
+            
+        if show is not None:
+            p.addElement('show', None, show)
+            
+        d = self.sendDeferred(p, timeout=DEFER_TIMEOUT)
+
+        # add observer for joining the room
+        self.xmlstream.addOnetimeObserver(PRESENCE+"[@from='%s']" % (r.entity_id.full()), 
+                                          self._changed, 1, d, room_jid)
+
+        return d
 
     def _sendMessage(self, msg, children=None):
@@ -807 +867 @@
         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}
+
+        """
+        iq = AffiliationRequest(self.xmlstream,
+                                method='get',
+                                affiliation='member', 
+                                )
+        iq['to'] = room_jid.full()
+        return iq.send()        
+        
+
     def getRegisterForm(self, room):
         """
+
+        @param room: The room jabber/xmpp entity id for the requested registration form.
+        @type  room: L{jid.JID}
+
         """
         iq = RegisterRequest(self.xmlstream)