net-irc 0.0.1 → 0.0.2

data/examples/tig.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -Ku
+#!/usr/bin/env ruby
 =begin
 
 # tig.rb
@@ -6,33 +6,53 @@
 Ruby version of TwitterIrcGateway
 ( http://www.misuzilla.org/dist/net/twitterircgateway/ )
 
+## Launch
 
-## Client opts
+	$ ruby tig.rb # daemonized
+
+If you want to help:
+
+	$ ruby tig.rb --help
+
+## Configuration
 
 Options specified by after irc realname.
 
-Configuration example for tiarra ( http://coderepos.org/share/wiki/Tiarra ).
+Configuration example for Tiarra ( http://coderepos.org/share/wiki/Tiarra ).
 
 	twitter {
 		host: localhost
 		port: 16668
 		name: username@example.com athack
-		password: password on twitter
+		password: password on Twitter
 		in-encoding: utf8
 		out-encoding: utf8
 	}
 
 ### athack
 
-If `athack` client options specified,
+If `athack` client option specified,
 all nick in join message is leading with @.
 
-So if you complemente nicks (ex. irssi),
-it's good for twitter like reply command (@nick).
+So if you complemente nicks (ex. Irssi),
+it's good for Twitter like reply command (@nick).
 
 In this case, you will see torrent of join messages after connected,
 because NAMES list can't send @ leading nick (it interpreted op.)
 
+### jabber=<jid>:<pass>
+
+If `jabber=<jid>:<pass>` option specified,
+use jabber to get friends timeline.
+
+You must setup im notifing settings in the site and
+install 'xmpp4r-simple' gem.
+
+	$ sudo gem install xmpp4r-simple
+
+Be careful for managing password.
+
+
 ## Licence
 
 Ruby's by cho45
@@ -55,6 +75,7 @@ require "logger"
 require "yaml"
 require "pathname"
 require "digest/md5"
+require "cgi"
 
 Net::HTTP.version_1_2
 
@@ -72,7 +93,15 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	end
 
 	def api_base
-		@api_base ||= URI("http://twitter.com/")
+		URI("http://twitter.com/")
+	end
+
+	def api_source
+		"tigrb"
+	end
+
+	def jabber_bot_id
+		"twitter@twitter.com"
 	end
 
 	class ApiFailed < StandardError; end
@@ -81,15 +110,38 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		super
 		@groups = {}
 		@channels = [] # join channels (groups)
+		@user_agent = "#{self.class}/#{server_version} (tig.rb)"
 		@config = Pathname.new(ENV["HOME"]) + ".tig"
 		load_config
 	end
 
 	def on_user(m)
 		super
-		post @mask, JOIN, main_channel
-		@real, @opts = @real.split(/\s/)
+		post @prefix, JOIN, main_channel
+		post server_name, MODE, main_channel, "+o", @prefix.nick
+
+		@real, *@opts = @real.split(/\s+/)
 		@opts ||= []
+
+		jabber = @opts.find {|i| i =~ /^jabber=(\S+?):(\S+)/ }
+		if jabber
+			jid, pass = Regexp.last_match.captures
+			jabber.replace("jabber=#{jid}:********")
+			if jabber_bot_id
+				begin
+					require "xmpp4r-simple"
+					start_jabber(jid, pass)
+				rescue LoadError
+					log "Failed to start Jabber."
+					log "Installl 'xmpp4r-simple' gem or check your id/pass."
+					finish
+				end
+			else
+				jabber = nil
+				log "This gateway does not support Jabber bot."
+			end
+		end
+
 		@log.info "Client Options: #{@opts.inspect}"
 
 		@timeline = []
@@ -100,13 +152,18 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 				rescue ApiFailed => e
 					@log.error e.inspect
 				rescue Exception => e
-					puts e
-					puts e.backtrace
+					@log.error e.inspect
+					e.backtrace.each do |l|
+						@log.error "\t#{l}"
+					end
 				end
 				sleep 10 * 60
 			end
 		end
 		sleep 3
+
+		return if jabber
+
 		Thread.start do
 			loop do
 				begin
@@ -115,8 +172,10 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 				rescue ApiFailed => e
 					@log.error e.inspect
 				rescue Exception => e
-					puts e
-					puts e.backtrace
+					@log.error e.inspect
+					e.backtrace.each do |l|
+						@log.error "\t#{l}"
+					end
 				end
 				sleep 90
 			end
@@ -129,10 +188,10 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		target, message = *m.params
 		begin
 			if target =~ /^#/
-				ret = api("statuses/update.json", {"status" => message})
+				ret = api("statuses/update", {"status" => message})
 			else
 				# direct message
-				ret = api("direct_messages/new.json", {"user" => target, "text" => message})
+				ret = api("direct_messages/new", {"user" => target, "text" => message})
 			end
 			raise ApiFailed, "api failed" unless ret
 			log "Status Updated"
@@ -152,10 +211,10 @@ class TwitterIrcGateway < 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, "*", NKF.nkf("-j", "#{f["name"]} / #{f["description"]}")
-			post nil, RPL_WHOISSERVER, nick, api_base.host, api_base.to_s
-			post nil, RPL_WHOISIDLE,   nick, "0", "seconds idle"
-			post nil, RPL_ENDOFWHOIS,  nick, "End of WHOIS list"
+			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"
 		else
 			post nil, ERR_NOSUCHNICK, nick, "No such nick/channel"
 		end
@@ -165,27 +224,27 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		channel = m.params[0]
 		case
 		when channel == main_channel
-			#     "<channel> <user> <host> <server> <nick> 
-			#         ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] 
+			#     "<channel> <user> <host> <server> <nick>
+			#         ( "H" / "G" > ["*"] [ ( "@" / "+" ) ]
 			#             :<hopcount> <real name>"
 			@friends.each do |f|
 				user = nick = f["screen_name"]
 				host = serv = api_base.host
 				real = f["name"]
-				post nil, RPL_WHOREPLY, channel, user, host, serv, nick, "H", "0 #{real}"
+				post nil, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
 			end
-			post nil, RPL_ENDOFWHO, channel
+			post nil, 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, channel, user, host, serv, nick, "H", "0 #{real}"
+				post nil, RPL_WHOREPLY, @nick, channel, user, host, serv, nick, "H*@", "0 #{real}"
 			end
-			post nil, RPL_ENDOFWHO, channel
+			post nil, RPL_ENDOFWHO, @nick, channel
 		else
-			post nil, ERR_NOSUCHNICK, nick, "No such nick/channel"
+			post nil, ERR_NOSUCHNICK, @nick, nick, "No such nick/channel"
 		end
 	end
 
@@ -197,6 +256,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 			@channels << channel
 			@channels.uniq!
 			post "#{@nick}!#{@nick}@#{api_base.host}", JOIN, channel
+			post server_name, MODE, channel, "+o", @nick
 			save_config
 		end
 	end
@@ -216,6 +276,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		if (@friends || []).find {|i| i["screen_name"] == nick }
 			((@groups[channel] ||= []) << nick).uniq!
 			post "#{nick}!#{nick}@#{api_base.host}", JOIN, channel
+			post server_name, MODE, channel, "+o", nick
 			save_config
 		else
 			post ERR_NOSUCHNICK, nil, nick, "No such nick/channel"
@@ -239,17 +300,21 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	def check_timeline
 		first = true unless @prev_time
 		@prev_time = Time.at(0) if first
-		api("statuses/friends_timeline.json", {"since" => [@prev_time.httpdate] }).reverse_each do |s|
+		api("statuses/friends_timeline", {"since" => [@prev_time.httpdate]}).reverse_each do |s|
 			nick = s["user"]["screen_name"]
 			mesg = s["text"]
-			time = Time.parse(s["created_at"]) rescue Time.now
+			# display photo url(wassr only)
+			if s.has_key?('photo_url')
+				mesg += " #{s['photo_url']}"
+			end
+			# time = Time.parse(s["created_at"]) rescue Time.now
 			m = { "&quot;" => "\"", "&lt;"=> "<", "&gt;"=> ">", "&amp;"=> "&", "\n" => " "}
 			mesg.gsub!(/(#{m.keys.join("|")})/) { m[$1] }
 
 			digest = Digest::MD5.hexdigest("#{nick}::#{mesg}")
 			unless @timeline.include?(digest)
 				@timeline << digest
-				@log.debug [nick, mesg, time].inspect
+				@log.debug [nick, mesg]
 				if nick == @nick # 自分のときは topic に
 					post nick, TOPIC, main_channel, mesg
 				else
@@ -262,6 +327,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 				end
 			end
 		end
+		@log.debug "@timeline.size = #{@timeline.size}"
 		@timeline  = @timeline.last(100)
 		@prev_time = Time.now
 	end
@@ -269,7 +335,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	def check_direct_messages
 		first = true unless @prev_time_d
 		@prev_time_d = Time.now if first
-		api("direct_messages.json", {"since" => [@prev_time_d.httpdate] }).reverse_each do |s|
+		api("direct_messages", {"since" => [@prev_time_d.httpdate] }).reverse_each do |s|
 			nick = s["sender_screen_name"]
 			mesg = s["text"]
 			time = Time.parse(s["created_at"])
@@ -282,11 +348,11 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	def check_friends
 		first = true unless @friends
 		@friends ||= []
-		friends = api("statuses/friends.json")
+		friends = api("statuses/friends")
 		if first && !@opts.include?("athack")
 			@friends = friends
-			post nil, RPL_NAMREPLY,   server_name, @nick, "=", main_channel, @friends.map{|i| i["screen_name"] }.join(" ")
-			post nil, RPL_ENDOFNAMES, server_name, @nick, main_channel, "End of NAMES list"
+			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"
 		else
 			prv_friends = @friends.map {|i| i["screen_name"] }
 			now_friends = friends.map {|i| i["screen_name"] }
@@ -302,6 +368,37 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		end
 	end
 
+	def start_jabber(jid, pass)
+		@log.info "Logging-in with #{jid} -> jabber_bot_id: #{jabber_bot_id}"
+		im = Jabber::Simple.new(jid, pass)
+		im.add(jabber_bot_id)
+		Thread.start do
+			loop do
+				begin
+					im.received_messages.each do |msg|
+						@log.debug [msg.from, msg.body]
+						if msg.from.strip == jabber_bot_id
+							# twitter -> 'id: msg'
+							# wassr   -> 'nick(id): msg'
+							body = msg.body.sub(/^(.+?)(?:\((.+?)\))?: /, "")
+							if Regexp.last_match
+								nick, id = Regexp.last_match.captures
+								body = CGI.unescapeHTML(body)
+								message(id || nick, main_channel, body)
+							end
+						end
+					end
+				rescue Exception => e
+					@log.error "Error on Jabber loop: #{e.inspect}"
+					e.backtrace.each do |l|
+						@log.error "\t#{l}"
+					end
+				end
+				sleep 1
+			end
+		end
+	end
+
 	def save_config
 		config = {
 			:channels => @channels,
@@ -323,16 +420,20 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 
 	def api(path, q={})
 		ret = {}
-		q["source"] = "tigrb"
+		path = path.sub(%r{^/*}, '/') << '.json'
+		q["source"] = api_source
 		q = q.inject([]) {|r,(k,v)| v.inject(r) {|r,i| r << "#{k}=#{URI.escape(i, /[^-.!~*'()\w]/n)}" } }.join("&")
-		uri = api_base + "/#{path}?#{q}"
+		uri = api_base.dup
+		uri.path  = path
+		uri.query = q
 		@log.debug uri.inspect
 		Net::HTTP.start(uri.host, uri.port) do |http|
 			header = {
 				'Authorization' => "Basic " + ["#{@real}:#{@pass}"].pack("m"),
+				'User-Agent'    => @user_agent,
 			}
 			case path
-			when "statuses/update.json", "direct_messages/new.json"
+			when "/statuses/update.json", "/direct_messages/new.json"
 				ret = http.post(uri.request_uri, q, header)
 			else
 				ret = http.get(uri.request_uri, header)
@@ -341,7 +442,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		@log.debug ret.inspect
 		case ret.code
 		when "200"
-			JSON.parse(ret.body)
+			JSON.parse(ret.body.gsub(/'(y(?:es)?|n(?:o)?|true|false|null)'/, '"\1"'))
 		when "304"
 			[]
 		else
@@ -366,10 +467,16 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	end
 
 	def untinyurl(text)
-		text.gsub(%r|http://tinyurl.com/[0-9a-z=]+|i) {|m|
+		text.gsub(%r|http://(preview\.)?tinyurl\.com/[0-9a-z=]+|i) {|m|
 			uri = URI(m)
+			uri.host = uri.host.sub($1, '') if $1
 			Net::HTTP.start(uri.host, uri.port) {|http|
-				http.head(uri.request_uri)["Location"]
+				http.open_timeout = 3
+				begin
+					http.head(uri.request_uri, { 'User-Agent' => @user_agent })["Location"]
+				rescue Timeout::Error
+					m
+				end
 			}
 		}
 	end
@@ -379,11 +486,10 @@ if __FILE__ == $0
 	require "optparse"
 
 	opts = {
-		:port   => 16668,
-		:host   => "localhost",
-		:debug  => false,
-		:log    => nil,
-		:debug  => false,
+		:port  => 16668,
+		:host  => "localhost",
+		:log   => nil,
+		:debug => false,
 	}
 
 	OptionParser.new do |parser|
@@ -396,11 +502,11 @@ if __FILE__ == $0
 			separator ""
 
 			separator "Options:"
-			on("-p", "--port [PORT=#{opts[:port]}]", "listen port number") do |port|
+			on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
 				opts[:port] = port
 			end
 
-			on("-h", "--host [HOST=#{opts[:host]}]", "listen host") do |host|
+			on("-h", "--host [HOST=#{opts[:host]}]", "host name or IP address to listen") do |host|
 				opts[:host] = host
 			end
 
@@ -443,4 +549,3 @@ if __FILE__ == $0
 	end
 end
 
-

data/examples/wig.rb

@@ -5,33 +5,53 @@
 
 Wassr IRC Gateway
 
+## Launch
 
-## Client opts
+	$ ruby wig.rb # daemonized
+
+If you want to help:
+
+	$ ruby wig.rb --help
+
+## Configuration
 
 Options specified by after irc realname.
 
-Configuration example for tiarra ( http://coderepos.org/share/wiki/Tiarra ).
+Configuration example for Tiarra ( http://coderepos.org/share/wiki/Tiarra ).
 
 	wassr {
 		host: localhost
 		port: 16670
 		name: username@example.com athack
-		password: password on wassr
+		password: password on Wassr
 		in-encoding: utf8
 		out-encoding: utf8
 	}
 
 ### athack
 
-If `athack` client options specified,
+If `athack` client option specified,
 all nick in join message is leading with @.
 
-So if you complemente nicks (ex. irssi),
+So if you complemente nicks (ex. Irssi),
 it's good for twitter like reply command (@nick).
 
 In this case, you will see torrent of join messages after connected,
 because NAMES list can't send @ leading nick (it interpreted op.)
 
+
+### jabber=<jid>:<pass>
+
+If `jabber=<jid>:<pass>` option specified,
+use jabber to get friends timeline.
+
+You must setup im notifing settings in the site and
+install 'xmpp4r-simple' gem.
+
+	$ sudo gem install xmpp4r-simple
+
+Be careful for managing password.
+
 ## Licence
 
 Ruby's by cho45
@@ -56,7 +76,15 @@ class WassrIrcGateway < TwitterIrcGateway
 	end
 
 	def api_base
-		@api_base ||= URI("http://api.wassr.jp/")
+		URI("http://api.wassr.jp/")
+	end
+
+	def api_source
+		"wig.rb"
+	end
+
+	def jabber_bot_id
+		"wassr-bot@wassr.jp"
 	end
 end
 
@@ -64,11 +92,10 @@ if __FILE__ == $0
 	require "optparse"
 
 	opts = {
-		:port   => 16670,
-		:host   => "localhost",
-		:debug  => false,
-		:log    => nil,
-		:debug  => false,
+		:port  => 16670,
+		:host  => "localhost",
+		:log   => nil,
+		:debug => false,
 	}
 
 	OptionParser.new do |parser|
@@ -81,11 +108,11 @@ if __FILE__ == $0
 			separator ""
 
 			separator "Options:"
-			on("-p", "--port [PORT=#{opts[:port]}]", "listen port number") do |port|
+			on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
 				opts[:port] = port
 			end
 
-			on("-h", "--host [HOST=#{opts[:host]}]", "listen host") do |host|
+			on("-h", "--host [HOST=#{opts[:host]}]", "host name or IP address to listen") do |host|
 				opts[:host] = host
 			end
 
@@ -128,5 +155,3 @@ if __FILE__ == $0
 	end
 end
 
-
-