Changeset 116:66d9a0b47016 for wokkel

Timestamp:

Oct 17, 2008, 12:14: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@110

Message:

change namespaces to be consistent

Location:

wokkel

Files:

• muc.py (modified) (13 diffs)
• test/test_muc.py (modified) (4 diffs)

wokkel/muc.py

@@ -23 +23 @@
 
 # Multi User Chat namespaces
-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'
-NS_REQUEST  = NS + '#request'
-NS_REGISTER = NS + '#register'
-
-NS_DELAY    = 'urn:xmpp:delay'
+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_MUC_REQUEST  = NS_MUC + '#request'
+NS_MUC_REGISTER = NS_MUC + '#register'
+
+NS_DELAY        = 'urn:xmpp:delay'
+NS_JABBER_DELAY = 'jabber:x:delay'
+
 NS_REQUEST  = 'jabber:iq:register'
 
@@ -53 +55 @@
 IQ_COMMAND   = IQ+'/command'
 
-MUC_ADMIN = IQ_QUERY+'[@xmlns="' + NS_ADMIN + '"]'
-MUC_OWNER = IQ_QUERY+'[@xmlns="' + NS_OWNER + '"]'
+MUC_ADMIN = IQ_QUERY+'[@xmlns="' + NS_MUC_ADMIN + '"]'
+MUC_OWNER = IQ_QUERY+'[@xmlns="' + NS_MUC_OWNER + '"]'
 
 MUC_AO = MUC_ADMIN + '|' + MUC_OWNER
@@ -91 +93 @@
     """
     def __init__(self, condition, mucCondition, feature=None, text=None):
-        appCondition = domish.Element((NS, mucCondition))
+        appCondition = domish.Element((NS_MUC, mucCondition))
         if feature:
             appCondition['feature'] = feature
@@ -129 +131 @@
     def __init__(self, xs, method='get', fields=[]):
         xmlstream.IQ.__init__(self, xs, method)
-        q = self.addElement((NS_OWNER, 'query'))
+        q = self.addElement((NS_MUC_OWNER, 'query'))
         if method == 'set':
             # build data form
-            form = data_form.Form('submit', formNamespace=NS_CONFIG)
+            form = data_form.Form('submit', formNamespace=NS_MUC_CONFIG)
             q.addChild(form.toElement())
             
@@ -155 +157 @@
             # build data form
             form_type = 'submit'        
-            form = data_form.Form(form_type, formNamespace=NS_REGISTER)
+            form = data_form.Form(form_type, formNamespace=NS_MUC_REGISTER)
             q.addChild(form.toElement())        
             
@@ -178 +180 @@
         xmlstream.IQ.__init__(self, xs, method)
         
-        q = self.addElement((NS_ADMIN, 'query'))
+        q = self.addElement((NS_MUC_ADMIN, 'query'))
         i = q.addElement('item')
 
@@ -199 +201 @@
         domish.Element.__init__(self, (None, 'message'))
         self['type'] = 'groupchat'
-        self['to']   = to 
+        if isinstance(to, jid.JID):
+            self['to'] = to.userhost()
+        else:
+            self['to'] = to
         if frm:
             self['from'] = frm
@@ -226 +231 @@
         PrivateChat.__init__(self, to, body=body, frm=frm)
         del self['type'] # remove type
-        x = self.addElement('x', NS_USER)
+        x = self.addElement('x', NS_MUC_USER)
         invite = x.addElement('invite')
         if full_jid:
@@ -311 +316 @@
         xmppim.AvailablePresence.__init__(self, to=to, show=show, statuses=statuses)
         # add muc elements
-        x = self.addElement('x', NS)
+        x = self.addElement('x', NS_MUC)
 
 
@@ -325 +330 @@
             self['from'] = frm
         # add muc elements
-        x = self.addElement('x', NS_USER)
+        x = self.addElement('x', NS_MUC_USER)
         if affiliation:
             x['affiliation'] = affiliation
@@ -347 +352 @@
         GroupChat.__init__(self, to=to, frm=frm)
         # build data form
-        form = data_form.Form('submit', formNamespace=NS_REQUEST)
+        form = data_form.Form('submit', formNamespace=NS_MUC_REQUEST)
         form.addField(data_form.Field(var='muc#role',
                                       value='participant', 
@@ -364 +369 @@
             self['from'] = frm
         # add muc elements
-        x = self.addElement('x', NS)
+        x = self.addElement('x', NS_MUC)
         # add error 
         self.addChild(error)
@@ -476 +481 @@
             return
         user = room.getUser(room_jid.resource)
-
-        delay = getattr(msg, 'delay', None)
+        delay = None
+        # need to check for delay and x stanzas for delay namespace for backwards compatability
+        for e in msg.elements():
+            if e.uri == NS_DELAY or e.uri == NS_JABBER_DELAY:
+                delay = e
         body  = unicode(msg.body)
         # grab room

wokkel/test/test_muc.py

@@ -127 +127 @@
         response.addElement('query', disco.NS_INFO)
         # need to add information to response
-        response.query.addChild(disco.DiscoFeature(muc.NS))
+        response.query.addChild(disco.DiscoFeature(muc.NS_MUC))
         response.query.addChild(disco.DiscoIdentity(category='conference',
                                                     name='Macbeth Chat Service',
@@ -343 +343 @@
 
         iq = self.stub.output[-1]
-        
+        print iq.toXml()
         self.failUnless(xpath.matches("/iq/query[@xmlns='%s']" % (muc.NS_REQUEST), iq), 'Invalid iq register request')
         
         response = toResponse(iq, 'result')
+        
         self.stub.send(response)
         return d
@@ -357 +358 @@
         m = self.stub.output[-1]
         
-        self.failUnless(xpath.matches("/message/x[@type='submit']/field/value[text()='%s']" % (muc.NS_REQUEST,), m), 'Invalid voice message stanza')
+        self.failUnless(xpath.matches("/message/x[@type='submit']/field/value[text()='%s']" % (muc.NS_MUC_REQUEST,), m), 'Invalid voice message stanza')
 
 
@@ -378 +379 @@
 
         iq = self.stub.output[-1]
-        self.failUnless(xpath.matches("/iq/query[@xmlns='%s']/x"% (muc.NS_OWNER,), iq), 'Bad configure request')
-        
-        response = toResponse(iq, 'result')
-        self.stub.send(response)
-        return d
-
-
+        self.failUnless(xpath.matches("/iq/query[@xmlns='%s']/x"% (muc.NS_MUC_OWNER,), iq), 'Bad configure request')
+        
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+