Changeset 5501

Timestamp:

01/25/08 17:01:04 (10 months ago)

Author:

cho45

Message:

lang/ruby/misc/lig.rb:

Use user_id for identity and always show it.

Files:

• lang/ruby/misc/lig.rb (modified) (5 diffs)

lang/ruby/misc/lig.rb

@@ -104 +104 @@
                         @log.info "Client Option: #{@opts.join(", ")}"
                         @log.info "Client initialization is completed."
+
+                        @user_info = @lingr.get_user_info[:response]
                 end
 
@@ -139 +141 @@
 
                         if @channels[channel]
+                                @channels[channel][:observer].kill
                                 @lingr.exit_room(@channels[channel][:ticket])
                                 @channels.delete(channel)
@@ -155 +158 @@
                                                 :o_id     => res["occupant_id"],
                                                 :hcounter => 0,
+                                                :observer => Thread.current,
                                         }
                                         first = true
@@ -166 +170 @@
                                                                 next if m["id"].to_i <= info[:hcounter]
 
-                                                                nick = m["nickname"]
+                                                                u_id = m["user_id"]
                                                                 o_id = m["occupant_id"]
+                                                                nick = m["nickname"].gsub(/\s+/, "") + "^#{u_id || "anon"}"
 
                                                                 case m["type"]
@@ -179 +184 @@
                                                                         # TOOD
                                                                 when "system:enter"
-                                                                        @s << Message.new("#{nick}!#{o_id}@lingr.com", "JOIN", [chan]) unless nick == @nick
+                                                                        @s << Message.new("#{nick}!#{o_id}@lingr.com", "JOIN", [chan]) unless u_id == @user_info["user_id"]
                                                                 when "system:leave"
-                                                                        @s << Message.new("#{nick}!#{o_id}@lingr.com", "PART", [chan]) unless nick == @nick
+                                                                        @s << Message.new("#{nick}!#{o_id}@lingr.com", "PART", [chan]) unless u_id == @user_info["user_id"]
                                                                 when /system:/
                                                                         log m["text"]