net-irc 0.0.2 → 0.0.3

data/examples/nig.rb

@@ -63,7 +63,7 @@ class NowaIrcGateway < TwitterIrcGateway
 	end
 
 	def api_base
-		URI("http://api.nowa.jp/")
+		URI("https://api.nowa.jp/")
 	end
 
 	def api_source
@@ -83,6 +83,7 @@ if __FILE__ == $0
 		:host  => "localhost",
 		:log   => nil,
 		:debug => false,
+		:foreground => false,
 	}
 
 	OptionParser.new do |parser|
@@ -112,6 +113,11 @@ if __FILE__ == $0
 				opts[:debug] = true
 			end
 
+			on("-f", "--foreground", "run foreground") do |foreground|
+				opts[:log]        = $stdout
+				opts[:foreground] = true
+			end
+
 			parse!(ARGV)
 		end
 	end
@@ -119,14 +125,14 @@ if __FILE__ == $0
 	opts[:logger] = Logger.new(opts[:log], "daily")
 	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
 
-	def daemonize(debug=false)
-		return yield if $DEBUG || debug
+	def daemonize(foreground=false)
+		trap("SIGINT")  { exit! 0 }
+		trap("SIGTERM") { exit! 0 }
+		trap("SIGHUP")  { exit! 0 }
+		return yield if $DEBUG || foreground
 		Process.fork do
 			Process.setsid
 			Dir.chdir "/"
-			trap("SIGINT")  { exit! 0 }
-			trap("SIGTERM") { exit! 0 }
-			trap("SIGHUP")  { exit! 0 }
 			File.open("/dev/null") {|f|
 				STDIN.reopen  f
 				STDOUT.reopen f
@@ -137,7 +143,7 @@ if __FILE__ == $0
 		exit! 0
 	end
 
-	daemonize(opts[:debug]) do
+	daemonize(opts[:debug] || opts[:foreground]) do
 		Net::IRC::Server.new(opts[:host], opts[:port], NowaIrcGateway, opts).start
 	end
 end

data/examples/sig.rb

@@ -0,0 +1,186 @@
+#!/usr/bin/env ruby
+=begin
+# sig.rb
+
+ServerLog IRC Gateway
+
+# Usage
+
+ * Connect.
+ * Join a channel (you can name it as you like)
+ * Set topic "filename regexp"
+ * You will see the log at the channel only matching the regexp.
+
+=end
+
+$LOAD_PATH << "lib"
+$LOAD_PATH << "../lib"
+
+$KCODE = "u" # json use this
+
+require "rubygems"
+require "net/irc"
+require "logger"
+require "pathname"
+require "yaml"
+
+class ServerLogIrcGateway < Net::IRC::Server::Session
+	def server_name
+		"serverlog"
+	end
+
+	def server_version
+		"0.0.0"
+	end
+
+
+	def initialize(*args)
+		super
+		@channels = {}
+		@config   = Pathname.new(ENV["HOME"]) + ".sig"
+	end
+
+	def on_disconnected
+		@channels.each do |chan, info|
+			begin
+				info[:observer].kill if info[:observer]
+			rescue
+			end
+		end
+	end
+
+	def on_user(m)
+		super
+		@real, *@opts = @real.split(/\s+/)
+		@opts ||= []
+	end
+
+	def on_join(m)
+		channels = m.params.first.split(/,/)
+		channels.each do |channel|
+			@channels[channel] = {
+				:topic    => "",
+				:observer => nil,
+			} unless @channels.key?(channel)
+			post @prefix, JOIN, m.params.first
+			post nil, RPL_NAMREPLY,   @prefix.nick, "=", channel, "@#{@prefix.nick}"
+			post nil, RPL_ENDOFNAMES, @prefix.nick, channel, "End of NAMES list"
+		end
+	end
+
+	def on_topic(m)
+		channel, topic, = m.params
+		p m.params
+		if @channels.key?(channel)
+			post @prefix, TOPIC, channel, topic
+			@channels[channel][:topic] = topic
+			create_observer(channel)
+		end
+	end
+
+	def create_observer(channel)
+		return unless @channels.key?(channel)
+		info = @channels[channel]
+		@log.debug "create_observer<#{channel}>#{info.inspect}"
+		begin
+			info[:observer].kill if info[:observer]
+		rescue
+		end
+		info[:observer] = Thread.start(channel, info) do |chan, i|
+			file, reg, = i[:topic].split(/\s+/)
+			name = File.basename(file)
+			grep = Regexp.new(reg.to_s)
+			@log.info "#{file} / grep => #{grep.inspect}"
+			File.open(file) do |f|
+				size = File.size(f)
+				f.seek size
+				loop do
+					sleep 1
+					nsize = File.size(f)
+					if nsize > size
+						@log.debug "follow up log"
+						l = f.gets
+						if grep === l
+							post name, PRIVMSG, chan, l
+						end
+					end
+					size = nsize
+				end
+			end
+		end
+	end
+end
+
+if __FILE__ == $0
+	require "optparse"
+
+	opts = {
+		:port  => 16700,
+		:host  => "localhost",
+		:log   => nil,
+		:debug => false,
+		:foreground => false,
+	}
+
+	OptionParser.new do |parser|
+		parser.instance_eval do
+			self.banner  = <<-EOB.gsub(/^\t+/, "")
+				Usage: #{$0} [opts]
+
+			EOB
+
+			separator ""
+
+			separator "Options:"
+			on("-p", "--port [PORT=#{opts[:port]}]", "port number to listen") do |port|
+				opts[:port] = port
+			end
+
+			on("-h", "--host [HOST=#{opts[:host]}]", "host name or IP address to listen") do |host|
+				opts[:host] = host
+			end
+
+			on("-l", "--log LOG", "log file") do |log|
+				opts[:log] = log
+			end
+
+			on("--debug", "Enable debug mode") do |debug|
+				opts[:log]   = $stdout
+				opts[:debug] = true
+			end
+
+			on("-f", "--foreground", "run foreground") do |foreground|
+				opts[:log]        = $stdout
+				opts[:foreground] = true
+			end
+
+			parse!(ARGV)
+		end
+	end
+
+	opts[:logger] = Logger.new(opts[:log], "daily")
+	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
+
+	def daemonize(foreground=false)
+		trap("SIGINT")  { exit! 0 }
+		trap("SIGTERM") { exit! 0 }
+		trap("SIGHUP")  { exit! 0 }
+		return yield if $DEBUG || foreground
+		Process.fork do
+			Process.setsid
+			Dir.chdir "/"
+			File.open("/dev/null") {|f|
+				STDIN.reopen  f
+				STDOUT.reopen f
+				STDERR.reopen f
+			}
+			yield
+		end
+		exit! 0
+	end
+
+	daemonize(opts[:debug] || opts[:foreground]) do
+		Net::IRC::Server.new(opts[:host], opts[:port], ServerLogIrcGateway, opts).start
+	end
+end
+

data/examples/tig.rb

@@ -23,7 +23,7 @@ Configuration example for Tiarra ( http://coderepos.org/share/wiki/Tiarra ).
 	twitter {
 		host: localhost
 		port: 16668
-		name: username@example.com athack
+		name: username@example.com athack jabber=username@example.com:jabberpasswd
 		password: password on Twitter
 		in-encoding: utf8
 		out-encoding: utf8
@@ -65,8 +65,9 @@ $LOAD_PATH << "../lib"
 $KCODE = "u" # json use this
 
 require "rubygems"
-require "net/http"
 require "net/irc"
+require "net/http"
+require "net/https"
 require "uri"
 require "json"
 require "socket"
@@ -74,7 +75,6 @@ require "time"
 require "logger"
 require "yaml"
 require "pathname"
-require "digest/md5"
 require "cgi"
 
 Net::HTTP.version_1_2
@@ -108,10 +108,11 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 
 	def initialize(*args)
 		super
-		@groups = {}
-		@channels = [] # join channels (groups)
+		@groups     = {}
+		@channels   = [] # joined channels (groups)
 		@user_agent = "#{self.class}/#{server_version} (tig.rb)"
-		@config = Pathname.new(ENV["HOME"]) + ".tig"
+		@config     = Pathname.new(ENV["HOME"]) + ".tig"
+		@map        = nil
 		load_config
 	end
 
@@ -120,8 +121,9 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		post @prefix, JOIN, main_channel
 		post server_name, MODE, main_channel, "+o", @prefix.nick
 
-		@real, *@opts = @real.split(/\s+/)
+		@real, *@opts = @opts.name || @real.split(/\s+/)
 		@opts ||= []
+		@tmap   = TypableMap.new
 
 		jabber = @opts.find {|i| i =~ /^jabber=(\S+?):(\S+)/ }
 		if jabber
@@ -145,7 +147,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		@log.info "Client Options: #{@opts.inspect}"
 
 		@timeline = []
-		Thread.start do
+		@check_friends_thread = Thread.start do
 			loop do
 				begin
 					check_friends
@@ -157,14 +159,14 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 						@log.error "\t#{l}"
 					end
 				end
-				sleep 10 * 60
+				sleep 10 * 60 # 6 times/hour
 			end
 		end
 		sleep 3
 
 		return if jabber
 
-		Thread.start do
+		@check_timeline_thread = Thread.start do
 			loop do
 				begin
 					check_timeline
@@ -177,18 +179,31 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 						@log.error "\t#{l}"
 					end
 				end
-				sleep 90
+				sleep 180 # 20 times/hour
 			end
 		end
 	end
 
+	def on_disconnected
+		@check_friends_thread.kill  rescue nil
+		@check_timeline_thread.kill rescue nil
+		@im_thread.kill             rescue nil
+		@im.disconnect              rescue nil
+	end
+
 	def on_privmsg(m)
+		return on_ctcp(m[0], ctcp_decoding(m[1])) if m.ctcp?
 		retry_count = 3
 		ret = nil
 		target, message = *m.params
 		begin
 			if target =~ /^#/
-				ret = api("statuses/update", {"status" => message})
+				if @im && @im.connected? # in jabber mode, using jabber post
+					ret = @im.deliver(jabber_bot_id, message)
+					post "#{nick}!#{nick}@#{api_base.host}", TOPIC, main_channel, untinyurl(message)
+				else
+					ret = api("statuses/update", {"status" => message})
+				end
 			else
 				# direct message
 				ret = api("direct_messages/new", {"user" => target, "text" => message})
@@ -207,6 +222,34 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		end
 	end
 
+	def on_ctcp(target, message)
+		_, command, *args = message.split(/\s+/)
+		case command
+		when "list"
+			nick = args[0]
+			@log.debug([ nick, message ])
+			res = api('statuses/user_timeline', { 'id' => nick }).reverse_each do |s|
+				@log.debug(s)
+				post nick, NOTICE, main_channel, "#{generate_status_message(s)}"
+			end
+
+			unless res
+				post nil, ERR_NOSUCHNICK, nick, "No such nick/channel" 
+			end
+		when "fav"
+			tid = args[0]
+			id  = @tmap[tid]
+			if id
+				res = api("favorites/create/#{id}", {})
+				post nil, NOTICE, main_channel, "Fav: #{res["screen_name"]}: #{res["text"]}"
+			else
+				post nil, NOTICE, main_channel, "No such id #{tid}"
+			end
+		end
+	rescue ApiFailed => e
+		log e.inspect
+	end
+
 	def on_whois(m)
 		nick = m.params[0]
 		f = (@friends || []).find {|i| i["screen_name"] == nick }
@@ -298,32 +341,25 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 
 	private
 	def check_timeline
-		first = true unless @prev_time
-		@prev_time = Time.at(0) if first
-		api("statuses/friends_timeline", {"since" => [@prev_time.httpdate]}).reverse_each do |s|
-			nick = s["user"]["screen_name"]
-			mesg = s["text"]
-			# display photo url(wassr only)
-			if s.has_key?('photo_url')
-				mesg += " #{s['photo_url']}"
+		@prev_time ||= Time.at(0)
+		api("statuses/friends_timeline", {"since" => @prev_time.httpdate}).reverse_each do |s|
+			id = s["id"] || s["rid"]
+			next if id.nil? || @timeline.include?(id)
+			@timeline << id
+			nick = s["user_login_id"] || s["user"]["screen_name"] # it may be better to use user_login_id in Wassr
+			mesg = generate_status_message(s)
+
+			tid = @tmap.push(id)
+
+			@log.debug [id, nick, mesg]
+			if nick == @nick # 自分のときは topic に
+				post "#{nick}!#{nick}@#{api_base.host}", TOPIC, main_channel, untinyurl(mesg)
+			else
+				message(nick, main_channel, "%s [%s]" % [mesg, tid])
 			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]
-				if nick == @nick # 自分のときは topic に
-					post nick, TOPIC, main_channel, mesg
-				else
-					message(nick, main_channel, mesg)
-				end
-				@groups.each do |channel,members|
-					if members.include?(nick)
-						message(nick, channel, mesg)
-					end
+			@groups.each do |channel, members|
+				if members.include?(nick)
+					message(nick, channel, "%s [%s]" % [mesg, tid])
 				end
 			end
 		end
@@ -332,10 +368,34 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		@prev_time = Time.now
 	end
 
+	def generate_status_message(status)
+		s = status
+		mesg = s["text"]
+		@log.debug(mesg)
+
+		# 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
+			mesg = "@#{reply_user_id} #{mesg}"
+		end
+		# display area name(Wassr only)
+		if s.has_key?('areaname') and s["areaname"]
+			mesg += " L: #{s['areaname']}"
+		end
+		# display photo url(Wassr only)
+		if s.has_key?('photo_url') and s["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] }
+		mesg
+	end
+
 	def check_direct_messages
-		first = true unless @prev_time_d
-		@prev_time_d = Time.now if first
-		api("direct_messages", {"since" => [@prev_time_d.httpdate] }).reverse_each do |s|
+		@prev_time_d ||= Time.now
+		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"])
@@ -356,6 +416,10 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 		else
 			prv_friends = @friends.map {|i| i["screen_name"] }
 			now_friends = friends.map {|i| i["screen_name"] }
+
+			# twitter api bug?
+			return if !first && (now_friends.length - prv_friends.length).abs > 10
+
 			(now_friends - prv_friends).each do |join|
 				join = "@#{join}" if @opts.include?("athack")
 				post "#{join}!#{join}@#{api_base.host}", JOIN, main_channel
@@ -370,16 +434,16 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 
 	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
+		@im = Jabber::Simple.new(jid, pass)
+		@im.add(jabber_bot_id)
+		@im_thread = Thread.start do
 			loop do
 				begin
-					im.received_messages.each do |msg|
+					@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'
+							# Twitter -> 'id: msg'
+							# Wassr   -> 'nick(id): msg'
 							body = msg.body.sub(/^(.+?)(?:\((.+?)\))?: /, "")
 							if Regexp.last_match
 								nick, id = Regexp.last_match.captures
@@ -402,7 +466,7 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	def save_config
 		config = {
 			:channels => @channels,
-			:groups => @groups,
+			:groups   => @groups,
 		}
 		@config.open("w") do |f|
 			YAML.dump(config, f)
@@ -419,45 +483,61 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	end
 
 	def api(path, q={})
-		ret = {}
-		path = path.sub(%r{^/*}, '/') << '.json'
-		q["source"] = api_source
+		ret     = {}
+		header = {
+			"User-Agent"               => @user_agent,
+			"Authorization"            => "Basic " + ["#{@real}:#{@pass}"].pack("m"),
+			"X-Twitter-Client"         => api_source,
+			"X-Twitter-Client-Version" => server_version,
+			"X-Twitter-Client-URL"     => "http://coderepos.org/share/browser/lang/ruby/misc/tig.rb",
+		}
+		header["If-Modified-Since"]    =  q["since"] if q.key?("since")
+
+		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.dup
-		uri.path  = path
+		uri.path  = path.sub(%r{^/*}, "/") << ".json"
 		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
+		http = Net::HTTP.new(uri.host, uri.port)
+		if uri.scheme == "https"
+			http.use_ssl     = true
+			http.verify_mode = OpenSSL::SSL::VERIFY_NONE # FIXME
+		end
+		http.start do
+			case uri.path
 			when "/statuses/update.json", "/direct_messages/new.json"
 				ret = http.post(uri.request_uri, q, header)
 			else
 				ret = http.get(uri.request_uri, header)
 			end
 		end
-		@log.debug ret.inspect
-		case ret.code
-		when "200"
-			JSON.parse(ret.body.gsub(/'(y(?:es)?|n(?:o)?|true|false|null)'/, '"\1"'))
-		when "304"
+
+		case ret
+		when Net::HTTPOK # 200
+			ret = JSON.parse(ret.body.gsub(/'(y(?:es)?|no?|true|false|null)'/, '"\1"'))
+			raise ApiFailed, "Server Returned Error: #{ret["error"]}" if ret.kind_of?(Hash) && ret["error"]
+			ret
+		when Net::HTTPNotModified # 304
 			[]
+		when Net::HTTPBadRequest # 400
+			# exceeded the rate limitation
+			raise ApiFailed, "#{ret.code}: #{ret["error"]}"
 		else
-			raise ApiFailed, "Server Returned #{ret.code}"
+			raise ApiFailed, "Server Returned #{ret.code} #{ret.message}"
 		end
 	rescue Errno::ETIMEDOUT, JSON::ParserError, IOError, Timeout::Error, Errno::ECONNRESET => e
 		raise ApiFailed, e.inspect
 	end
 
 	def message(sender, target, str)
-#			str.gsub!(/&#(x)?([0-9a-f]+);/i) do |m|
-#				[$1 ? $2.hex : $2.to_i].pack("U")
-#			end
-		str = untinyurl(str)
-		sender =  "#{sender}!#{sender}@#{api_base.host}"
+#		str.gsub!(/&#(x)?([0-9a-f]+);/i) do
+#			[$1 ? $2.hex : $2.to_i].pack("U")
+#		end
+		str    = untinyurl(str)
+		sender = "#{sender}!#{sender}@#{api_base.host}"
 		post sender, PRIVMSG, target, str
 	end
 
@@ -469,17 +549,58 @@ class TwitterIrcGateway < Net::IRC::Server::Session
 	def untinyurl(text)
 		text.gsub(%r|http://(preview\.)?tinyurl\.com/[0-9a-z=]+|i) {|m|
 			uri = URI(m)
-			uri.host = uri.host.sub($1, '') if $1
+			uri.host = uri.host.sub($1, "") if $1
 			Net::HTTP.start(uri.host, uri.port) {|http|
 				http.open_timeout = 3
 				begin
-					http.head(uri.request_uri, { 'User-Agent' => @user_agent })["Location"]
+					http.head(uri.request_uri, { "User-Agent" => @user_agent })["Location"] || m
 				rescue Timeout::Error
 					m
 				end
 			}
 		}
 	end
+
+	class TypableMap < Hash
+		Roma = "a i u e o k g s z t d n h b p m y r w j v l q".split(/ /).map {|k|
+			%w|a i u e o|.map {|v| "#{k}#{v}" }
+		}.flatten
+
+		def initialize(size=2)
+			@seq = Roma
+			@map = {}
+			@n   = 0
+			@size = size
+		end
+
+		def generate(n)
+			ret = []
+			begin
+				n, r = n.divmod(@seq.size)
+				ret << @seq[r]
+			end while n > 0
+			ret.reverse.join
+		end
+
+		def push(obj)
+			id = generate(@n)
+			self[id] = obj
+			@n += 1
+			@n = @n % (@seq.size ** @size)
+			id
+		end
+		alias << push
+
+		def clear
+			@n = 0
+			super
+		end
+
+		private :[]=
+		undef update, merge, merge!, replace
+	end
+
+
 end
 
 if __FILE__ == $0
@@ -490,6 +611,7 @@ if __FILE__ == $0
 		:host  => "localhost",
 		:log   => nil,
 		:debug => false,
+		:foreground => false,
 	}
 
 	OptionParser.new do |parser|
@@ -519,6 +641,15 @@ if __FILE__ == $0
 				opts[:debug] = true
 			end
 
+			on("-f", "--foreground", "run foreground") do |foreground|
+				opts[:log]        = $stdout
+				opts[:foreground] = true
+			end
+
+			on("-n", "--name [user name or email address]") do |name|
+				opts[:name] = name
+			end
+
 			parse!(ARGV)
 		end
 	end
@@ -526,14 +657,14 @@ if __FILE__ == $0
 	opts[:logger] = Logger.new(opts[:log], "daily")
 	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
 
-	def daemonize(debug=false)
-		return yield if $DEBUG || debug
+	def daemonize(foreground=false)
+		trap("SIGINT")  { exit! 0 }
+		trap("SIGTERM") { exit! 0 }
+		trap("SIGHUP")  { exit! 0 }
+		return yield if $DEBUG || foreground
 		Process.fork do
 			Process.setsid
 			Dir.chdir "/"
-			trap("SIGINT")  { exit! 0 }
-			trap("SIGTERM") { exit! 0 }
-			trap("SIGHUP")  { exit! 0 }
 			File.open("/dev/null") {|f|
 				STDIN.reopen  f
 				STDOUT.reopen f
@@ -544,8 +675,11 @@ if __FILE__ == $0
 		exit! 0
 	end
 
-	daemonize(opts[:debug]) do
+	daemonize(opts[:debug] || opts[:foreground]) do
 		Net::IRC::Server.new(opts[:host], opts[:port], TwitterIrcGateway, opts).start
 	end
 end
 
+# Local Variables:
+# coding: utf-8
+# End: