Changeset 142

Timestamp:

04/26/08 17:36:56 (2 years ago)

Author:

thib

Message:

xmppy powa

Location:

adventure

Files:

• movable.py (modified) (2 diffs)
• player.py (modified) (1 diff)

adventure/movable.py

@@ -51 +51 @@
                 photo.addChild(node=Node('BINVAL', {}, encoded_data))
                 
-                vcard_pres = self.presence.getTag(NS_VCARD + ':x:update x')
+                vcard_pres = self.presence.getTag('x', namespace=NS_VCARD + ':x:update')
                 if not vcard_pres:
-                    vcard_pres = self.presence.setTag(NS_VCARD + ':x:update x')
+                    vcard_pres = self.presence.setTag('x', namespace=NS_VCARD + ':x:update')
                 vcard_pres.addChild(node=Node('photo', {},
                                               sha(data).hexdigest()))
@@ -91 +91 @@
         pres = Presence(node=self.presence)
         
-        tag_x = pres.getTag(NS_MUC_USER + ' x')
+        tag_x = pres.getTag('x', namespace=NS_MUC_USER)
         if not tag_x:
-            tag_x = pres.setTag(NS_MUC_USER + ' x')
+            tag_x = pres.setTag('x', namespace=NS_MUC_USER)
         
-        tag_item = tag_x.getTag(NS_MUC_USER + ' item')
+        tag_item = tag_x.getTag('item', namespace=NS_MUC_USER)
         if not tag_item:
-            tag_item = tag_x.setTag(NS_MUC_USER + ' item')
+            tag_item = tag_x.setTag('item', namespace=NS_MUC_USER)
         
         tag_item.setAttr('affiliation', affiliation)

adventure/player.py

@@ -51 +51 @@
         pres = Movable.fix_presence(self, role, affiliation)
         
-        tag_x = pres.getTag(NS_MUC_USER + ' x')
+        tag_x = pres.getTag('x', namespace=NS_MUC_USER)
         
         if to_self:
-            tag_status = tag_x.getTag(NS_MUC_USER + ' status')
+            tag_status = tag_x.getTag('status', namespace=NS_MUC_USER)
             if not tag_status:
-                tag_status = tag_x.setTag(NS_MUC_USER + ' status')
+                tag_status = tag_x.setTag('status', namespace=NS_MUC_USER)
             tag_status.setAttr('code', 110)