Changeset 7

Timestamp:

01/26/04 20:28:52 (5 years ago)

Author:

jajcus

Message:

- NICK and QUIT server commands support
- enter/leave/change_nick messages

Files:

• trunk/jjigw.py (modified) (9 diffs)

trunk/jjigw.py

@@ -121 +121 @@
-    def join_channel(self,channel):
-        self.channels[normalize(channel.name)]=channel
+        channel.sync_user(self)
-
-    def leave_channel(self,channel):
-        try:
-            del self.channels[normalize(channel.name)]
+            channel.sync_user(self)
-        except KeyError:
-            pass
+
+    def leave_all(self):
+        for channel in self.channels.values():
+            self.leave_channel(channel)
+
+    def sync_all(self):
+        for channel in self.channels.values():
+            channel.sync_user(self)
-
-    def whoreply(self,params):
@@ -136 +146 @@
-        fullname=rest.split(None,1)[1]
-        self.debug("Channel: %r" % (channel,))
-
+ and channel
-            channel=self.session.channels.get(normalize(channel))
-            if not channel:
-                self.debug("Ignoring WHO reply: %r - unknown channel" % (params,))
-                return
+        else:
+            channel=None
-        self.nick=nick
-        self.host=host
-        self.user=user
-!="*"
+
-            self.debug("Channel: %r" % (channel,))
-            self.join_channel(channel)
-            if self not in channel.users:
-                self.debug("Adding user %r to channel %r" % (self.nick,channel.name))
-                channel.users.append(self)
-            if "@" in flags:
-                channel.set_mode("o",self)
@@ -161 +170 @@
-        else:
-            self.mode["a"]=0
+        if channel:
+            channel.sync_user(self)
-        
-    def debug(self,msg):
@@ -180 +191 @@
-        self.modes={}
-        self.users=[]
+        self.muc=0
+
+    def sync_user(self,user):
+        if user.channels.has_key(normalize(self.name)):
+            if user not in self.users:
+                self.users.append(user)
+        else:
+            if user in self.users:
+                self.users.remove(user)
+                self.send_notice_message(u"%s has quit" 
+                        % (unicode(user.nick,self.encoding,"replace"),))
+        if self.state:
+            p=self.get_user_presence(user)
+            self.session.component.send(p)
+
+    def send_notice_message(self,msg):
+        if not self.state or self.muc:
+            return
+        m=Message(fr=self.room_jid.bare(),to=self.session.jid,type="groupchat",body=msg)
+        self.session.component.send(m)
-
-    def join(self,stanza):
@@ -207 +238 @@
-        p=Presence(type="unavailable",fr=stanza.get_to(),to=stanza.get_from(),status=status)
-        self.session.component.send(p)
+        for u in self.users:
+            u.leave_room(self)
+        self.state=None
-
-    def prefix_to_jid(self,prefix):
@@ -218 +252 @@
-
-    def get_user_presence(self,user):
-
+self.state and 
-            p=Presence(fr=self.nick_to_jid(user.nick),to=self.session.jid)
-        else:
-            p=Presence(type="unavailable",fr=self.nick_to_jid(user.nick),to=self.session.jid)
-        return p
+
+    def nick_changed(self,oldnick,user):
+        p_aval=self.get_user_presence(user)
+        p_unaval=p_aval.copy()
+        p_unaval.set_type("unavailable")
+        p_unaval.set_show(None)
+        p_unaval.set_status(None)
+        p_unaval.set_from(self.nick_to_jid(oldnick))
+        self.session.component.send(p_unaval)
+        self.session.component.send(p_aval)
+        self.send_notice_message(u"%s is now known as %s" 
+                % (unicode(oldnick,self.encoding,"replace"),
+                    unicode(user.nick,self.encoding,"replace")))
-        
-    def set_mode(self,mode,arg):
@@ -258 +305 @@
-                        to=self.stanza.get_from())
-                self.session.component.send(p)
-sync
+joined
-                self.stanza=None
-                self.session.send("WHO %s" % (self.name,))
-        else:
-            user=self.session.get_user(prefix)
-            if user not in self.users:
-                self.users.append(user)
-            user.join_channel(self)
+            self.send_notice_message(u"%s has joined" 
+                    % (unicode(user.nick,self.encoding,"replace"),))
-            self.session.send("WHO %s" % (user.nick,))
-            self.session.component.send(self.get_user_presence(user))
-
-    def irc_cmd_PART(self,prefix,command,params):
@@ -276 +322 @@
-            pass
-        user.leave_channel(self)
-
+
+
-
-    def irc_cmd_PRIVMSG(self,prefix,command,params):
@@ -515 +562 @@
-        self.send("PONG %s" % (params[0],))
-
+    def irc_cmd_NICK(self,prefix,command,params):
+        if len(params)<1:
+            return
+        user=self.get_user(prefix)
+        if params[0]!=user.nick:
+            oldnick=user.nick
+            self.rename_user(user,params[0])
+            for ch in user.channels.values():
+                ch.nick_changed(oldnick,user)
+
+    def irc_cmd_QUIT(self,prefix,command,params):
+        user=self.get_user(prefix)
+        user.leave_all()
+        self.unregister_user(user)
+
-    def irc_cmd_352(self,prefix,command,params):
-        self.debug("WHO reply received")