Changeset 141

Timestamp:

04/26/08 17:02:44 (2 years ago)

Author:

thib

Message:

Je sais pas coder

Location:

adventure

Files:

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

adventure/movable.py

@@ -84 +84 @@
             oldplace.player_leaved(self)
                               
-    def fix_presence(self, role=None, affiliation=None, to_self=False):
+    def fix_presence(self, role=None, affiliation=None):
         """
         Fix presence: Remove double presence tag and set
@@ -90 +90 @@
         """
         pres = Presence(node=self.presence)
+        
         tag_x = pres.getTag(NS_MUC_USER + ' x')
-        
         if not tag_x:
             tag_x = pres.setTag(NS_MUC_USER + ' x')
+        
         tag_item = tag_x.getTag(NS_MUC_USER + ' item')
         if not tag_item:
@@ -101 +102 @@
         tag_item.setAttr('role', role)
         
-        if to_self:
-            tag_status = tag_x.getTag(NS_MUC_USER + ' status')
-            if not tag_status:
-                tag_status = tag_x.setTag(NS_MUC_USER + ' status')
-            tag_status.setAttr('code', 110)
         return pres
 

adventure/player.py

@@ -48 +48 @@
         self.world.send(fromresource, pres)
                               
-    def fix_presence(self, role='visitor', affiliation='none'):
-        return Movable.fix_presence(self, role, affiliation)
+    def fix_presence(self, role='visitor', affiliation='none', to_self=False):
+        pres = Movable.fix_presence(self, role, affiliation)
+        
+        tag_x = pres.getTag(NS_MUC_USER + ' x')
+        
+        if to_self:
+            tag_status = tag_x.getTag(NS_MUC_USER + ' status')
+            if not tag_status:
+                tag_status = tag_x.setTag(NS_MUC_USER + ' status')
+            tag_status.setAttr('code', 110)
+        
+        return pres