net-irc 0.0.5 → 0.0.6

data/examples/wig.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: UTF-8 -*-
 =begin
 
 # wig.rb
@@ -21,7 +22,7 @@ Configuration example for Tiarra ( http://coderepos.org/share/wiki/Tiarra ).
 
 	wassr {
 		host: localhost
-		port: 16668
+		port: 16670
 		name: username@example.com athack jabber=username@example.com:jabberpasswd tid=10 ratio=10:3:5
 		password: password on Wassr
 		in-encoding: utf8
@@ -181,8 +182,8 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		log "Client Options: #{@opts.inspect}"
 		@log.info "Client Options: #{@opts.inspect}"
 
-		timeline_ratio, friends_ratio, channel_ratio = (@opts["ratio"] || "10:3:5").split(":").map {|ratio| ratio.to_i }
-		footing = (timeline_ratio + friends_ratio + channel_ratio).to_f
+		@ratio  = Struct.new(:timeline, :friends, :channel).new(*(@opts["ratio"] || "10:3:5").split(":").map {|ratio| ratio.to_f })
+		@footing = @ratio.inject {|r,i| r + i }
 
 		@timeline = []
 		@check_friends_thread = Thread.start do
@@ -197,7 +198,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 						@log.error "\t#{l}"
 					end
 				end
-				sleep freq(friends_ratio / footing)
+				sleep freq(@ratio[:friends] / @footing)
 			end
 		end
 
@@ -217,7 +218,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 						@log.error "\t#{l}"
 					end
 				end
-				sleep freq(timeline_ratio / footing)
+				sleep freq(@ratio[:timeline] / @footing)
 			end
 		end
 
@@ -236,7 +237,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 						@log.error "\t#{l}"
 					end
 				end
-				sleep freq(channel_ratio / footing)
+				sleep freq(@ratio[:channel] / @footing)
 			end
 		end
 	end
@@ -257,23 +258,26 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		begin
 			if target =~ /^#(.+)/
 				channel = Regexp.last_match[1]
-				if @opts.key?("alwaysim") && @im && @im.connected? # in jabber mode, using jabber post
+				reply   = message[/\s+>(.+)$/, 1]
+				message = Iconv.iconv("UTF-7", "UTF-8", message).join if @utf7
+				if !reply && @opts.key?("alwaysim") && @im && @im.connected? # in jabber mode, using jabber post
 					message = "##{channel} #{message}" unless "##{channel}" == main_channel
 					ret = @im.deliver(jabber_bot_id, message)
 					post "#{nick}!#{nick}@#{api_base.host}", TOPIC, channel, untinyurl(message)
 				else
 					if "##{channel}" == main_channel
-						ret = api("statuses/update", {"status" => message})
+						rid = rid_for(reply) if reply
+						ret = api("statuses/update", {"status" => message, "reply_status_rid" => rid})
 					else
 						ret = api("channel_message/update", {"name_en" => channel, "body" => message})
 					end
+					log "Status Updated via API"
 				end
 			else
 				# direct message
 				ret = api("direct_messages/new", {"user" => target, "text" => message})
 			end
 			raise ApiFailed, "API failed" unless ret
-			log "Status Updated" unless @im && @im.connected?
 		rescue => e
 			@log.error [retry_count, e.inspect].inspect
 			if retry_count > 0
@@ -289,6 +293,14 @@ class WassrIrcGateway < Net::IRC::Server::Session
 	def on_ctcp(target, message)
 		_, command, *args = message.split(/\s+/)
 		case command
+		when "utf7"
+			begin
+				require "iconv"
+				@utf7 = !@utf7
+				log "utf7 mode: #{@utf7 ? 'on' : 'off'}"
+			rescue LoadError => e
+				log "Can't load iconv."
+			end
 		when "list"
 			nick = args[0]
 			@log.debug([ nick, message ])
@@ -298,41 +310,49 @@ class WassrIrcGateway < Net::IRC::Server::Session
 			end
 
 			unless res
-				post nil, ERR_NOSUCHNICK, nick, "No such nick/channel"
+				post server_name, ERR_NOSUCHNICK, nick, "No such nick/channel"
 			end
 		when "fav"
-			tid = args[0]
-			st  = @tmap[tid]
-			if st
-				if @im && @im.connected?
-					# IM のときはいろいろめんどうなことする
-					nick, count = *st
-					pos = @counters[nick] - count
-					@log.debug "%p %s %d/%d => %d" % [
-						st,
-						nick,
-						count,
-						@counters[nick],
-						pos
-					]
-					res = api("statuses/user_timeline", { "id" => nick })[pos]
-					id = res["rid"]
-				else
-					id = st["id"] || st["rid"]
+			target = args[0]
+			st  = @tmap[target]
+			id  = rid_for(target)
+			if st || id
+				unless id
+					if @im && @im.connected?
+						# IM のときはいろいろめんどうなことする
+						nick, count = *st
+						pos = @counters[nick] - count
+						@log.debug "%p %s %d/%d => %d" % [
+							st,
+							nick,
+							count,
+							@counters[nick],
+							pos
+						]
+						res = api("statuses/user_timeline", { "id" => nick })
+						raise ApiFailed, "#{nick} may be private mode" if res.empty?
+						if res[pos]
+							id = res[pos]["rid"]
+						else
+							raise ApiFailed, "#{pos} of #{nick} is not found."
+						end
+					else
+						id = st["id"] || st["rid"]
+					end
 				end
 				res = api("favorites/create/#{id}", {})
-				post nil, NOTICE, main_channel, "Fav: #{res["screen_name"]}: #{res["text"]}"
+				post server_name, NOTICE, main_channel, "Fav: #{res["screen_name"]}: #{res["text"]}"
 			else
-				post nil, NOTICE, main_channel, "No such id #{tid}"
+				post server_name, NOTICE, main_channel, "No such id or status #{target}"
 			end
 		when "link"
 			tid = args[0]
 			st  = @tmap[tid]
 			if st
 				st["link"] = (api_base + "/#{st["user"]["screen_name"]}/statuses/#{st["id"]}").to_s unless st["link"]
-				post nil, NOTICE, main_channel, st["link"]
+				post server_name, NOTICE, main_channel, st["link"]
 			else
-				post nil, NOTICE, main_channel, "No such id #{tid}"
+				post server_name, NOTICE, main_channel, "No such id #{tid}"
 			end
 		end
 	rescue ApiFailed => e
@@ -343,12 +363,12 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		nick = m.params[0]
 		f = (@friends || []).find {|i| i["screen_name"] == nick }
 		if f
-			post nil, RPL_WHOISUSER,   @nick, nick, nick, api_base.host, "*", "#{f["name"]} / #{f["description"]}"
-			post nil, RPL_WHOISSERVER, @nick, nick, api_base.host, api_base.to_s
-			post nil, RPL_WHOISIDLE,   @nick, nick, "0", "seconds idle"
-			post nil, RPL_ENDOFWHOIS,  @nick, nick, "End of WHOIS list"
+			post server_name, RPL_WHOISUSER,   @nick, nick, nick, api_base.host, "*", "#{f["name"]} / #{f["description"]}"
+			post server_name, RPL_WHOISSERVER, @nick, nick, api_base.host, api_base.to_s
+			post server_name, RPL_WHOISIDLE,   @nick, nick, "0", "seconds idle"
+			post server_name, RPL_ENDOFWHOIS,  @nick, nick, "End of WHOIS list"
 		else
-			post nil, ERR_NOSUCHNICK, nick, "No such nick/channel"
+			post server_name, ERR_NOSUCHNICK, nick, "No such nick/channel"
 		end
 	end
 
@@ -356,10 +376,15 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		channels = m.params[0].split(/\s*,\s*/)
 		channels.each do |channel|
 			next if channel == main_channel
-			@channels[channel] = {
-				:read => []
-			}
-			post "#{@nick}!#{@nick}@#{api_base.host}", JOIN, channel
+			res = api("channel/exists", { "name_en" => channel.sub(/^#/, "") })
+			if res["exists"]
+				@channels[channel] = {
+					:read => []
+				}
+				post "#{@nick}!#{@nick}@#{api_base.host}", JOIN, channel
+			else
+				post server_name, ERR_NOSUCHNICK, channel, "No such nick/channel"
+			end
 		end
 	end
 
@@ -381,20 +406,20 @@ class WassrIrcGateway < Net::IRC::Server::Session
 				user = nick = f["screen_name"]
 				host = serv = api_base.host
 				real = f["name"]
-				post nil, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
+				post server_name, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
 			end
-			post nil, RPL_ENDOFWHO, @nick, channel
+			post server_name, RPL_ENDOFWHO, @nick, channel
 		when @groups.key?(channel)
 			@groups[channel].each do |name|
 				f = @friends.find {|i| i["screen_name"] == name }
 				user = nick = f["screen_name"]
 				host = serv = api_base.host
 				real = f["name"]
-				post nil, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
+				post server_name, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
 			end
-			post nil, RPL_ENDOFWHO, @nick, channel
+			post server_name, RPL_ENDOFWHO, @nick, channel
 		else
-			post nil, ERR_NOSUCHNICK, @nick, nick, "No such nick/channel"
+			post server_name, ERR_NOSUCHNICK, @nick, nick, "No such nick/channel"
 		end
 	end
 
@@ -455,6 +480,14 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		mesg = s["text"]
 		@log.debug(mesg)
 
+		begin
+			require 'iconv'
+			mesg    = mesg.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
+			mesg    = "[utf7]: #{mesg}" if body =~ /[^a-z0-9\s]/i
+		rescue LoadError
+		rescue Iconv::IllegalSequence
+		end
+
 		# added @user in no use @user reply message (Wassr only)
 		if s.has_key?("reply_status_url") and s["reply_status_url"] and s["text"] !~ /^@.*/ and %r{([^/]+)/statuses/[^/]+}.match(s["reply_status_url"])
 			reply_user_id = $1
@@ -490,11 +523,16 @@ class WassrIrcGateway < Net::IRC::Server::Session
 	def check_friends
 		first = true unless @friends
 		@friends ||= []
-		friends = api("statuses/friends")
+		friends = []
+		1.upto(5) do |i|
+			f = api("statuses/friends", {"page" => i.to_s})
+			friends += f
+			break if f.length < 100
+		end
 		if first && !@opts.key?("athack")
 			@friends = friends
-			post nil, RPL_NAMREPLY,   @nick, "=", main_channel, @friends.map{|i| "@#{i["screen_name"]}" }.join(" ")
-			post nil, RPL_ENDOFNAMES, @nick, main_channel, "End of NAMES list"
+			post server_name, RPL_NAMREPLY,   @nick, "=", main_channel, @friends.map{|i| "@#{i["screen_name"]}" }.join(" ")
+			post server_name, RPL_ENDOFNAMES, @nick, main_channel, "End of NAMES list"
 		else
 			prv_friends = @friends.map {|i| i["screen_name"] }
 			now_friends = friends.map {|i| i["screen_name"] }
@@ -535,6 +573,13 @@ class WassrIrcGateway < Net::IRC::Server::Session
 							if Regexp.last_match
 								nick, id = Regexp.last_match.captures
 								body = CGI.unescapeHTML(body)
+								begin
+									require 'iconv'
+									body    = body.sub(/^.+ > |^.+/) {|str| Iconv.iconv("UTF-8", "UTF-7", str).join }
+									body    = "[utf7]: #{body}" if body =~ /[^a-z0-9\s]/i
+								rescue LoadError
+								rescue Iconv::IllegalSequence
+								end
 
 								case
 								when nick == "投稿完了"
@@ -582,7 +627,7 @@ class WassrIrcGateway < Net::IRC::Server::Session
 
 		uri = api_base.dup
 		uri.path  = "/#{path}.json"
-		uri.query = q.inject([]) {|r,(k,v)| v.inject(r) {|r,i| r << "#{k}=#{URI.escape(i, /[^-.!~*'()\w]/n)}" } }.join("&")
+		uri.query = q.inject([]) {|r,(k,v)| v ? r << "#{k}=#{URI.escape(v, /[^-.!~*'()\w]/n)}" : r }.join("&")
 
 
 		req = nil
@@ -642,6 +687,18 @@ class WassrIrcGateway < Net::IRC::Server::Session
 		}
 	end
 
+	# return rid of most recent matched status with text
+	def rid_for(text)
+		target = Regexp.new(Regexp.quote(text.strip), "i")
+		status = api("statuses/friends_timeline").find {|i|
+			next false if i["user_login_id"] == @nick # 自分は除外
+			i["text"] =~ target
+		}
+
+		@log.debug "Looking up status contains #{text.inspect} -> #{status.inspect}"
+		status ? status["rid"] : nil
+	end
+
 	class TypableMap < Hash
 		Roma = %w|k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q|.unshift("").map {|consonant|
 			case

data/lib/net/irc.rb

@@ -9,7 +9,7 @@ require "monitor"
 module Net; end
 
 module Net::IRC
-	VERSION = "0.0.5"
+	VERSION = "0.0.6"
 	class IRCException < StandardError; end
 
 	require "net/irc/constants"

data/lib/net/irc/constants.rb

@@ -209,6 +209,6 @@ module Net::IRC::Constants # :nodoc:
 end
 
 Net::IRC::COMMANDS = Net::IRC::Constants.constants.inject({}) {|r,i| # :nodoc:
-	r.update(Net::IRC::Constants.const_get(i) => i)
+	r.update(Net::IRC::Constants.const_get(i).to_s => i.to_s)
 }
 

data/lib/net/irc/message.rb

@@ -82,7 +82,7 @@ class Net::IRC::Message
 	# If the message is CTCP, return true.
 	def ctcp?
 		message = @params[1]
-		message[0] == 1 && message[message.length-1] == 1
+		message[0] == "\01"[0] && message[message.length-1] == "\01"[0]
 	end
 
 	def inspect

data/lib/net/irc/pattern.rb

@@ -1,4 +1,4 @@
-
+# coding: ASCII-8BIT
 module Net::IRC::PATTERN # :nodoc:
 	# letter     =  %x41-5A / %x61-7A       ; A-Z / a-z
 	# digit      =  %x30-39                 ; 0-9
@@ -56,7 +56,7 @@ module Net::IRC::PATTERN # :nodoc:
 	#            =/ 14( SPACE middle ) [ SPACE [ ":" ] trailing ]
 	MIDDLE = "[#{NOSPCRLFCL}][:#{NOSPCRLFCL}]*"
 	TRAILING = "[: #{NOSPCRLFCL}]*"
-	PARAMS = "(?:((?: #{MIDDLE}){0,14})(?: :(#{TRAILING}))?|((?: #{MIDDLE}){14})(?::?)?(#{TRAILING}))"
+	PARAMS = "(?:((?: #{MIDDLE}){0,14})(?: :(#{TRAILING}))?|((?: #{MIDDLE}){14}):?(#{TRAILING}))"
 
 	# crlf       =  %x0D %x0A   ; "carriage return" "linefeed"
 	# message    =  [ ":" prefix SPACE ] command [ params ] crlf

data/spec/channel_manager_spec.rb

@@ -56,6 +56,7 @@ describe Net::IRC, "server and client" do
 			@server.start
 		end
 
+		Thread.pass
 		true until @server.instance_variable_get(:@serv)
 
 		@port = @server.instance_variable_get(:@serv).addr[1]
@@ -70,6 +71,9 @@ describe Net::IRC, "server and client" do
 			})
 			@client.start
 		end
+
+		Thread.pass
+		true until @client
 	end
 
 	server_q = ChannelManagerTestServerSession.testq
@@ -79,6 +83,7 @@ describe Net::IRC, "server and client" do
 		client = @client
 		client.instance_variable_set(:@prefix, Prefix.new("foonick!foouser@localhost"))
 
+		true until ChannelManagerTestServerSession.instance
 		ChannelManagerTestServerSession.instance.instance_eval do
 			Thread.exclusive do
 				post client.prefix,          JOIN,   "#test"

data/spec/net-irc_spec.rb

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+# ENCODING=ASCII-8BIT
+# :vim:encoding=utf-8:
+# ↑ どうするのが正解?
 
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"
@@ -229,18 +232,19 @@ describe Net::IRC, "server and client" do
 		@server, @client = nil, nil
 
 		Thread.abort_on_exception = true
-		Thread.start do
+		@tserver = Thread.start do
 			@server = Net::IRC::Server.new("localhost", @port, TestServerSession, {
 				:logger => Logger.new(nil),
 			})
 			@server.start
 		end
 
+		Thread.pass
 		true until @server.instance_variable_get(:@serv)
 
 		@port = @server.instance_variable_get(:@serv).addr[1]
 
-		Thread.start do
+		@tclient = Thread.start do
 			@client = TestClient.new("localhost", @port, {
 				:nick   => "foonick",
 				:user   => "foouser",
@@ -250,6 +254,9 @@ describe Net::IRC, "server and client" do
 			})
 			@client.start
 		end
+
+		Thread.pass
+		true until @client
 	end
 
 	server_q = TestServerSession.testq
@@ -285,41 +292,20 @@ describe Net::IRC, "server and client" do
 				post nil,      NOTICE, "#test", "sep1"
 			end
 		end
+		Thread.pass
 		true until client_q.pop.to_s == "NOTICE #test sep1\r\n"
 		client.prefix.should == "foonick"
 	end
 
-	it "should destroy closed session" do
-		oldclient = @client
-		@client.finish
-
-		Thread.start do
-			@client = TestClient.new("localhost", @port, {
-				:nick   => "foonick",
-				:user   => "foouser",
-				:real   => "foo real name",
-				:pass   => "foopass",
-				:logger => Logger.new(nil),
-			})
-			@client.start
-		end
-
-		Thread.pass
-		true while @client == oldclient
-
-		c = @client.instance_variable_get(:@channels)
-		TestServerSession.instance.instance_eval do
-			Thread.exclusive do
-				post nil,                    NOTICE, "#test", "sep1"
-			end
-		end
-
-		true until client_q.pop.to_s == "NOTICE #test sep1\r\n"
-	end
+#	it "should destroy closed session" do
+#	end
 
 	after :all do
 		@server.finish
 		@client.finish
+		@tserver.kill
+		@tclient.kill
+		@server = @client = @tserver = @tclient = nil
 	end
 end