Changeset 128

Timestamp:

12/22/07 15:23:11 (3 years ago)

Author:

omega

Message:

* modif de la gestion des status
* possibilité de joindre plusieurs chat en même temps

Files:

• randomchat/randomchat.py (modified) (8 diffs)

randomchat/randomchat.py

@@ -58 +58 @@
             return other
 
-    def update_status(self, jid, show):
+    def update_availability(self, jid, availability):
         if not self.has_user(jid):
             return
-        if show == 'chat':
-            self.users_list[jid] = True
-        else:
-            self.users_list[jid] = False
-        print self.users_list
+        self.users_list[jid] = availability
 
     def jid_list(self):
@@ -84 +80 @@
         room = msg.getTo().getNode()
         room_jid = room+'@'+self.jid
-        if not frm_str in self.users or self.users[frm_str]['room'] != room or self.users[frm_str]['nick'] is None:
+        if not frm_str in self.users or not self.users[frm_str].has_key(room) or self.users[frm_str][room]['nick'] is None:
             con.send(xmpp.Error(msg, 'item-not-found'))
             return
@@ -94 +90 @@
             message.setTo(jid)
             if jid == frm:
-                message.setFrom(room_jid+'/'+self.users[frm_str]['nick'])
+                message.setFrom(room_jid+'/'+self.users[frm_str][room]['nick'])
             else:
                 message.setFrom(room_jid+'/'+config.NICK_GUEST)
@@ -101 +97 @@
     def destroy_room(self, room):
         for jid in self.rooms[room]:
-            user = self.users[jid.getStripped()]
+            if not self.users.has_key(jid.getStripped()):
+                continue
+            user = self.users[jid.getStripped()][room]
             destroy = xmpp.Presence(to = jid, frm = room+'@'+self.jid+'/'+user['nick'], typ = 'unavailable', payload = [ 
                 xmpp.Node('x', attrs={'xmlns': xmpp.NS_MUC+'#user'}, payload = [ 
@@ -121 +119 @@
         room_jid = room+'@'+self.jid
         nick = prs.getTo().getResource()
-        if not frm_str in self.users or self.users[frm_str]['room'] != room:
-            con.send(xmpp.Error(prs, 'item-not-found'))
-            return
         if nick == '':
             con.send(xmpp.Error(prs, 'bad-format'))
             return
-
-        user = self.users[frm_str]
+        if not self.users.has_key(frm_str) or not self.users[frm_str].has_key(room):
+            con.send(xmpp.Error(prs, 'item-not-found'))
+            return
+
+        user = self.users[frm_str][room]
 
         print user['nick']
@@ -170 +168 @@
         jid1_str = jid1.getStripped()
         jid2_str = jid2.getStripped()
-        self.users[jid1_str] = {'room': room, 'other': jid2_str, 'nick': None}
-        self.users[jid2_str] = {'room': room, 'other': jid1_str, 'nick': None}
+        if not self.users.has_key(jid1_str):
+            self.users[jid1_str]={}
+        self.users[jid1_str][room] = {'other': jid2_str, 'nick': None}
+        if not self.users.has_key(jid2_str):
+            self.users[jid2_str]={}
+        self.users[jid2_str][room] = {'other': jid1_str, 'nick': None}
         self.invite(room,jid1)
         self.invite(room,jid2)
@@ -197 +199 @@
         self.con.RegisterHandler('message', self.message_handler)
 
+        b=xmpp.browser.Browser()
+        b.PlugIn(self.con)
+        items=[]
+        info={'ids':[{'category': 'conference', 'type': 'text', 'name': 'Random Chat'}], 'features':[xmpp.NS_REGISTER, xmpp.NS_DISCO_INFO, xmpp.NS_DISCO_ITEMS]}
+        b.setDiscoHandler({'items':items,'info':info})
+
+
         self.send_probes()
 
@@ -227 +236 @@
             self.muc.presence_handler(con, prs)
             return
-        self.users.update_status(prs.getFrom().getStripped(), prs.getShow())
+        if prs.getType() is None and prs.getShow() == 'chat':
+            #available to chat
+            self.users.update_availability(prs.getFrom().getStripped(), True)
+            con.send(xmpp.Presence(frm = self.jid, to = prs.getFrom(), show = 'chat'))
+        else:
+            self.users.update_availability(prs.getFrom().getStripped(), False)
+            if prs.getType() is None:
+                con.send(xmpp.Presence(frm = self.jid, to = prs.getFrom()))
+            else:
+                con.send(xmpp.Presence(frm = self.jid, to = prs.getFrom(), typ = 'unavailable'))