client.rb in net-irc-0.0.5

- old
+ new

@@ -4,14 +4,15 @@
 
 	attr_reader :host, :port, :opts
 	attr_reader :prefix, :channels
 
 	def initialize(host, port, opts={})
-		@host = host
-		@port = port
-		@opts = OpenStruct.new(opts)
-		@log  = @opts.logger || Logger.new($stdout)
+		@host          = host
+		@port          = port
+		@opts          = OpenStruct.new(opts)
+		@log           = @opts.logger || Logger.new($stdout)
+		@server_config = Message::ServerConfig.new
 		@channels = {
 #			"#channel" => {
 #				:modes => [],
 #				:users => [],
 #			}
@@ -19,10 +20,12 @@
 		@channels.extend(MonitorMixin)
 	end
 
 	# Connect to server and start loop.
 	def start
+		# reset config
+		@server_config = Message::ServerConfig.new
 		@socket = TCPSocket.open(@host, @port)
 		on_connected
 		post PASS, @opts.pass if @opts.pass
 		post NICK, @opts.nick
 		post USER, @opts.user, "0", "*", @opts.real
@@ -64,137 +67,18 @@
 	# This sets @prefix from the message.
 	def on_rpl_welcome(m)
 		@prefix = Prefix.new(m[1][/\S+$/])
 	end
 
+	# Default RPL_ISUPPORT callback.
+	# This detects server's configurations.
+	def on_rpl_isupport(m)
+		@server_config.set(m)
+	end
+
 	# Default PING callback. Response PONG.
 	def on_ping(m)
 		post PONG, @prefix ? @prefix.nick : ""
-	end
-
-	# For managing channel
-	def on_rpl_namreply(m)
-		type    = m[1]
-		channel = m[2]
-		init_channel(channel)
-
-		@channels.synchronize do
-			m[3].split(/\s+/).each do |u|
-				_, mode, nick = *u.match(/^([@+]?)(.+)/)
-
-				@channels[channel][:users] << nick
-				@channels[channel][:users].uniq!
-
-				case mode
-				when "@" # channel operator
-					@channels[channel][:modes] << [:o, nick]
-				when "+" # voiced (under moderating mode)
-					@channels[channel][:modes] << [:v, nick]
-				end
-			end
-
-			case type
-			when "@" # secret
-				@channels[channel][:modes] << [:s, nil]
-			when "*" # private
-				@channels[channel][:modes] << [:p, nil]
-			when "=" # public
-			end
-
-			@channels[channel][:modes].uniq!
-		end
-	end
-
-	# For managing channel
-	def on_part(m)
-		nick    = m.prefix.nick
-		channel = m[0]
-		init_channel(channel)
-
-		@channels.synchronize do
-			info = @channels[channel]
-			if info
-				info[:users].delete(nick)
-				info[:modes].delete_if {|u|
-					u[1] == nick
-				}
-			end
-		end
-	end
-
-	# For managing channel
-	def on_quit(m)
-		nick = m.prefix.nick
-
-		@channels.synchronize do
-			@channels.each do |channel, info|
-				info[:users].delete(nick)
-				info[:modes].delete_if {|u|
-					u[1] == nick
-				}
-			end
-		end
-	end
-
-	# For managing channel
-	def on_kick(m)
-		users = m[1].split(/,/)
-
-		@channels.synchronize do
-			m[0].split(/,/).each do |chan|
-				init_channel(chan)
-				info = @channels[chan]
-				if info
-					users.each do |nick|
-						info[:users].delete(nick)
-						info[:modes].delete_if {|u|
-							u[1] == nick
-						}
-					end
-				end
-			end
-		end
-	end
-
-	# For managing channel
-	def on_join(m)
-		nick    = m.prefix.nick
-		channel = m[0]
-
-		@channels.synchronize do
-			init_channel(channel)
-
-			@channels[channel][:users] << nick
-			@channels[channel][:users].uniq!
-		end
-	end
-
-	# For managing channel
-	def on_mode(m)
-		channel = m[0]
-		@channels.synchronize do
-			init_channel(channel)
-
-			mode = Message::ModeParser::RFC1459::Channel.parse(m)
-			mode[:negative].each do |m|
-				@channels[channel][:modes].delete(m)
-			end
-
-			mode[:positive].each do |m|
-				@channels[channel][:modes] << m
-			end
-
-			@channels[channel][:modes].uniq!
-			[mode[:negative], mode[:positive]]
-		end
-	end
-
-	# For managing channel
-	def init_channel(channel)
-		@channels[channel] ||= {
-			:modes => [],
-			:users => [],
-		}
 	end
 
 	# Do nothing.
 	# This is for avoiding error on calling super.
 	# So you can always call super at subclass.