Changeset 116

Timestamp:

10/14/07 18:47:28 (2 years ago)

Author:

elghinn

Message:

 

Location:

adventure

Files:

• adventuremuc.py (modified) (1 diff)
• world.py (modified) (2 diffs)

adventure/adventuremuc.py

@@ -98 +98 @@
             self.component.send(answer)
         else:
-            world.handle_presence(self,pres)
+            world.handle_presence(self, pres)
         return True
 

adventure/world.py

@@ -103 +103 @@
         if pres.getType() == 'subscribe':
             msg = Message(pres.getFrom())
-            msg.type = 'normal'
-            msg.subject = 'Adventure component help'
-            msg.body = 'You don\'t need to subscribe to my presence. Simply use your Jabber client to join the MUC or conference at #{pres.to.strip}'
-            self.send(None, msg)
+            msg.setType('normal')
+            msg.setSubject('Adventure component help')
+            msg.setBody = ('You don\'t need to subscribe to my presence. Simply use your Jabber client to join the MUC or conference at %s' % pres.getTo())
+            self.send(pres.getTo(), msg)
             return True
 
@@ -124 +124 @@
 
         # Either nick-collission or empty nick
-        if player and pres.getFrom() != player.jid and len(pres.getTo().getResource()):
+        if player and pres.getFrom() != player.jid or len(pres.getTo().getResource()) < 2:
             answer = pres.answer
             answer.setType('error')
-            #if len(pres.getTo().getResource()):
+            #if len(pres.getTo().getResource()) > 1:
             #    answer.add(Jabber::Error::new('conflict', 'Nickname already used'))
             #else: