Changeset 108:50e3c368f2f3 for wokkel/muc.py

Timestamp:

Sep 30, 2008, 7:08:45 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@69

Message:

add basic errors and disco stuff, still need iq and message parts re #24

File:

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

wokkel/muc.py

@@ -19 +19 @@
 from wokkel import disco, data_form, shim, xmppim
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-from wokkel.iwokkel import IMUCClient, IMUCService
+from wokkel.iwokkel import IMUCClient
 
 # Multi User Chat namespaces
-NS_MUC          = 'http://jabber.org/protocol/muc'
-NS_MUC_USER     = NS_MUC + '#user'
-NS_MUC_ADMIN    = NS_MUC + '#admin'
-NS_MUC_OWNER    = NS_MUC + '#owner'
-NS_MUC_ROOMINFO = NS_MUC + '#roominfo'
-NS_MUC_CONFIG   = NS_MUC + '#roomconfig'
+NS          = 'http://jabber.org/protocol/muc'
+NS_USER     = NS + '#user'
+NS_ADMIN    = NS + '#admin'
+NS_OWNER    = NS + '#owner'
+NS_ROOMINFO = NS + '#roominfo'
+NS_CONFIG   = NS + '#roomconfig'
 
 # ad hoc commands
@@ -47 +47 @@
 IQ_COMMAND   = IQ+'/command'
 
-MUC_ADMIN = IQ_QUERY+'[@xmlns="' + NS_MUC_ADMIN + '"]'
-MUC_OWNER = IQ_QUERY+'[@xmlns="' + NS_MUC_OWNER + '"]'
+MUC_ADMIN = IQ_QUERY+'[@xmlns="' + NS_ADMIN + '"]'
+MUC_OWNER = IQ_QUERY+'[@xmlns="' + NS_OWNER + '"]'
 
 MUC_AO = MUC_ADMIN + '|' + MUC_OWNER
@@ -69 +69 @@
     """
     def __init__(self, condition, mucCondition, feature=None, text=None):
-        appCondition = domish.Element((NS_MUC_ERRORS, mucCondition))
+        appCondition = domish.Element((NS, mucCondition))
         if feature:
             appCondition['feature'] = feature
@@ -94 +94 @@
 
 
+
 class Room(object):
     """
@@ -124 +125 @@
         
         # add muc elements
-        x = self.addElement('x', NS_MUC)
+        x = self.addElement('x', NS)
 
 
@@ -138 +139 @@
             self['from'] = frm
         # add muc elements
-        x = self.addElement('x', NS_MUC_USER)
+        x = self.addElement('x', NS_USER)
         if affiliation:
             x['affiliation'] = affiliation
@@ -151 +152 @@
     """
 
-    def __init__(self, error, to=None):
+    def __init__(self, error, to=None, frm=None):
         BasicPresence.__init__(self, to, type='error')
-        
+        if frm:
+            self['from'] = frm
         # add muc elements
-        x = self.addElement('x', NS_MUC)
+        x = self.addElement('x', NS)
         # add error 
         self.addChild(error)
@@ -170 +172 @@
     def connectionInitialized(self):
         self.rooms = {}
-        self.xmlstream.addObserver(PRESENCE, self._onPresence)
-        self.xmlstream.addObserver(GROUPCHAT, self._onGroupChat)
+        
 
     def _setRoom(self, room):
@@ -179 +180 @@
         return self.rooms.get(room_jid.full().lower())
 
-    def _onGroupChat(self, msg):
-        """handle groupchat message stanzas
-        """
-
-
-    def _onPresence(self, prs):
-        """handle groupchat presence
-        """
-        x = getattr(prs, 'x', None)
-        if x.uri == NS_MUC_USER:
-            self.userPresence(prs)
 
 
@@ -196 +186 @@
         """
         room_jid = jid.internJID(prs['from'])
-        print type(prs)
-        print type(d)
+        
         # check for errors
         if prs.hasAttribute('type') and prs['type'] == 'error':            
-            print room_jid.full()
-        # change the state of the room
-        r = self._getRoom(room_jid)
-        r.state = 'joined'
-        d.callback(room_jid, r)
+            d.errback(prs)
+        else:    
+            # change the state of the room
+            r = self._getRoom(room_jid)
+            r.state = 'joined'
+            d.callback(r)
 
     def userPresence(self, prs):
@@ -211 +201 @@
         pass
         
-    def joinRoom(self, server, room, nick):
+
+    def _cbDisco(self, iq):
+        # grab query
+        
+        return iq.query
+        
+    def disco(self, entity, type='info'):
+        """Send disco queries to a XMPP entity
+        """
+
+        iq = disco.DiscoRequest(self.xmlstream, disco.NS_INFO, 'get')
+        iq['to'] = entity
+
+        return iq.send().addCallback(self._cbDisco)
+        
+
+    def join(self, server, room, nick):
         """
         """
@@ -224 +230 @@
         # add observer for joining the room
         self.xmlstream.addOnetimeObserver(PRESENCE+"[@from='%s']" % (r.entity_id.full()), 
-                                          self._joinedRoom, d)
+                                          self._joinedRoom, 1, d)
 
         return d