Changeset 137

Timestamp:

04/26/08 16:07:44 (7 months ago)

Author:

xbright

Message:

Quelques petites choses sur le code

Files:

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

randomchat/randomchat.py

@@ -1 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-import config
-
-xmpp.NS_MUC+
+NS_MUC + 
-
-def db_connect(config):
-    if config.DB_MODULE == 'sqlite':
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-class Users:
@@ -26 +36 @@
-    def read_users(self):
-        cursor = self.db.cursor()
-
-
-
+
+
+
+
-            self.users_list[user[0]] = False
-
+
-        cursor.close()
-
@@ -37 +48 @@
-
-    def add_user(self, jid):
-"INSERT INTO randomchat (jid) VALUES (?)"
+'INSERT INTO randomchat (jid) VALUES (?)'
-        self.db.commit()
-        self.users_list[jid] = False
-
-    def remove_user(self, jid):
-"DELETE FROM randomchat WHERE jid=?"
+'DELETE FROM randomchat WHERE jid=?'
-        self.db.commit()
-        del self.users_list[jid]
@@ -49 +60 @@
-        user = jid.getStripped()
-        users = [jid for jid in self.users_list.keys() if self.users_list[jid]]
-
+
+
+
+
-        if (len(users) < 2 and user in users) or len(users) < 1:
-            return None
-        else:
-.
+_
-            while other == user:
-
+
+
-            return other
-
@@ -61 +76 @@
-        if not self.has_user(jid):
-            return
+
-        self.users_list[jid] = availability
-
@@ -72 +88 @@
-        self.jid = selfjid
-        self.con = con
-
-
+
+
+
+
+
+
+
-
-    def message_handler(self, con, msg):
@@ -79 +100 @@
-        frm_str = frm.getStripped()
-        room = msg.getTo().getNode()
-
-
-
+
+
+
+
+
-            return
-        if msg.getType() != 'groupchat':
-xmpp.
-
-xmpp.
+
+
+
-        for jid in self.rooms[room]:
-            message.setTo(jid)
-            if jid == frm:
-
+
+
-            else:
-
+
+
-            con.send(message)
-
@@ -99 +124 @@
-            if not self.users.has_key(jid.getStripped()):
-                continue
+
-            user = self.users[jid.getStripped()][room]
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    ])
-                ])
-            ])
+
-            self.con.send(destroy)
-            del self.users[jid.getStripped()]
+
-        del self.rooms[room]
-
-
-    def presence_handler(self, con, prs):
@@ -117 +152 @@
-        frm_str = frm.getStripped()
-        room = prs.getTo().getNode()
-+'@'+
+ + '@' + 
-        nick = prs.getTo().getResource()
+
-        if nick == '':
-
-
-
-
+
+
+
+
+
+
-            return
-
-        user = self.users[frm_str][room]
-
-        print user['nick']
-
+
+
+
-            return
-
-        if user['nick'] is None:
-
+
+
+
-            x = presence.getTag('x')
-
+
+
+
-            if len(self.rooms[room]) == 1:
-                presence.setTo(frm)
-
-
+
+
+
+
+
-                presence.setTo(self.rooms[room][0])
-
+
+
+
+
-            presence.setTo(frm)
-+'/'+
+ + '/' + 
-            x.addChild('status', attrs = {'code': '110'})
-
-
+
+
+
+
+
-            user['nick'] = nick
-            self.rooms[room].append(frm)
-
+
+
+
+
-            self.destroy_room(room)
-        
-
-    def invite(self, room, jid):
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.con.send(invite)
-
-    def invite_users(self, jid1, jid2):
-
+
+
-        self.rooms[room] = []
-        jid1_str = jid1.getStripped()
-        jid2_str = jid2.getStripped()
+
-        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)
-
+
+
-
-
@@ -183 +248 @@
-    def __init__(self, users, jid, pwd, server, port=5347):
-        self.users = users
-xmpp.
+
-        self.jid = jid
-        self.muc = MUC(jid, self.con)
+
-        if not self.con.connect():
-            raise Exception('Unable to connect to %s:%s' % (server, port))
@@ -191 +257 @@
-            raise Exception('Unable to authenticate as %s' % (jid))
-
-register the handlers 
+ Register XMPP handlers.
-        self.con.RegisterHandler('presence', self.presence_handler)
-
-
-
-
+
+
+
+
+
+
+
+
-        self.con.RegisterHandler('message', self.message_handler)
-
-=xmpp.
+ = 
-        b.PlugIn(self.con)
-
-
-
-
+
+
+
+
+
+
+
-
-        self.send_probes()
-
-
-        while 1:
-            self.con.Process(10)
-
-
-    def subscribe_handler(self, con, prs):
-        user = prs.getFrom().getStripped()
+
-        if not self.users.has_user(user):
-
-
+
+
+
+
-
-    def subscribed_handler(self, con, prs):
@@ -225 +299 @@
-
-    def unsubscribe_handler(self, con, prs):
-
+
+
-
-    def unsubscribed_handler(self, con, prs):
-        user = prs.getFrom().getStripped()
-        self.users.remove_user(user)
-
+
+
-
-    def presence_handler(self, con, prs):
-        if prs.getType() == 'error':
-            return
+
-        if prs.getTo().getNode() != '':
-            self.muc.presence_handler(con, prs)
-            return
+
-        if prs.getType() is None and prs.getShow() == 'chat':
-
+
+
-            self.users.update_availability(prs.getFrom().getStripped(), True)
-xmpp.Presence(frm = self.jid, to = prs.getFrom(), show = 
+Presence(frm=self.jid, to=prs.getFrom(), show=
-        else:
-            self.users.update_availability(prs.getFrom().getStripped(), False)
-            if prs.getType() is None:
-xmpp.Presence(frm = self.jid, to = 
+Presence(frm=self.jid, to=
-            else:
-xmpp.Presence(frm = self.jid, to = prs.getFrom(), typ = 'unavailable'))
-
+Presence(frm=self.jid, to=prs.getFrom(),
+
-
-    def message_handler(self, con, msg):
- != ''
+
-            self.muc.message_handler(con, msg)
-            return
+
-        if not self.init_chat(msg.getFrom()):
-
+
+
+
-
-    def init_chat(self, jid):
-        other_jid = self.users.get_chat_partner(jid)
-
+
+
-            return False
-
+
+
-        return True
-
-    def send_probes(self):
-        for jid in self.users.jid_list():
-xmpp.Presence(to = jid, frm = 
+Presence(to=jid, frm=
-
-