butler 1.8.0 → 1.8.1

data/lib/access/savable.rb

@@ -7,8 +7,13 @@
 
 
 class Access
+	# Mixin for classes representing records
 	module Savable
+
+		# The Access instance that manages this records base
 		attr_accessor :access
+		
+		# The "Base" instance that manages this record 
 		attr_accessor :base
 
 		def save

data/lib/access/user.rb

@@ -48,11 +48,19 @@ class Access
 			end
 		end
 
+		# The record-id
 		attr_reader :id
+		
+		# The credentials of the user (password)
 		attr_reader :credentials
+		
+		# Privileges of the user (Privileges instance)
 		attr_reader :privileges
+		
+		# Roles the user is in (Roles instance)
 		attr_reader :roles
 
+		# Metadata - anything you want
 		attr_accessor :meta
 
 		# The data needed to restore a user.
@@ -87,6 +95,10 @@ class Access
 			extend(Admin) if @admin
 		end
 		
+		# Set the credentials of the user
+		# pass in nil (revokes the password, which will lead to no password being
+		# accepted as correct) or a plaintext password, the method uses
+		# Access#hash_credentials to hash the passed in value.
 		def credentials=(value)
 			@credentials = value ? access.hash_credentials(value, @id) : "*"
 			save
@@ -139,32 +151,39 @@ class Access
 			save
 		end
 		
+		# Set the logged? status of the user to true
 		def login
 			@logged = true
 		end
 		
+		# Set the logged? status of the user to false
 		def logout
 			@logged = false
 		end
 		
+		# Set the logged? status of the user
 		def logged=(value)
-			@logged = value
+			@logged = !!value
 		end
 		
+		# Whether the user is logged in or not
 		def logged?
 			@logged
 		end
 		
+		# :nodoc:
 		def eql?(other)
 			self.class == other.class && @id.eql?(other.id)
 		end
 		alias == eql? # in ruby1.8 that's unecessary as == uses eql? per default
 		
+		# :nodoc:
 		def hash
 			@id.hash
 		end
 
-		def inspect # :nodoc:
+		# :nodoc:
+		def inspect
 			"#<%s:0x%08x base: %s id: %s credentials: %s %s%s%s>" %  [
 				self.class,
 				object_id << 1,

data/lib/access/yamlbase.rb

@@ -12,6 +12,7 @@ require 'yaml'
 
 
 class Access
+
 	# An Access compatible storage backend
 	class YAMLBase
 		include Enumerable
@@ -37,10 +38,12 @@ class Access
 			"#{@path}/#{escape(id)}.yaml"
 		end
 		
+		# Escapes path names
 		def escape(id)
 			id.gsub(/[\x00-\x1f.%]/) { |m| "%%%02x"%m }.gsub("/", ".")
 		end
 		
+		# Extracts the record-id from a path
 		def path2id(path)
 			path[(@path.length+1)..-6].gsub(".", "/").gsub(/%([\dA-Fa-f]{2})/) { $1.to_i(16).chr }
 		end
@@ -84,6 +87,7 @@ class Access
 			File.delete(filename(id))
 		end
 		
+		# All record id's
 		def keys
 			Dir.glob("#{@path}/*.yaml").map { |path|
 				path2id(path)

data/lib/butler.rb

@@ -20,8 +20,8 @@ require 'yaml'
 
 
 class Butler
-	@path       = nil
-	@log_device = nil
+	@path   = nil
+	@logger = nil
 	extend Log::Comfort
 
 	class <<self
@@ -53,7 +53,7 @@ class Butler
 			daemonize(path.base) { }
 			begin
 				File.write(pidfile, $$)
-				butler  = Bot.new(path, botname)
+				butler  = Bot.new(path, botname, opts)
 				path    = butler.path
 				$stderr = File.open(path.log+"/error.log", "w")
 				$stdout = File.open(path.log+"/out.log", "w")
@@ -81,7 +81,7 @@ class Butler
 			pidfile = test_pidfile(path.run, botname)
 			File.write(pidfile, $$)
 			info("Running #{botname} with PID #{$$} interactively")
-			butler  = Bot.new(path, botname)
+			butler  = Bot.new(path, botname, opts)
 			butler.plugins.load_all
 			butler.login
 			if block then butler.event_loop(&block) else sleep end

data/lib/butler/bot.rb

@@ -27,7 +27,7 @@ class Butler
 		attr_reader :access
 		attr_reader :base
 		attr_reader :config
-		attr_reader :log_device
+		attr_reader :logger
 		attr_reader :path
 		attr_reader :plugins
 		attr_reader :scheduler
@@ -46,7 +46,7 @@ class Butler
 				:plugins    => @base+'/plugins',
 				:strings    => @base+'/strings'
 			)
-			@log_device = $stderr
+			@logger     = $stderr
 			@config     = Configuration.new(@base+'/config')
 			@scheduler  = Scheduler.new
 			@access     = Access.new(
@@ -62,9 +62,9 @@ class Butler
 				opts.delete(:reconnect_tries) || -1
 			]
 
-			super(@config["connections.main.server"], {
-				:port => @config["connections.main.port"],
-				:host => @config["connections.main.host"]
+			super(@config["connections/main/server"], {
+				:host => @config["connections/main/host"],
+				:port => @config["connections/main/port"],
 			}.merge(opts))
 
 			# { lang => { trigger => SortedSet[ *commands ] } }
@@ -140,12 +140,12 @@ class Butler
 			@access.default_user = @access["default_user"]
 			@access.default_user.login
 
-			nick = @config["connections.main.nick"]
-			pass = @config["connections.main.password"]
+			nick = @config["connections/main/nick"]
+			pass = @config["connections/main/password"]
 			super(
 				nick,
-				@config["connections.main.user"],
-				@config["connections.main.real"]
+				@config["connections/main/user"],
+				@config["connections/main/real"]
 			)
 			info("Logged in")
 			# FIXME, use #same_nick?
@@ -155,7 +155,7 @@ class Butler
 				@irc.nick(nick)
 			end
 			@irc.identify(pass) if pass
-			join(*@config["connections.main.channels"])
+			join(*@config["connections/main/channels"])
 		end
 		
 		def on_disconnect(reason)
@@ -170,9 +170,9 @@ class Butler
 		
 		def output_to_logfiles
 			# Errors still go to $stderr, $stdin handles puts as "info" level $stderr prints
-			@log_device = Log.file(@path.log+'/error.log')
-			$stdout     = Log.forward(@log_device, :warn)
-			$stderr     = Log.forward(@log_device, :info)
+			@logger = Log.file(@path.log+'/error.log')
+			$stdout = Log.forward(@logger, :warn)
+			$stderr = Log.forward(@logger, :info)
 		end
 
 		def inspect # :nodoc:

data/lib/butler/irc/client.rb

@@ -35,6 +35,8 @@ class Butler
 		#   puts "If this point is reached, client has ended"
 		#
 		class Client
+			include Log::Comfort
+
 			class Terminate < RuntimeError; end
 			# Created by Butler::IRC::Client#subscribe() and similar methods
 			Listener = Struct.new(:priority, :callback, :args, :unsubscriber) unless defined? Listener
@@ -101,11 +103,12 @@ class Butler
 	
 			def initialize(server, options={}, &on_disconnect)
 				options          = DefaultOptions.merge(options)
+				@logger          = nil
 				@users           = Users.new(self)
 				@channels        = Channels.new(self)
 				@users.channels  = @channels
 				@channels.users  = @users
-				@parser          = Parser.new(self, @users, @channels)
+				@parser          = Parser.new(self, @users, @channels, "rfc2812", "generic")
 	
 				@client_charset  = options.delete(:client_charset)
 				@server_charset  = options.delete(:server_charset)
@@ -114,7 +117,7 @@ class Butler
 	
 				@timeout         = DefaultTimeout.merge(options.delete(:timeout))
 
-				@irc             = Socket.new(server, options) # the socket, all methods to the socket are wrapped
+				@irc             = Socket.new(options.delete(:server) || server, options) # the socket, all methods to the socket are wrapped
 	
 				@listen          = Hash.new { |h,k| h[k] = [] }
 				@listener        = {}
@@ -126,6 +129,11 @@ class Butler
 				subscribe(:PING, 100) { |listener, message| @irc.pong(message.pong) }
 			end
 			
+			# Load an additional command-set for @parser
+			def load_command_set(*sets)
+				@parser.commands.load(*sets)
+			end
+			
 			# callback is called whenever a message with Message#symbol == symbol
 			# (or on every message if symbol is nil)
 			# priority may be any numeric, higher priority is dispatched to first,

data/lib/butler/irc/parser.rb

@@ -50,6 +50,10 @@ class Butler
 			class UnknownCommand < RuntimeError; end
 			module ParseError
 				include Exception::Detailed
+
+				def self.extended(obj)
+					obj.initialize_details
+				end
 			end
 	
 			RMessage  = /\A(?::([^ \0]+) )?([A-Za-z\d]+|\d{3})(?: (.*))?\z/
@@ -58,12 +62,13 @@ class Butler
 			attr_reader :client
 			attr_reader :users
 			attr_reader :channels
+			attr_reader :commands
 	
-			def initialize(client, users, channels)
+			def initialize(client, users, channels, *command_sets)
 				@client      = client
 				@users       = users
 				@channels    = channels
-				@commands    = Commands.new
+				@commands    = Commands.new(*command_sets)
 			end
 	
 			# parses an incomming message and returns a Message object from which you

data/lib/butler/irc/parser/commands.rb

@@ -7,6 +7,7 @@
 
 
 require 'butler/irc/parser'
+require 'log/comfort'
 
 
 
@@ -14,10 +15,22 @@ class Butler
 	module IRC
 		class Parser
 			class Commands
-				def initialize(specifics=nil)
+				include Log::Comfort
+
+				# enables chdirs
+				BasePath = File.expand_path(File.dirname(__FILE__))
+
+				def initialize(*files)
 					@commands = Hash.new { |h,k| raise IndexError, "Unknown command #{k}" }
-					file      = "#{File.dirname(__FILE__)}/generic.rb"
-					instance_eval(File.read(file), file)
+					load(*files)
+				end
+				
+				def load(*files)
+					raise ArgumentError, "Requires at least one argument." if files.empty?
+					files.each { |file|
+						file = "#{BasePath}/#{file}.rb" unless file.include?('/')
+						instance_eval(File.read(file), file)
+					}
 				end
 				
 				def add(raw, *args, &proc)
@@ -67,10 +80,14 @@ class Butler
 				end
 				
 				def create_fields(message)
-					if @matcher and match = @matcher.match(message.params) then
-						@mapping.zip(match.captures) { |name, value|
-							message.alter_member(name, value, true)
-						}
+					if @matcher then
+						if match = @matcher.match(message.params) then
+							@mapping.zip(match.captures) { |name, value|
+								message.alter_member(name, value, true)
+							}
+						else
+							warn "Matching failed in #{symbol} for #{message.params.inspect}"
+						end
 					end
 				end
 				

data/lib/butler/irc/parser/generic.rb

@@ -6,338 +6,50 @@
 
 
 
-# A list with all known IRC-Commands and it's parsing instructions
-# Commands with __ in it are customs, not verified towards any standard.
+# A list with all common, but non-rfc2812 IRC-Commands and their parsing
+# instructions.
 
-#Text based codes
-add("error",   :ERROR)		# ERROR :<error-message>
-
-add("invite",  :INVITE, /^([^\s]*) :(.*)/, [:invited, :channel])
-
-add("join",    :JOIN,   /^:(.*)/,          [:channel]) { |message, parser|
-	if message.from && message.channel then
-		message.from.add_channel(message.channel, :join)
-		message.channel.add_user(message.from, :join)
-	end
-}
-
-add("kick",    :KICK,   /^([^\s]*) ([^\s]*) :(.*)/, [:channel, :for, :text]) { |message, parser|
-	parser.leave_channel(message, :kick, :kicked)
-}
-
-add("kill",    :KILL,   /^([^\s]*) ([^\s]*) (.*)/, [:channel, :for, :text]) { |message, parser|
-	if message.for then
-		message.for.kill
-		parser.channels.delete_user(message.for, :kill)
-	end
-}
-
-# FIXME, really ':?' or just plain ':'?
-add("mode",    :MODE,   /^([^\s]*) :?(.*)/, [:for, :arguments]) { |message, parser|
-	modifiers				= message[:arguments].split(" ")
-	modes					= modifiers.shift.split("")
-	flags					= {"o" => User::Flags::OP, "v" => User::Flags::VOICE, "u" => User::Flags::UOP}
-	message.create_member(:modes, [])
-	argumentIndex			= 0
-	direction				= "+"
-
-	modes.each { |mode|
-		# MODEs direction
-		if (["+", "-"].include?(mode)) then
-			direction	= mode
-		# MODEs taking an argument
-		elsif (["k", "o", "v", "u"].include?(mode) || (mode == "l" && direction == "+")) then
-			if ["o", "v", "u"].include?(mode) then
-				if (direction == "+") then
-					parser.users[modifiers[argumentIndex]].add_flags(message.channel, flags[mode]) #adding flags to user
-				else
-					parser.users[modifiers[argumentIndex]].delete_flags(message.channel, flags[mode]) #removing flags from user
-				end
-			end
-			message.modes << [direction, mode, modifiers[argumentIndex]]
-			argumentIndex	= argumentIndex+1
-		# MODEs without argument
-		else
-			message.modes << [direction, mode, nil]
-		end
-	}
-}
-add("nick",    :NICK,    /^:(.*)/, [:nick]) { |message, parser|
-	message.create_member(:old_nick, message.from.nick)
-	message.from.nick = message.nick if message.from
-}
-
-add("notice",  :NOTICE,  /([^\s]+) :(.*)/, [:for, :text]) { |message, parser|
-	if message.channel then
-		message.create_member(:realm, :public)
-		message.create_method(:private?) { false }
-		message.create_method(:public?) { true }
-	else
-		message.create_member(:realm, :private)
-		message.create_method(:private?) { true }
-		message.create_method(:public?) { false }
-	end
-}
-
-add("part",    :PART,    /^([^\x00\x07\x10\x0D\x20,:]+)(?: :(.*))?/, [:channel, :reason]) { |message, parser|
-	parser.leave_channel(message, :part, :parted)
-}
-
-add("ping",    :PING,    /:(.*)/, [:pong])
-
-add("pong",    :PONG)
-
-add("privmsg", :PRIVMSG, /([^\s]+) :(.*)/, [:for, :text]) { |message, parser|
-	if message.channel then
-		message.create_member(:realm, :public)
-		message.create_method(:private?) { false }
-		message.create_method(:public?) { true }
-	else
-		message.create_member(:realm, :private)
-		message.create_method(:private?) { true }
-		message.create_method(:public?) { false }
-	end
-}
-
-add("quit",    :QUIT,    /(.*)/, [:text]) { |message, parser|
-	if message.from then
-		message.from.quit
-		parser.channels.delete_user(message.from, :quit)
-		parser.users.delete(message.from, :quit)
-	end
-}
-add("topic",   :TOPIC, /([^\s]+) :(.*)/, [:channel, :text])
-
-	#Unknown/Non-RFC codes
+# Seen:
+#   - ConferenceRoom (irc.bluewin.ch)
 add("007", :UNK_007)
+
+# Seen:
+#   - ConferenceRoom (irc.bluewin.ch)
 add("008", :UNK_008)
-add("009", :UNK_009)
-add("307", :RPL_REGISTERED_INFO)	#FIXME non2812 "ConferenceRoom" bluewin, sent if a nick is registered
-add("329", :RPL_CHANNEL_INFO)		#channel creation time
-add("377", :UNK_377)
 
-	#0** Codes
-add("001", :RPL_WELCOME)
-add("002", :RPL_YOURHOST)
-add("003", :RPL_CREATED)
-add("004", :RPL_MYINFO)
-add("005", :RPL_ISUPPORT)
+# Seen:
+#   - ConferenceRoom (irc.bluewin.ch)
+add("009", :UNK_009)
 
-	#2** Codes
-add("200", :RPL_TRACELINK)
-add("201", :RPL_TRACECONNECTING)
-add("202", :RPL_TRACEHANDSHAKE)
-add("203", :RPL_TRACEUNKNOWN)
-add("204", :RPL_TRACEOPERATOR)
-add("205", :RPL_TRACEUSER)
-add("206", :RPL_TRACESERVER)
-add("207", :RPL_TRACESERVICE)
-add("208", :RPL_TRACENEWTYPE)
-add("209", :RPL_TRACECLASS)
-add("210", :RPL_TRACERECONNECT)
-add("211", :RPL_STATSLINKINFO)
-add("212", :RPL_STATSCOMMANDS)
-add("213", :RPL_STATSCLINE)
-add("214", :RPL_STATSNLINE)
-add("215", :RPL_STATSILINE)
-add("216", :RPL_STATSKLINE)
-add("217", :RPL_STATSQLINE)
-add("218", :RPL_STATSYLINE)
-add("219", :RPL_ENDOFSTATS)
-add("221", :RPL_UMODEIS)
-add("231", :RPL_SERVICEINFO)
-add("232", :RPL_ENDOFSERVICES)
-add("233", :RPL_SERVICE)
-add("234", :RPL_SERVLIST)
-add("235", :RPL_SERVLISTEND)
-add("240", :RPL_STATSVLINE)
-add("241", :RPL_STATSLLINE)
-add("242", :RPL_STATSUPTIME)
-add("243", :RPL_STATSOLINE)
-add("244", :RPL_STATSHLINE)
-add("245", :RPL_STATSSLINE)	# RFC 2812 seems to be erroneous, it assigns 244 double
-add("246", :RPL_STATSPING)
-add("247", :RPL_STATSBLINE)
-add("250", :RPL_STATSCONN)
-add("251", :RPL_LUSERCLIENT)
-add("252", :RPL_LUSEROP)
-add("253", :RPL_LUSERUNKNOWN)
-add("254", :RPL_LUSERCHANNELS)
-add("255", :RPL_LUSERME)
-add("256", :RPL_ADMINME)
-add("257", :RPL_ADMINLOC1)
-add("258", :RPL_ADMINLOC2)
-add("259", :RPL_ADMINEMAIL)
-add("261", :RPL_TRACELOG)
-add("262", :RPL_TRACEEND)
-add("263", :RPL_TRYAGAIN)
 add("265", :RPL_LOCALUSERS)
 add("266", :RPL_GLOBALUSERS)
-add("290", :RPL_IDENTIFY_MSG) # FIXME non2812 "hyperion-1.0.2b"
 
-	#3** Codes
-add("300", :RPL_NONE)
-add("301", :RPL_AWAY)
-add("302", :RPL_USERHOST)
-add("303", :RPL_ISON)
-add("305", :RPL_UNAWAY)
-add("306", :RPL_NOWAWAY)
-add("311", :RPL_WHOISUSER, /^([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+) \* :(.*)/, [:for, :nick, :user, :host, :real])
-add("312", :RPL_WHOISSERVER)
-add("313", :RPL_WHOISOPERATOR)
-add("314", :RPL_WHOWASUSER)
-add("315", :RPL_ENDOFWHO)
-add("316", :RPL_WHOISCHANOP)
-add("317", :RPL_WHOISIDLE, /^([^\s]+) ([^\s]+) ([^:]+) :(.*)/, [:for, :nick, :values, :descriptions]) { |message, parser|
-	values			= message[:values].split(" ");
-	descriptions	= message[:descriptions].split(", ").map { |desc| desc.gsub(" ", "_").to_sym };
-	message.delete(:values)
-	message.delete(:descriptions)
-	0.upto([values.length, descriptions.length].min-1) { |index|
-		message[descriptions[index]]	= values[index]
-	}
-}
-add("318", :RPL_ENDOFWHOIS)
-add("319", :RPL_WHOISCHANNELS, /^([^\s]+) ([^\s]+) :(.*)/, [:for, :nick, :channels]) { |message, parser|
-	# FIXME
-	message.alter_member(:channels, message.channels.split(" ").map { |channel| parser.channels.create(channel) })
-}
+# Seen:
+#   - hyperion-1.0.2b (irc.freenode.net)
+add("290", :RPL_IDENTIFY_MSG)
+
+# Seen:
+#  - ConferenceRoom (irc.bluewin.ch), sent if a nick is registered
+add("307", :RPL_REGISTERED_INFO)	
 add("320", :RPL_IDENTIFIED_TO_SERVICES) # possibly hyperion only
-add("321", :RPL_LISTSTART)
-add("322", :RPL_LIST, /^([^\s]+) ([^\s]+) (\d+) :(.*)/, [:for, :channelname, :usercount, :topic])
-add("323", :RPL_LISTEND)
-add("324", :RPL_CHANNELMODEIS)
-add("325", :RPL_UNIQOPIS)
-add("331", :RPL_NOTOPIC)
-		# :irc.server.net 332 YourNickname #channel :Topic
-add("332", :RPL_TOPIC, /^([^\s]+) ([^\s]+) :(.*)/, [:for, :channel, :topic]) { |message, parser|
-	message.channel.topic.text = message[:topic]
-}
+add("329", :RPL_CHANNEL_INFO)		#channel creation time
 
-		# :irc.server.net 333 YourNickname #channel SetByNick 1139902138
-add("333", :RPL_TOPIC_INFO, /^([^\s]+) ([^\s]+) ([^\s]+) (\d+)/, [:for, :channel, :set_by, :set_at]) { |message, parser|
+# :irc.server.net 333 YourNickname #channel SetByNick 1139902138
+add("333", :RPL_TOPIC_INFO, /^(\S+) (\S+) (\S+) (\d+)/, [:for, :channel, :set_by, :set_at]) { |message, parser|
 	topic = message.channel.topic
 	topic.set_by = message[:set_by]
 	topic.set_at = message[:set_at]
 }
-add("341", :RPL_INVITING)
-add("342", :RPL_SUMMONING)
 add("343", :RPL__MAINTENANCE)	#mainenance notice?
-add("346", :RPL_INVITELIST)
-add("347", :RPL_ENDOFINVITELIST)
-add("348", :RPL_EXCEPTLIST)
-add("349", :RPL_ENDOFEXCEPTLIST)
-add("351", :RPL_VERSION)
-		# :irc.server.net 352 YourNickname <channel> <user> <host> <server> <nick> ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] :<hopcount> <real name>
-add("352", :RPL_WHOREPLY,
-			/([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+) ([HG])[*%]{0,2}([@+-]{0,3}) :(\d+) (.*)/,
-			[:for, :channel, :user, :host, :server, :nick, :status, :flags, :hopcount, :real]) { |message, parser|
-#"for", "channel", "user", "host", "server", "nick", "status", "flags", "hopcount", "real"
-	user	= parser.users.create(message[:nick])
-	user.update(message[:user], message[:host], message[:real])
-	user.away	= message[:status] == "G"
-	user.add_channel(message.channel, :joined)
-	message.channel.add_user(user, :joined)
-	user.add_flags(message.channel, message[:flags].to_flags)
-}
-add("353", :RPL_NAMEREPLY, /([^\s]+) [=@] ([^\s]+) :(.*)/, [:for, :channel, :users]) { |message, parser|
-	users	= message[:users]
-	message.alter_member(:users, [])
-	users.split(/ /).each { |nick|
-		user	= parser.users.create(nick)
-		message[:users]	<< user
-		user.add_channel(message.channel, :joined)
-		message.channel.add_user(user, :joined)
-	}
-}
-add("361", :RPL_KILLDONE)
-add("362", :RPL_CLOSING)
-add("363", :RPL_CLOSEEND)
-add("364", :RPL_LINKS)
-add("365", :RPL_ENDOFLINKS)
-add("366", :RPL_ENDOFNAMES)
-add("367", :RPL_BANLIST,
-			/([^\s]+) ([^\s]+) ([^\s]+) ([^\s]+) (\d+)/,
-			[:for, :channel, :banmask, :banned_by, :bantime]
-) { |message, parser| #367 nickname #channel nick!user@host nickname 1140125288
-	message[:bantime]	= Time.at(message[:bantime].to_i)
-	message[:banmask]	= Hostmask.new(message[:banmask])
-}
+add("377", :UNK_377)
+
 
-add("368", :RPL_ENDOFBANLIST)
-add("369", :RPL_ENDOFWHOWAS)
-add("371", :RPL_INFO)
-add("372", :RPL_MOTD)
-add("373", :RPL_INFOSTART)
-add("374", :RPL_ENDOFINFO)
-add("375", :RPL_MOTDSTART)
-add("376", :RPL_ENDOFMOTD)
-add("381", :RPL_YOUREOPER)
-add("382", :RPL_REHASHING)
-add("383", :RPL_YOURESERVICE)
-add("384", :RPL_MYPORTIS)
 add("386", :RPL_PASSWORDACCEPTED) # Custom (chatroom)
-add("391", :RPL_TIME)
-add("392", :RPL_USERSSTART)
-add("393", :RPL_USERS)
-add("394", :RPL_ENDOFUSERS)
-add("395", :RPL_NOUSERS)
 
-#4** Codes
-add("401", :ERR_NOSUCHNICK)
-add("402", :ERR_NOSUCHSERVER)
-add("403", :ERR_NOSUCHCHANNEL)
-add("404", :ERR_CANNOTSENDTOCHAN)
-add("405", :ERR_TOOMANYCHANNELS)
-add("406", :ERR_WASNOSUCHNICK)
-add("407", :ERR_TOOMANYTARGETS)
-add("408", :ERR_NOSUCHSERVICE)
-add("409", :ERR_NOORIGIN)
-add("411", :ERR_NORECIPIENT)
-add("412", :ERR_NOTEXTTOSEND)
-add("413", :ERR_NOTOPLEVEL)
-add("414", :ERR_WILDTOPLEVEL)
-add("415", :ERR_BADMASK)
-add("421", :ERR_UNKNOWNCOMMAND)
-add("422", :ERR_NOMOTD)
-add("423", :ERR_NOADMININFO)
-add("424", :ERR_FILEERROR)
-add("431", :ERR_NONICKNAMEGIVEN)
-add("432", :ERR_ERRONEUSNICKNAME)
-add("433", :ERR_NICKNAMEINUSE)
-add("436", :ERR_NICKCOLLISION)
-add("437", :ERR_UNAVAILRESOURCE)
-add("441", :ERR_USERNOTINCHANNEL)
-add("442", :ERR_NOTONCHANNEL)
-add("443", :ERR_USERONCHANNEL)
-add("444", :ERR_NOLOGIN)
-add("445", :ERR_SUMMONDISABLED)
-add("446", :ERR_USERSDISABLED)
-add("451", :ERR_NOTREGISTERED)
-add("461", :ERR_NEEDMOREPARAMS)
-add("462", :ERR_ALREADYREGISTRED)
-add("463", :ERR_NOPERMFORHOST)
-add("464", :ERR_PASSWDMISMATCH)
-add("465", :ERR_YOUREBANNEDCREEP)
-add("466", :ERR_YOUWILLBEBANNED)
-add("467", :ERR_KEYSET)
-add("471", :ERR_CHANNELISFULL)
-add("472", :ERR_UNKNOWNMODE)
-add("473", :ERR_INVITEONLYCHAN)
-add("474", :ERR_BANNEDFROMCHAN)
-add("475", :ERR_BADCHANNELKEY)
-add("476", :ERR_BADCHANMASK)
-add("477", :ERR_NOCHANMODES)
-add("478", :ERR_BANLISTFULL)
-add("481", :ERR_NOPRIVILEGES)
-add("482", :ERR_CHANOPRIVSNEEDED)
-add("483", :ERR_CANTKILLSERVER)
-add("484", :ERR_RESTRICTED)
-add("485", :ERR_UNIQOPPRIVSNEEDED)
-add("491", :ERR_NOOPERHOST)
-add("492", :ERR_NOSERVICEHOST)
+# Seen:
+#   - ircu (undernet)
+add("396", :RPL_HOSTHIDDEN, /^(\S+) (?:(.*?)@)?([:\S]+) :(.*)/, [:nick, :user, :displayed_host, :text]) { |message, parser|
+	parser.users.myself.force_update(nil, message.displayed_host, nil)
+}
 
-	#5** Codes
-add("501", :ERR_UMODEUNKNOWNFLAG)
-add("502", :ERR_USERSDONTMATCH)
 add("505", :ERR__NOPRIVMSG)