rbot 0.9.10 → 0.9.12

data/lib/rbot/post-config.rb

@@ -3,6 +3,7 @@ File.open("pkgconfig.rb", "w") {|f|
   f.puts "module Irc"
   f.puts "  module PKGConfig"
   f.puts "    DATADIR = '#{config('datadir')}/rbot'"
+  f.puts "    COREDIR = '#{config('rbdir')}/rbot/core'"
   f.puts "  end"
   f.puts "end"
 }

data/lib/rbot/rbotconfig.rb

@@ -1,31 +1,44 @@
 module Irc
+class Bot
   module Config
-    @@datadir = nil
+    unless defined?(@@datadir)
+      @@datadir = nil
 
-    # first try for the default path to the data dir    
-    defaultdir = File.expand_path(File.dirname($0) + '/../data')
+      defaultdatadir = File.expand_path(File.dirname($0) + '/../data/rbot')
 
-    if File.directory? "#{defaultdir}/rbot"
-      @@datadir = "#{defaultdir}/rbot"
+      if File.directory? defaultdatadir
+        @@datadir = defaultdatadir
+      end
+    end
+
+    unless defined?(@@coredir)
+      @@coredir = nil
+
+      defaultcoredir = File.expand_path(File.dirname($0) + '/../lib/rbot/core')
+
+      if File.directory? defaultcoredir
+        @@coredir = defaultcoredir
+      end
     end
-    
+
     # setup pkg-based configuration - i.e. where were we installed to, where
     # are our data files, etc.
-    if @@datadir.nil?
+    if @@datadir.nil? or @@coredir.nil?
       begin
         debug "trying to load rubygems"
         require 'rubygems'
-        debug "loaded rubygems, looking for rbot-#$version"
-        if $version =~ /(.*)-svn\Z/
+        if $version =~ /^(.*)-(?:git|rc\d)(?: .*)?$/
           version = $1
         else
           version = $version
         end
+        debug "loaded rubygems, looking for rbot version #{$version} (rbot-#{version})"
         gemname, gem = Gem.source_index.find{|name, spec| spec.name == 'rbot' && spec.version.version == version}
         debug "got gem #{gem}"
         if gem && path = gem.full_gem_path
           debug "installed via rubygems to #{path}"
           @@datadir = "#{path}/data/rbot"
+          @@coredir = "#{path}/lib/rbot/core"
         else
           debug "not installed via rubygems"
         end
@@ -34,18 +47,24 @@ module Irc
       end
     end
 
-    if @@datadir.nil?
+    if @@datadir.nil? or @@coredir.nil?
       begin
         require 'rbot/pkgconfig'
         @@datadir = PKGConfig::DATADIR
+        @@coredir = PKGConfig::COREDIR
       rescue LoadError
-        error "fatal - no way to determine data dir"
+        error "fatal - no way to determine data or core dir"
         exit 2
       end
     end
-    
+
     def Config.datadir
       @@datadir
     end
+
+    def Config.coredir
+      @@coredir
+    end
   end
 end
+end

data/lib/rbot/registry.rb

@@ -1,10 +1,11 @@
 require 'rbot/dbhash'
 
 module Irc
+class Bot
 
-  # this class is now used purely for upgrading from prior versions of rbot
+  # This class is now used purely for upgrading from prior versions of rbot
   # the new registry is split into multiple DBHash objects, one per plugin
-  class BotRegistry
+  class Registry
     def initialize(bot)
       @bot = bot
       upgrade_data
@@ -16,7 +17,7 @@ module Irc
     # work with is @bot.botclass.
     def upgrade_data
       if File.exist?("#{@bot.botclass}/registry.db")
-        log "upgrading old-style (rbot 0.9.5 or earlier) plugin registry to new format"
+        log _("upgrading old-style (rbot 0.9.5 or earlier) plugin registry to new format")
         old = BDB::Hash.open("#{@bot.botclass}/registry.db", nil,
                              "r+", 0600)
         new = BDB::CIBtree.open("#{@bot.botclass}/plugin_registry.db", nil,
@@ -34,9 +35,9 @@ module Irc
     def upgrade_data2
       if File.exist?("#{@bot.botclass}/plugin_registry.db")
         Dir.mkdir("#{@bot.botclass}/registry") unless File.exist?("#{@bot.botclass}/registry")
-        env = BDB::Env.open("#{@bot.botclass}", BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER )
+        env = BDB::Env.open("#{@bot.botclass}", BDB::INIT_TRANSACTION | BDB::CREATE | BDB::RECOVER)# | BDB::TXN_NOSYNC)
         dbs = Hash.new
-        log "upgrading previous (rbot 0.9.9 or earlier) plugin registry to new split format"
+        log _("upgrading previous (rbot 0.9.9 or earlier) plugin registry to new split format")
         old = BDB::CIBtree.open("#{@bot.botclass}/plugin_registry.db", nil,
           "r+", 0600, "env" => env)
         old.each {|k,v|
@@ -49,13 +50,13 @@ module Irc
             dirs.length.times { |i|
               dir = dirs[0,i+1].join("/")+"/"
               unless File.exist?(dir)
-                log "creating subregistry directory #{dir}"
-                Dir.mkdir(dir) 
+                log _("creating subregistry directory #{dir}")
+                Dir.mkdir(dir)
               end
             }
           end
           unless dbs.has_key?(prefix)
-            log "creating db #{@bot.botclass}/registry/#{prefix}.db"
+            log _("creating db #{@bot.botclass}/registry/#{prefix}.db")
             dbs[prefix] = BDB::CIBtree.open("#{@bot.botclass}/registry/#{prefix}.db",
               nil, BDB::CREATE | BDB::EXCL,
               0600, "env" => env)
@@ -65,13 +66,12 @@ module Irc
         old.close
         File.rename("#{@bot.botclass}/plugin_registry.db", "#{@bot.botclass}/plugin_registry.db.old")
         dbs.each {|k,v|
-          log "closing db #{k}"
+          log _("closing db #{k}")
           v.close
         }
         env.close
       end
     end
-  end
 
 
   # This class provides persistent storage for plugins via a hash interface.
@@ -94,7 +94,7 @@ module Irc
   # in object store mode, don't make the mistake of treating it like a live
   # object, e.g. (using the example above)
   #   @registry[:blah][:foo] = "flump"
-  # will NOT modify the object in the registry - remember that BotRegistry#[]
+  # will NOT modify the object in the registry - remember that Registry#[]
   # returns a Marshal.restore'd object, the object you just modified in place
   # will disappear. You would need to:
   #   blah = @registry[:blah]
@@ -117,32 +117,46 @@ module Irc
   # Your plugins section of the registry is private, it has its own namespace
   # (derived from the plugin's class name, so change it and lose your data).
   # Calls to registry.each etc, will only iterate over your namespace.
-  class BotRegistryAccessor
-    # plugins don't call this - a BotRegistryAccessor is created for them and
+  class Accessor
+
+    attr_accessor :recovery
+
+    # plugins don't call this - a Registry::Accessor is created for them and
     # is accessible via @registry.
     def initialize(bot, name)
       @bot = bot
       @name = name.downcase
-      dirs = File.dirname("#{@bot.botclass}/registry/#{@name}").split("/")
+      @filename = "#{@bot.botclass}/registry/#{@name}"
+      dirs = File.dirname(@filename).split("/")
       dirs.length.times { |i|
         dir = dirs[0,i+1].join("/")+"/"
         unless File.exist?(dir)
           debug "creating subregistry directory #{dir}"
-          Dir.mkdir(dir) 
+          Dir.mkdir(dir)
         end
       }
-      @registry = DBTree.new bot, "registry/#{@name}"
+      @filename << ".db"
+      @registry = nil
       @default = nil
+      @recovery = nil
       # debug "initializing registry accessor with name #{@name}"
     end
 
+    def registry
+        @registry ||= DBTree.new @bot, "registry/#{@name}"
+    end
+
     def flush
-      @registry.flush
-      @registry.sync
+      # debug "fushing registry #{registry}"
+      return if !@registry
+      registry.flush
+      registry.sync
     end
 
     def close
-      @registry.close
+      # debug "closing registry #{registry}"
+      return if !@registry
+      registry.close
     end
 
     # convert value to string form for storing in the registry
@@ -167,84 +181,93 @@ module Irc
       begin
         Marshal.restore(val)
       rescue Exception => e
-        warning "failed to restore marshal data for #{val.inspect}, falling back to default"
-        debug e.inspect
-        debug e.backtrace.join("\n")
-        if @default != nil
+        error _("failed to restore marshal data for #{val.inspect}, attempting recovery or fallback to default")
+        debug e
+        if defined? @recovery and @recovery
           begin
-            return Marshal.restore(@default)
-          rescue
-            return nil
+            return @recovery.call(val)
+          rescue Exception => ee
+            error _("marshal recovery failed, trying default")
+            debug ee
           end
-        else
-          return nil
         end
+        return default
       end
     end
 
     # lookup a key in the registry
     def [](key)
-      if @registry.has_key?(key)
-        return restore(@registry[key])
-      elsif @default != nil
-        return restore(@default)
+      if File.exist?(@filename) && registry.has_key?(key)
+        return restore(registry[key])
       else
-        return nil
+        return default
       end
     end
 
     # set a key in the registry
     def []=(key,value)
-      @registry[key] = store(value)
+      registry[key] = store(value)
     end
 
     # set the default value for registry lookups, if the key sought is not
     # found, the default will be returned. The default default (har) is nil.
     def set_default (default)
-      @default = store(default)
+      @default = default
+    end
+
+    def default
+      @default && (@default.dup rescue @default)
     end
 
     # just like Hash#each
     def each(&block)
-      @registry.each {|key,value|
+      return nil unless File.exist?(@filename)
+      registry.each {|key,value|
         block.call(key, restore(value))
       }
     end
 
     # just like Hash#each_key
     def each_key(&block)
-      @registry.each {|key, value|
+      return nil unless File.exist?(@filename)
+      registry.each {|key, value|
         block.call(key)
       }
     end
 
     # just like Hash#each_value
     def each_value(&block)
-      @registry.each {|key, value|
+      return nil unless File.exist?(@filename)
+      registry.each {|key, value|
         block.call(restore(value))
       }
     end
 
     # just like Hash#has_key?
     def has_key?(key)
-      return @registry.has_key?(key)
+      return false unless File.exist?(@filename)
+      return registry.has_key?(key)
     end
     alias include? has_key?
     alias member? has_key?
+    alias key? has_key?
 
     # just like Hash#has_both?
     def has_both?(key, value)
-      return @registry.has_both?(key, store(value))
+      return false unless File.exist?(@filename)
+      return registry.has_both?(key, store(value))
     end
 
     # just like Hash#has_value?
     def has_value?(value)
-      return @registry.has_value?(store(value))
+      return false unless File.exist?(@filename)
+      return registry.has_value?(store(value))
     end
 
     # just like Hash#index?
     def index(value)
-      ind = @registry.index(store(value))
+      return nil unless File.exist?(@filename)
+      ind = registry.index(store(value))
       if ind
         return ind
       else
@@ -254,18 +277,21 @@ module Irc
 
     # delete a key from the registry
     def delete(key)
-      return @registry.delete(key)
+      return default unless File.exist?(@filename)
+      return registry.delete(key)
     end
 
     # returns a list of your keys
     def keys
-      return @registry.keys
+      return [] unless File.exist?(@filename)
+      return registry.keys
     end
 
     # Return an array of all associations [key, value] in your namespace
     def to_a
+      return [] unless File.exist?(@filename)
       ret = Array.new
-      @registry.each {|key, value|
+      registry.each {|key, value|
         ret << [key, restore(value)]
       }
       return ret
@@ -273,8 +299,9 @@ module Irc
 
     # Return an hash of all associations {key => value} in your namespace
     def to_hash
+      return {} unless File.exist?(@filename)
       ret = Hash.new
-      @registry.each {|key, value|
+      registry.each {|key, value|
         ret[key] = restore(value)
       }
       return ret
@@ -282,12 +309,14 @@ module Irc
 
     # empties the registry (restricted to your namespace)
     def clear
-      @registry.clear
+      return true unless File.exist?(@filename)
+      registry.clear
     end
     alias truncate clear
 
     # returns an array of the values in your namespace of the registry
     def values
+      return [] unless File.exist?(@filename)
       ret = Array.new
       self.each {|k,v|
         ret << restore(v)
@@ -296,7 +325,7 @@ module Irc
     end
 
     def sub_registry(prefix)
-      return BotRegistryAccessor.new(@bot, @name + "/" + prefix)
+      return Accessor.new(@bot, @name + "/" + prefix.to_s)
     end
 
     # returns the number of keys in your registry namespace
@@ -307,4 +336,6 @@ module Irc
 
   end
 
+  end
+end
 end

data/lib/rbot/rfc2812.rb

@@ -1,35 +1,50 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: RFC 2821 Client Protocol module
+#
+# This module defines the Irc::Client class, a class that can handle and
+# dispatch messages based on RFC 2821 (Internet Relay Chat: Client Protocol)
+
 module Irc
-  # RFC 2812   Internet Relay Chat: Client Protocol
-  #
-  RPL_WELCOME=001
+  # - The server sends Replies 001 to 004 to a user upon
+  #   successful registration.
+
   # "Welcome to the Internet Relay Network
   # <nick>!<user>@<host>"
-  RPL_YOURHOST=002
+  #
+  RPL_WELCOME=001
+
   # "Your host is <servername>, running version <ver>"
-  RPL_CREATED=003
+  RPL_YOURHOST=002
+
   # "This server was created <date>"
+  RPL_CREATED=003
+
+  # "<servername> <version> <available user modes> <available channel modes>"
   RPL_MYINFO=004
-  # "<servername> <version> <available user modes>
-  # <available channel modes>"
+
+  # "005 nick PREFIX=(ov)@+ CHANTYPES=#& :are supported by this server"
   #
-  # - The server sends Replies 001 to 004 to a user upon
-  # successful registration.
+  # defines the capabilities supported by the server.
   #
-  # RPL_BOUNCE=005
-  # # "Try server <server name>, port <port number>"
-  RPL_ISUPPORT=005
-  # "005 nick PREFIX=(ov)@+ CHANTYPES=#& :are supported by this server"
+  # Previous RFCs defined message 005 as follows:
   #
   # - Sent by the server to a user to suggest an alternative
-  # server.  This is often used when the connection is
-  # refused because the server is already full.
+  #   server.  This is often used when the connection is
+  #   refused because the server is already full.
   #
-  RPL_USERHOST=302
+  # # "Try server <server name>, port <port number>"
+  #
+  # RPL_BOUNCE=005
+  #
+  RPL_ISUPPORT=005
+
   # ":*1<reply> *( " " <reply> )"
   #
   # - Reply format used by USERHOST to list replies to
-  # the query list.  The reply string is composed as
-  # follows:
+  #   the query list.  The reply string is composed as
+  #   follows:
   #
   # reply = nickname [ "*" ] "=" ( "+" / "-" ) hostname
   #
@@ -38,138 +53,158 @@ module Irc
   # whether the client has set an AWAY message or not
   # respectively.
   #
-  RPL_ISON=303
+  RPL_USERHOST=302
+
   # ":*1<nick> *( " " <nick> )"
   #
   # - Reply format used by ISON to list replies to the
-  # query list.
+  #   query list.
   #
-  RPL_AWAY=301
+  RPL_ISON=303
+
+  # - These replies are used with the AWAY command (if
+  #   allowed).  RPL_AWAY is sent to any client sending a
+  #   PRIVMSG to a client which is away.  RPL_AWAY is only
+  #   sent by the server to which the client is connected.
+  #   Replies RPL_UNAWAY and RPL_NOWAWAY are sent when the
+  #   client removes and sets an AWAY message.
+
   # "<nick> :<away message>"
-  RPL_UNAWAY=305
+  RPL_AWAY=301
+
   # ":You are no longer marked as being away"
-  RPL_NOWAWAY=306
+  RPL_UNAWAY=305
+
   # ":You have been marked as being away"
-  #
-  # - These replies are used with the AWAY command (if
-  # allowed).  RPL_AWAY is sent to any client sending a
-  # PRIVMSG to a client which is away.  RPL_AWAY is only
-  # sent by the server to which the client is connected.
-  # Replies RPL_UNAWAY and RPL_NOWAWAY are sent when the
-  # client removes and sets an AWAY message.
-  #
-  RPL_WHOISUSER=311
+  RPL_NOWAWAY=306
+
+  # - Replies 311 - 313, 317 - 319 are all replies
+  #   generated in response to a WHOIS message.  Given that
+  #   there are enough parameters present, the answering
+  #   server MUST either formulate a reply out of the above
+  #   numerics (if the query nick is found) or return an
+  #   error reply.  The '*' in RPL_WHOISUSER is there as
+  #   the literal character and not as a wild card.  For
+  #   each reply set, only RPL_WHOISCHANNELS may appear
+  #   more than once (for long lists of channel names).
+  #   The '@' and '+' characters next to the channel name
+  #   indicate whether a client is a channel operator or
+  #   has been granted permission to speak on a moderated
+  #   channel.  The RPL_ENDOFWHOIS reply is used to mark
+  #   the end of processing a WHOIS message.
+
   # "<nick> <user> <host> * :<real name>"
-  RPL_WHOISSERVER=312
+  RPL_WHOISUSER=311
+
   # "<nick> <server> :<server info>"
-  RPL_WHOISOPERATOR=313
+  RPL_WHOISSERVER=312
+
   # "<nick> :is an IRC operator"
-  RPL_WHOISIDLE=317
+  RPL_WHOISOPERATOR=313
+
   # "<nick> <integer> :seconds idle"
-  RPL_ENDOFWHOIS=318
+  RPL_WHOISIDLE=317
+
   # "<nick> :End of WHOIS list"
-  RPL_WHOISCHANNELS=319
+  RPL_ENDOFWHOIS=318
+
   # "<nick> :*( ( "@" / "+" ) <channel> " " )"
-  #
-  # - Replies 311 - 313, 317 - 319 are all replies
-  # generated in response to a WHOIS message.  Given that
-  # there are enough parameters present, the answering
-  # server MUST either formulate a reply out of the above
-  # numerics (if the query nick is found) or return an
-  # error reply.  The '*' in RPL_WHOISUSER is there as
-  # the literal character and not as a wild card.  For
-  # each reply set, only RPL_WHOISCHANNELS may appear
-  # more than once (for long lists of channel names).
-  # The '@' and '+' characters next to the channel name
-  # indicate whether a client is a channel operator or
-  # has been granted permission to speak on a moderated
-  # channel.  The RPL_ENDOFWHOIS reply is used to mark
-  # the end of processing a WHOIS message.
-  #
-  RPL_WHOWASUSER=314
+  RPL_WHOISCHANNELS=319
+
+  # - When replying to a WHOWAS message, a server MUST use
+  #   the replies RPL_WHOWASUSER, RPL_WHOISSERVER or
+  #   ERR_WASNOSUCHNICK for each nickname in the presented
+  #   list.  At the end of all reply batches, there MUST
+  #   be RPL_ENDOFWHOWAS (even if there was only one reply
+  #   and it was an error).
+
   # "<nick> <user> <host> * :<real name>"
-  RPL_ENDOFWHOWAS=369
+  RPL_WHOWASUSER=314
+
   # "<nick> :End of WHOWAS"
-  #
-  # - When replying to a WHOWAS message, a server MUST use
-  # the replies RPL_WHOWASUSER, RPL_WHOISSERVER or
-  # ERR_WASNOSUCHNICK for each nickname in the presented
-  # list.  At the end of all reply batches, there MUST
-  # be RPL_ENDOFWHOWAS (even if there was only one reply
-  # and it was an error).
-  #
-  RPL_LISTSTART=321
+  RPL_ENDOFWHOWAS=369
+
+  # - Replies RPL_LIST, RPL_LISTEND mark the actual replies
+  #   with data and end of the server's response to a LIST
+  #   command.  If there are no channels available to return,
+  #   only the end reply MUST be sent.
+
   # Obsolete. Not used.
-  #
-  RPL_LIST=322
+  RPL_LISTSTART=321
+
   # "<channel> <# visible> :<topic>"
-  RPL_LISTEND=323
+  RPL_LIST=322
+
   # ":End of LIST"
-  #
-  # - Replies RPL_LIST, RPL_LISTEND mark the actual replies
-  # with data and end of the server's response to a LIST
-  # command.  If there are no channels available to return,
-  # only the end reply MUST be sent.
-  #
-  RPL_UNIQOPIS=325
+  RPL_LISTEND=323
+
   # "<channel> <nickname>"
-  #
-  RPL_CHANNELMODEIS=324
+  RPL_UNIQOPIS=325
+
   # "<channel> <mode> <mode params>"
-  #
-  RPL_NOTOPIC=331
+  RPL_CHANNELMODEIS=324
+
   # "<channel> :No topic is set"
-  RPL_TOPIC=332
-  # "<channel> :<topic>"
-  #
+  RPL_NOTOPIC=331
+
   # - When sending a TOPIC message to determine the
-  # channel topic, one of two replies is sent.  If
-  # the topic is set, RPL_TOPIC is sent back else
-  # RPL_NOTOPIC.
-  #
-  RPL_TOPIC_INFO=333
+  #   channel topic, one of two replies is sent.  If
+  #   the topic is set, RPL_TOPIC is sent back else
+  #   RPL_NOTOPIC.
+
+  # "<channel> :<topic>"
+  RPL_TOPIC=332
+
   # <channel> <set by> <unixtime>
-  RPL_INVITING=341
+  RPL_TOPIC_INFO=333
+
   # "<channel> <nick>"
   #
   # - Returned by the server to indicate that the
-  # attempted INVITE message was successful and is
-  # being passed onto the end client.
+  #   attempted INVITE message was successful and is
+  #   being passed onto the end client.
   #
-  RPL_SUMMONING=342
+  RPL_INVITING=341
+
   # "<user> :Summoning user to IRC"
   #
   # - Returned by a server answering a SUMMON message to
-  # indicate that it is summoning that user.
+  #   indicate that it is summoning that user.
   #
-  RPL_INVITELIST=346
+  RPL_SUMMONING=342
+
   # "<channel> <invitemask>"
-  RPL_ENDOFINVITELIST=347
+  RPL_INVITELIST=346
+
   # "<channel> :End of channel invite list"
   #
   # - When listing the 'invitations masks' for a given channel,
-  # a server is required to send the list back using the
-  # RPL_INVITELIST and RPL_ENDOFINVITELIST messages.  A
-  # separate RPL_INVITELIST is sent for each active mask.
-  # After the masks have been listed (or if none present) a
-  # RPL_ENDOFINVITELIST MUST be sent.
+  #   a server is required to send the list back using the
+  #   RPL_INVITELIST and RPL_ENDOFINVITELIST messages.  A
+  #   separate RPL_INVITELIST is sent for each active mask.
+  #   After the masks have been listed (or if none present) a
+  #   RPL_ENDOFINVITELIST MUST be sent.
   #
-  RPL_EXCEPTLIST=348
+  RPL_ENDOFINVITELIST=347
+
   # "<channel> <exceptionmask>"
-  RPL_ENDOFEXCEPTLIST=349
+  RPL_EXCEPTLIST=348
+
   # "<channel> :End of channel exception list"
   #
   # - When listing the 'exception masks' for a given channel,
-  # a server is required to send the list back using the
-  # RPL_EXCEPTLIST and RPL_ENDOFEXCEPTLIST messages.  A
-  # separate RPL_EXCEPTLIST is sent for each active mask.
-  # After the masks have been listed (or if none present)
-  # a RPL_ENDOFEXCEPTLIST MUST be sent.
+  #   a server is required to send the list back using the
+  #   RPL_EXCEPTLIST and RPL_ENDOFEXCEPTLIST messages.  A
+  #   separate RPL_EXCEPTLIST is sent for each active mask.
+  #   After the masks have been listed (or if none present)
+  #   a RPL_ENDOFEXCEPTLIST MUST be sent.
   #
-  RPL_VERSION=351
+  RPL_ENDOFEXCEPTLIST=349
+
   # "<version>.<debuglevel> <server> :<comments>"
   #
   # - Reply by the server showing its version details.
+  #
   # The <version> is the version of the software being
   # used (including any patchlevel revisions) and the
   # <debuglevel> is used to indicate if the server is
@@ -178,276 +213,307 @@ module Irc
   # The "comments" field may contain any comments about
   # the version or further version details.
   #
-  RPL_WHOREPLY=352
+  RPL_VERSION=351
+
+  # - The RPL_WHOREPLY and RPL_ENDOFWHO pair are used
+  #   to answer a WHO message.  The RPL_WHOREPLY is only
+  #   sent if there is an appropriate match to the WHO
+  #   query.  If there is a list of parameters supplied
+  #   with a WHO message, a RPL_ENDOFWHO MUST be sent
+  #   after processing each list item with <name> being
+  #   the item.
+
   # "<channel> <user> <host> <server> <nick>
   # ( "H" / "G" > ["*"] [ ( "@" / "+" ) ]
   # :<hopcount> <real name>"
   #
-  RPL_ENDOFWHO=315
+  RPL_WHOREPLY=352
+
   # "<name> :End of WHO list"
-  #
-  # - The RPL_WHOREPLY and RPL_ENDOFWHO pair are used
-  # to answer a WHO message.  The RPL_WHOREPLY is only
-  # sent if there is an appropriate match to the WHO
-  # query.  If there is a list of parameters supplied
-  # with a WHO message, a RPL_ENDOFWHO MUST be sent
-  # after processing each list item with <name> being
-  # the item.
-  #
-  RPL_NAMREPLY=353
+  RPL_ENDOFWHO=315
+
+  # - To reply to a NAMES message, a reply pair consisting
+  #   of RPL_NAMREPLY and RPL_ENDOFNAMES is sent by the
+  #   server back to the client.  If there is no channel
+  #   found as in the query, then only RPL_ENDOFNAMES is
+  #   returned.  The exception to this is when a NAMES
+  #   message is sent with no parameters and all visible
+  #   channels and contents are sent back in a series of
+  #   RPL_NAMEREPLY messages with a RPL_ENDOFNAMES to mark
+  #   the end.
+
   # "( "=" / "*" / "@" ) <channel>
   # :[ "@" / "+" ] <nick> *( " " [ "@" / "+" ] <nick> )
   # - "@" is used for secret channels, "*" for private
   # channels, and "=" for others (public channels).
   #
-  RPL_ENDOFNAMES=366
+  RPL_NAMREPLY=353
+
   # "<channel> :End of NAMES list"
-  #
-  # - To reply to a NAMES message, a reply pair consisting
-  # of RPL_NAMREPLY and RPL_ENDOFNAMES is sent by the
-  # server back to the client.  If there is no channel
-  # found as in the query, then only RPL_ENDOFNAMES is
-  # returned.  The exception to this is when a NAMES
-  # message is sent with no parameters and all visible
-  # channels and contents are sent back in a series of
-  # RPL_NAMEREPLY messages with a RPL_ENDOFNAMES to mark
-  # the end.
-  #
-  RPL_LINKS=364
+  RPL_ENDOFNAMES=366
+
+  # - In replying to the LINKS message, a server MUST send
+  #   replies back using the RPL_LINKS numeric and mark the
+  #   end of the list using an RPL_ENDOFLINKS reply.
+
   # "<mask> <server> :<hopcount> <server info>"
-  RPL_ENDOFLINKS=365
+  RPL_LINKS=364
+
   # "<mask> :End of LINKS list"
-  #
-  # - In replying to the LINKS message, a server MUST send
-  # replies back using the RPL_LINKS numeric and mark the
-  # end of the list using an RPL_ENDOFLINKS reply.
-  #
-  RPL_BANLIST=367
+  RPL_ENDOFLINKS=365
+
+  # - When listing the active 'bans' for a given channel,
+  #   a server is required to send the list back using the
+  #   RPL_BANLIST and RPL_ENDOFBANLIST messages.  A separate
+  #   RPL_BANLIST is sent for each active banmask.  After the
+  #   banmasks have been listed (or if none present) a
+  #   RPL_ENDOFBANLIST MUST be sent.
+
   # "<channel> <banmask>"
-  RPL_ENDOFBANLIST=368
+  RPL_BANLIST=367
+
   # "<channel> :End of channel ban list"
-  #
-  # - When listing the active 'bans' for a given channel,
-  # a server is required to send the list back using the
-  # RPL_BANLIST and RPL_ENDOFBANLIST messages.  A separate
-  # RPL_BANLIST is sent for each active banmask.  After the
-  # banmasks have been listed (or if none present) a
-  # RPL_ENDOFBANLIST MUST be sent.
-  #
-  RPL_INFO=371
+  RPL_ENDOFBANLIST=368
+
+  # - A server responding to an INFO message is required to
+  #   send all its 'info' in a series of RPL_INFO messages
+  #   with a RPL_ENDOFINFO reply to indicate the end of the
+  #   replies.
+
   # ":<string>"
-  RPL_ENDOFINFO=374
+  RPL_INFO=371
+
   # ":End of INFO list"
-  #
-  # - A server responding to an INFO message is required to
-  # send all its 'info' in a series of RPL_INFO messages
-  # with a RPL_ENDOFINFO reply to indicate the end of the
-  # replies.
-  #
-  RPL_MOTDSTART=375
-  # ":- <server> Message of the day - "
-  RPL_MOTD=372
-  # ":- <text>"
-  RPL_ENDOFMOTD=376
-  # ":End of MOTD command"
-  #
+  RPL_ENDOFINFO=374
+
   # - When responding to the MOTD message and the MOTD file
   # is found, the file is displayed line by line, with
   # each line no longer than 80 characters, using
   # RPL_MOTD format replies.  These MUST be surrounded
   # by a RPL_MOTDSTART (before the RPL_MOTDs) and an
   # RPL_ENDOFMOTD (after).
-  #
-  RPL_YOUREOPER=381
+
+  # ":- <server> Message of the day - "
+  RPL_MOTDSTART=375
+
+  # ":- <text>"
+  RPL_MOTD=372
+
+  # ":End of MOTD command"
+  RPL_ENDOFMOTD=376
+
   # ":You are now an IRC operator"
   #
   # - RPL_YOUREOPER is sent back to a client which has
-  # just successfully issued an OPER message and gained
-  # operator status.
+  #   just successfully issued an OPER message and gained
+  #   operator status.
   #
-  RPL_REHASHING=382
+  RPL_YOUREOPER=381
+
   # "<config file> :Rehashing"
   #
   # - If the REHASH option is used and an operator sends
-  # a REHASH message, an RPL_REHASHING is sent back to
-  # the operator.
+  #   a REHASH message, an RPL_REHASHING is sent back to
+  #   the operator.
   #
-  RPL_YOURESERVICE=383
+  RPL_REHASHING=382
+
   # "You are service <servicename>"
   #
   # - Sent by the server to a service upon successful
-  # registration.
+  #   registration.
   #
-  RPL_TIME=391
+  RPL_YOURESERVICE=383
+
   # "<server> :<string showing server's local time>"
   #
   # - When replying to the TIME message, a server MUST send
-  # the reply using the RPL_TIME format above.  The string
-  # showing the time need only contain the correct day and
-  # time there.  There is no further requirement for the
-  # time string.
+  #   the reply using the RPL_TIME format above.  The string
+  #   showing the time need only contain the correct day and
+  #   time there.  There is no further requirement for the
+  #   time string.
   #
-  RPL_USERSSTART=392
+  RPL_TIME=391
+
+  # - If the USERS message is handled by a server, the
+  #   replies RPL_USERSTART, RPL_USERS, RPL_ENDOFUSERS and
+  #   RPL_NOUSERS are used.  RPL_USERSSTART MUST be sent
+  #   first, following by either a sequence of RPL_USERS
+  #   or a single RPL_NOUSER.  Following this is
+  #   RPL_ENDOFUSERS.
+
   # ":UserID   Terminal  Host"
-  RPL_USERS=393
+  RPL_USERSSTART=392
+
   # ":<username> <ttyline> <hostname>"
-  RPL_ENDOFUSERS=394
+  RPL_USERS=393
+
   # ":End of users"
-  RPL_NOUSERS=395
+  RPL_ENDOFUSERS=394
+
   # ":Nobody logged in"
+  RPL_NOUSERS=395
+
+  # - The RPL_TRACE* are all returned by the server in
+  #   response to the TRACE message.  How many are
+  #   returned is dependent on the TRACE message and
+  #   whether it was sent by an operator or not.  There
+  #   is no predefined order for which occurs first.
+  #   Replies RPL_TRACEUNKNOWN, RPL_TRACECONNECTING and
+  #   RPL_TRACEHANDSHAKE are all used for connections
+  #   which have not been fully established and are either
+  #   unknown, still attempting to connect or in the
+  #   process of completing the 'server handshake'.
+  #   RPL_TRACELINK is sent by any server which handles
+  #   a TRACE message and has to pass it on to another
+  #   server.  The list of RPL_TRACELINKs sent in
+  #   response to a TRACE command traversing the IRC
+  #   network should reflect the actual connectivity of
+  #   the servers themselves along that path.
   #
-  # - If the USERS message is handled by a server, the
-  # replies RPL_USERSTART, RPL_USERS, RPL_ENDOFUSERS and
-  # RPL_NOUSERS are used.  RPL_USERSSTART MUST be sent
-  # first, following by either a sequence of RPL_USERS
-  # or a single RPL_NOUSER.  Following this is
-  # RPL_ENDOFUSERS.
-  #
-  RPL_TRACELINK=200
+  # RPL_TRACENEWTYPE is to be used for any connection
+  # which does not fit in the other categories but is
+  # being displayed anyway.
+  # RPL_TRACEEND is sent to indicate the end of the list.
+
   # "Link <version & debug level> <destination>
   # <next server> V<protocol version>
   # <link uptime in seconds> <backstream sendq>
   # <upstream sendq>"
-  RPL_TRACECONNECTING=201
+  RPL_TRACELINK=200
+
   # "Try. <class> <server>"
-  RPL_TRACEHANDSHAKE=202
+  RPL_TRACECONNECTING=201
+
   # "H.S. <class> <server>"
-  RPL_TRACEUNKNOWN=203
+  RPL_TRACEHANDSHAKE=202
+
   # "???? <class> [<client IP address in dot form>]"
-  RPL_TRACEOPERATOR=204
+  RPL_TRACEUNKNOWN=203
+
   # "Oper <class> <nick>"
-  RPL_TRACEUSER=205
+  RPL_TRACEOPERATOR=204
+
   # "User <class> <nick>"
-  RPL_TRACESERVER=206
+  RPL_TRACEUSER=205
+
   # "Serv <class> <int>S <int>C <server>
   # <nick!user|*!*>@<host|server> V<protocol version>"
-  RPL_TRACESERVICE=207
+  RPL_TRACESERVER=206
+
   # "Service <class> <name> <type> <active type>"
-  RPL_TRACENEWTYPE=208
+  RPL_TRACESERVICE=207
+
   # "<newtype> 0 <client name>"
-  RPL_TRACECLASS=209
+  RPL_TRACENEWTYPE=208
+
   # "Class <class> <count>"
-  RPL_TRACERECONNECT=210
+  RPL_TRACECLASS=209
+
   # Unused.
-  RPL_TRACELOG=261
+  RPL_TRACERECONNECT=210
+
   # "File <logfile> <debug level>"
-  RPL_TRACEEND=262
+  RPL_TRACELOG=261
+
   # "<server name> <version & debug level> :End of TRACE"
-  #
-  # - The RPL_TRACE* are all returned by the server in
-  # response to the TRACE message.  How many are
-  # returned is dependent on the TRACE message and
-  # whether it was sent by an operator or not.  There
-  # is no predefined order for which occurs first.
-  # Replies RPL_TRACEUNKNOWN, RPL_TRACECONNECTING and
-  # RPL_TRACEHANDSHAKE are all used for connections
-  # which have not been fully established and are either
-  # unknown, still attempting to connect or in the
-  # process of completing the 'server handshake'.
-  # RPL_TRACELINK is sent by any server which handles
-  # a TRACE message and has to pass it on to another
-  # server.  The list of RPL_TRACELINKs sent in
-  # response to a TRACE command traversing the IRC
-  # network should reflect the actual connectivity of
-  # the servers themselves along that path.
-  #
-  # RPL_TRACENEWTYPE is to be used for any connection
-  # which does not fit in the other categories but is
-  # being displayed anyway.
-  # RPL_TRACEEND is sent to indicate the end of the list.
-  #
-  RPL_LOCALUSERS=265
+  RPL_TRACEEND=262
+
   # ":Current local  users: 3  Max: 4"
-  RPL_GLOBALUSERS=266
+  RPL_LOCALUSERS=265
+
   # ":Current global users: 3  Max: 4"
-  RPL_STATSCONN=250
+  RPL_GLOBALUSERS=266
+
   # "::Highest connection count: 4 (4 clients) (251 since server was
   # (re)started)"
-  RPL_STATSLINKINFO=211
+  RPL_STATSCONN=250
+
   # "<linkname> <sendq> <sent messages>
   # <sent Kbytes> <received messages>
   # <received Kbytes> <time open>"
   #
   # - reports statistics on a connection.  <linkname>
-  # identifies the particular connection, <sendq> is
-  # the amount of data that is queued and waiting to be
-  # sent <sent messages> the number of messages sent,
-  # and <sent Kbytes> the amount of data sent, in
-  # Kbytes. <received messages> and <received Kbytes>
-  # are the equivalent of <sent messages> and <sent
-  # Kbytes> for received data, respectively.  <time
-  # open> indicates how long ago the connection was
-  # opened, in seconds.
+  #   identifies the particular connection, <sendq> is
+  #   the amount of data that is queued and waiting to be
+  #   sent <sent messages> the number of messages sent,
+  #   and <sent Kbytes> the amount of data sent, in
+  #   Kbytes. <received messages> and <received Kbytes>
+  #   are the equivalent of <sent messages> and <sent
+  #   Kbytes> for received data, respectively.  <time
+  #   open> indicates how long ago the connection was
+  #   opened, in seconds.
   #
-  RPL_STATSCOMMANDS=212
+  RPL_STATSLINKINFO=211
+
   # "<command> <count> <byte count> <remote count>"
   #
   # - reports statistics on commands usage.
   #
-  RPL_ENDOFSTATS=219
+  RPL_STATSCOMMANDS=212
+
   # "<stats letter> :End of STATS report"
   #
-  RPL_STATSUPTIME=242
+  RPL_ENDOFSTATS=219
+
   # ":Server Up %d days %d:%02d:%02d"
   #
   # - reports the server uptime.
   #
-  RPL_STATSOLINE=243
+  RPL_STATSUPTIME=242
+
   # "O <hostmask> * <name>"
   #
   # - reports the allowed hosts from where user may become IRC
-  # operators.
+  #   operators.
   #
-  RPL_UMODEIS=221
+  RPL_STATSOLINE=243
+
   # "<user mode string>"
   #
   # - To answer a query about a client's own mode,
-  # RPL_UMODEIS is sent back.
+  #   RPL_UMODEIS is sent back.
   #
-  RPL_SERVLIST=234
+  RPL_UMODEIS=221
+
+  # - When listing services in reply to a SERVLIST message,
+  #   a server is required to send the list back using the
+  #   RPL_SERVLIST and RPL_SERVLISTEND messages.  A separate
+  #   RPL_SERVLIST is sent for each service.  After the
+  #   services have been listed (or if none present) a
+  #   RPL_SERVLISTEND MUST be sent.
+
   # "<name> <server> <mask> <type> <hopcount> <info>"
-  #
-  RPL_SERVLISTEND=235
+  RPL_SERVLIST=234
+
   # "<mask> <type> :End of service listing"
-  #
-  # - When listing services in reply to a SERVLIST message,
-  # a server is required to send the list back using the
-  # RPL_SERVLIST and RPL_SERVLISTEND messages.  A separate
-  # RPL_SERVLIST is sent for each service.  After the
-  # services have been listed (or if none present) a
-  # RPL_SERVLISTEND MUST be sent.
-  #
-  RPL_LUSERCLIENT=251
+  RPL_SERVLISTEND=235
+
+  # - In processing an LUSERS message, the server
+  #   sends a set of replies from RPL_LUSERCLIENT,
+  #   RPL_LUSEROP, RPL_USERUNKNOWN,
+  #   RPL_LUSERCHANNELS and RPL_LUSERME.  When
+  #   replying, a server MUST send back
+  #   RPL_LUSERCLIENT and RPL_LUSERME.  The other
+  #   replies are only sent back if a non-zero count
+  #   is found for them.
+
   # ":There are <integer> users and <integer>
   # services on <integer> servers"
-  RPL_LUSEROP=252
+  RPL_LUSERCLIENT=251
+
   # "<integer> :operator(s) online"
-  RPL_LUSERUNKNOWN=253
+  RPL_LUSEROP=252
+
   # "<integer> :unknown connection(s)"
-  RPL_LUSERCHANNELS=254
+  RPL_LUSERUNKNOWN=253
+
   # "<integer> :channels formed"
+  RPL_LUSERCHANNELS=254
+
+  # ":I have <integer> clients and <integer> servers"
   RPL_LUSERME=255
-  # ":I have <integer> clients and <integer>
-  # servers"
-  #
-  # - In processing an LUSERS message, the server
-  # sends a set of replies from RPL_LUSERCLIENT,
-  # RPL_LUSEROP, RPL_USERUNKNOWN,
-  # RPL_LUSERCHANNELS and RPL_LUSERME.  When
-  # replying, a server MUST send back
-  # RPL_LUSERCLIENT and RPL_LUSERME.  The other
-  # replies are only sent back if a non-zero count
-  # is found for them.
-  #
-  RPL_ADMINME=256
-  # "<server> :Administrative info"
-  RPL_ADMINLOC1=257
-  # ":<admin info>"
-  RPL_ADMINLOC2=258
-  # ":<admin info>"
-  RPL_ADMINEMAIL=259
-  # ":<admin info>"
-  #
+
   # - When replying to an ADMIN message, a server
   # is expected to use replies RPL_ADMINME
   # through to RPL_ADMINEMAIL and provide a text
@@ -458,323 +524,385 @@ module Irc
   # and finally the administrative contact for the
   # server (an email address here is REQUIRED)
   # in RPL_ADMINEMAIL.
-  #
-  RPL_TRYAGAIN=263
+
+  # "<server> :Administrative info"
+  RPL_ADMINME=256
+
+  # ":<admin info>"
+  RPL_ADMINLOC1=257
+
+  # ":<admin info>"
+  RPL_ADMINLOC2=258
+
+  # ":<admin info>"
+  RPL_ADMINEMAIL=259
+
   # "<command> :Please wait a while and try again."
   #
   # - When a server drops a command without processing it,
-  # it MUST use the reply RPL_TRYAGAIN to inform the
-  # originating client.
-  #
+  #   it MUST use the reply RPL_TRYAGAIN to inform the
+  #   originating client.
+  RPL_TRYAGAIN=263
+
   # 5.2 Error Replies
   #
   # Error replies are found in the range from 400 to 599.
-  #
-  ERR_NOSUCHNICK=401
+
   # "<nickname> :No such nick/channel"
   #
   # - Used to indicate the nickname parameter supplied to a
-  # command is currently unused.
+  #   command is currently unused.
   #
-  ERR_NOSUCHSERVER=402
+  ERR_NOSUCHNICK=401
+
   # "<server name> :No such server"
   #
   # - Used to indicate the server name given currently
-  # does not exist.
+  #   does not exist.
   #
-  ERR_NOSUCHCHANNEL=403
+  ERR_NOSUCHSERVER=402
+
   # "<channel name> :No such channel"
   #
   # - Used to indicate the given channel name is invalid.
   #
-  ERR_CANNOTSENDTOCHAN=404
+  ERR_NOSUCHCHANNEL=403
+
   # "<channel name> :Cannot send to channel"
   #
   # - Sent to a user who is either (a) not on a channel
-  # which is mode +n or (b) not a chanop (or mode +v) on
-  # a channel which has mode +m set or where the user is
-  # banned and is trying to send a PRIVMSG message to
-  # that channel.
+  #   which is mode +n or (b) not a chanop (or mode +v) on
+  #   a channel which has mode +m set or where the user is
+  #   banned and is trying to send a PRIVMSG message to
+  #   that channel.
   #
-  ERR_TOOMANYCHANNELS=405
+  ERR_CANNOTSENDTOCHAN=404
+
   # "<channel name> :You have joined too many channels"
   #
   # - Sent to a user when they have joined the maximum
-  # number of allowed channels and they try to join
-  # another channel.
+  #   number of allowed channels and they try to join
+  #   another channel.
   #
-  ERR_WASNOSUCHNICK=406
+  ERR_TOOMANYCHANNELS=405
+
   # "<nickname> :There was no such nickname"
   #
   # - Returned by WHOWAS to indicate there is no history
-  # information for that nickname.
+  #   information for that nickname.
   #
-  ERR_TOOMANYTARGETS=407
+  ERR_WASNOSUCHNICK=406
+
   # "<target> :<error code> recipients. <abort message>"
   #
   # - Returned to a client which is attempting to send a
-  # PRIVMSG/NOTICE using the user@host destination format
-  # and for a user@host which has several occurrences.
+  #   PRIVMSG/NOTICE using the user@host destination format
+  #   and for a user@host which has several occurrences.
   #
   # - Returned to a client which trying to send a
-  # PRIVMSG/NOTICE to too many recipients.
+  #   PRIVMSG/NOTICE to too many recipients.
   #
   # - Returned to a client which is attempting to JOIN a safe
-  # channel using the shortname when there are more than one
-  # such channel.
+  #   channel using the shortname when there are more than one
+  #   such channel.
   #
-  ERR_NOSUCHSERVICE=408
+  ERR_TOOMANYTARGETS=407
+
   # "<service name> :No such service"
   #
   # - Returned to a client which is attempting to send a SQUERY
-  # to a service which does not exist.
+  #   to a service which does not exist.
   #
-  ERR_NOORIGIN=409
+  ERR_NOSUCHSERVICE=408
+
   # ":No origin specified"
   #
   # - PING or PONG message missing the originator parameter.
   #
-  ERR_NORECIPIENT=411
+  ERR_NOORIGIN=409
+
   # ":No recipient given (<command>)"
-  ERR_NOTEXTTOSEND=412
+  ERR_NORECIPIENT=411
+
+  # - 412 - 415 are returned by PRIVMSG to indicate that
+  #   the message wasn't delivered for some reason.
+  #   ERR_NOTOPLEVEL and ERR_WILDTOPLEVEL are errors that
+  #   are returned when an invalid use of
+  #   "PRIVMSG $<server>" or "PRIVMSG #<host>" is attempted.
+
   # ":No text to send"
-  ERR_NOTOPLEVEL=413
+  ERR_NOTEXTTOSEND=412
+
   # "<mask> :No toplevel domain specified"
-  ERR_WILDTOPLEVEL=414
+  ERR_NOTOPLEVEL=413
+
   # "<mask> :Wildcard in toplevel domain"
-  ERR_BADMASK=415
+  ERR_WILDTOPLEVEL=414
+
   # "<mask> :Bad Server/host mask"
-  #
-  # - 412 - 415 are returned by PRIVMSG to indicate that
-  # the message wasn't delivered for some reason.
-  # ERR_NOTOPLEVEL and ERR_WILDTOPLEVEL are errors that
-  # are returned when an invalid use of
-  # "PRIVMSG $<server>" or "PRIVMSG #<host>" is attempted.
-  #
-  ERR_UNKNOWNCOMMAND=421
+  ERR_BADMASK=415
+
   # "<command> :Unknown command"
   #
   # - Returned to a registered client to indicate that the
-  # command sent is unknown by the server.
+  #   command sent is unknown by the server.
   #
-  ERR_NOMOTD=422
+  ERR_UNKNOWNCOMMAND=421
+
   # ":MOTD File is missing"
   #
   # - Server's MOTD file could not be opened by the server.
   #
-  ERR_NOADMININFO=423
+  ERR_NOMOTD=422
+
   # "<server> :No administrative info available"
   #
   # - Returned by a server in response to an ADMIN message
-  # when there is an error in finding the appropriate
-  # information.
+  #   when there is an error in finding the appropriate
+  #   information.
   #
-  ERR_FILEERROR=424
+  ERR_NOADMININFO=423
+
   # ":File error doing <file op> on <file>"
   #
   # - Generic error message used to report a failed file
-  # operation during the processing of a message.
+  #   operation during the processing of a message.
   #
-  ERR_NONICKNAMEGIVEN=431
+  ERR_FILEERROR=424
+
   # ":No nickname given"
   #
   # - Returned when a nickname parameter expected for a
-  # command and isn't found.
+  #   command and isn't found.
   #
-  ERR_ERRONEUSNICKNAME=432
+  ERR_NONICKNAMEGIVEN=431
+
   # "<nick> :Erroneous nickname"
   #
   # - Returned after receiving a NICK message which contains
-  # characters which do not fall in the defined set.  See
-  # section 2.3.1 for details on valid nicknames.
+  #   characters which do not fall in the defined set.  See
+  #   section 2.3.1 for details on valid nicknames.
   #
-  ERR_NICKNAMEINUSE=433
+  ERR_ERRONEUSNICKNAME=432
+
   # "<nick> :Nickname is already in use"
   #
   # - Returned when a NICK message is processed that results
-  # in an attempt to change to a currently existing
-  # nickname.
+  #   in an attempt to change to a currently existing
+  #   nickname.
   #
-  ERR_NICKCOLLISION=436
+  ERR_NICKNAMEINUSE=433
+
   # "<nick> :Nickname collision KILL from <user>@<host>"
   #
   # - Returned by a server to a client when it detects a
-  # nickname collision (registered of a NICK that
-  # already exists by another server).
+  #   nickname collision (registered of a NICK that
+  #   already exists by another server).
   #
-  ERR_UNAVAILRESOURCE=437
+  ERR_NICKCOLLISION=436
+
   # "<nick/channel> :Nick/channel is temporarily unavailable"
   #
   # - Returned by a server to a user trying to join a channel
-  # currently blocked by the channel delay mechanism.
+  #   currently blocked by the channel delay mechanism.
   #
   # - Returned by a server to a user trying to change nickname
-  # when the desired nickname is blocked by the nick delay
-  # mechanism.
+  #   when the desired nickname is blocked by the nick delay
+  #   mechanism.
   #
-  ERR_USERNOTINCHANNEL=441
+  ERR_UNAVAILRESOURCE=437
+
   # "<nick> <channel> :They aren't on that channel"
   #
   # - Returned by the server to indicate that the target
-  # user of the command is not on the given channel.
+  #   user of the command is not on the given channel.
   #
-  ERR_NOTONCHANNEL=442
+  ERR_USERNOTINCHANNEL=441
+
   # "<channel> :You're not on that channel"
   #
   # - Returned by the server whenever a client tries to
-  # perform a channel affecting command for which the
-  # client isn't a member.
+  #   perform a channel affecting command for which the
+  #   client isn't a member.
   #
-  ERR_USERONCHANNEL=443
+  ERR_NOTONCHANNEL=442
+
   # "<user> <channel> :is already on channel"
   #
   # - Returned when a client tries to invite a user to a
-  # channel they are already on.
+  #   channel they are already on.
   #
-  ERR_NOLOGIN=444
+  ERR_USERONCHANNEL=443
+
   # "<user> :User not logged in"
   #
   # - Returned by the summon after a SUMMON command for a
-  # user was unable to be performed since they were not
-  # logged in.
+  #   user was unable to be performed since they were not
+  #   logged in.
   #
-  #
-  ERR_SUMMONDISABLED=445
+  ERR_NOLOGIN=444
+
   # ":SUMMON has been disabled"
   #
   # - Returned as a response to the SUMMON command.  MUST be
-  # returned by any server which doesn't implement it.
+  #   returned by any server which doesn't implement it.
   #
-  ERR_USERSDISABLED=446
+  ERR_SUMMONDISABLED=445
+
   # ":USERS has been disabled"
   #
   # - Returned as a response to the USERS command.  MUST be
-  # returned by any server which does not implement it.
+  #   returned by any server which does not implement it.
   #
-  ERR_NOTREGISTERED=451
+  ERR_USERSDISABLED=446
+
   # ":You have not registered"
   #
   # - Returned by the server to indicate that the client
-  # MUST be registered before the server will allow it
-  # to be parsed in detail.
+  #   MUST be registered before the server will allow it
+  #   to be parsed in detail.
   #
-  ERR_NEEDMOREPARAMS=461
+  ERR_NOTREGISTERED=451
+
   # "<command> :Not enough parameters"
   #
   # - Returned by the server by numerous commands to
-  # indicate to the client that it didn't supply enough
-  # parameters.
+  #   indicate to the client that it didn't supply enough
+  #   parameters.
   #
-  ERR_ALREADYREGISTRED=462
+  ERR_NEEDMOREPARAMS=461
+
   # ":Unauthorized command (already registered)"
   #
   # - Returned by the server to any link which tries to
-  # change part of the registered details (such as
-  # password or user details from second USER message).
+  #   change part of the registered details (such as
+  #   password or user details from second USER message).
   #
-  ERR_NOPERMFORHOST=463
+  ERR_ALREADYREGISTRED=462
+
   # ":Your host isn't among the privileged"
   #
   # - Returned to a client which attempts to register with
-  # a server which does not been setup to allow
-  # connections from the host the attempted connection
-  # is tried.
+  #   a server which does not been setup to allow
+  #   connections from the host the attempted connection
+  #   is tried.
   #
-  ERR_PASSWDMISMATCH=464
+  ERR_NOPERMFORHOST=463
+
   # ":Password incorrect"
   #
   # - Returned to indicate a failed attempt at registering
-  # a connection for which a password was required and
-  # was either not given or incorrect.
+  #   a connection for which a password was required and
+  #   was either not given or incorrect.
   #
-  ERR_YOUREBANNEDCREEP=465
+  ERR_PASSWDMISMATCH=464
+
   # ":You are banned from this server"
   #
   # - Returned after an attempt to connect and register
-  # yourself with a server which has been setup to
-  # explicitly deny connections to you.
-  #
-  ERR_YOUWILLBEBANNED=466
+  #   yourself with a server which has been setup to
+  #   explicitly deny connections to you.
   #
+  ERR_YOUREBANNEDCREEP=465
+
   # - Sent by a server to a user to inform that access to the
-  # server will soon be denied.
+  #   server will soon be denied.
   #
-  ERR_KEYSET=467
+  ERR_YOUWILLBEBANNED=466
+
   # "<channel> :Channel key already set"
-  ERR_CHANNELISFULL=471
+  ERR_KEYSET=467
+
   # "<channel> :Cannot join channel (+l)"
-  ERR_UNKNOWNMODE=472
+  ERR_CHANNELISFULL=471
+
   # "<char> :is unknown mode char to me for <channel>"
-  ERR_INVITEONLYCHAN=473
+  ERR_UNKNOWNMODE=472
+
   # "<channel> :Cannot join channel (+i)"
-  ERR_BANNEDFROMCHAN=474
+  ERR_INVITEONLYCHAN=473
+
   # "<channel> :Cannot join channel (+b)"
-  ERR_BADCHANNELKEY=475
+  ERR_BANNEDFROMCHAN=474
+
   # "<channel> :Cannot join channel (+k)"
-  ERR_BADCHANMASK=476
+  ERR_BADCHANNELKEY=475
+
   # "<channel> :Bad Channel Mask"
-  ERR_NOCHANMODES=477
+  ERR_BADCHANMASK=476
+
   # "<channel> :Channel doesn't support modes"
-  ERR_BANLISTFULL=478
+  ERR_NOCHANMODES=477
+
   # "<channel> <char> :Channel list is full"
   #
-  ERR_NOPRIVILEGES=481
+  ERR_BANLISTFULL=478
+
   # ":Permission Denied- You're not an IRC operator"
   #
   # - Any command requiring operator privileges to operate
-  # MUST return this error to indicate the attempt was
-  # unsuccessful.
+  #   MUST return this error to indicate the attempt was
+  #   unsuccessful.
   #
-  ERR_CHANOPRIVSNEEDED=482
+  ERR_NOPRIVILEGES=481
+
   # "<channel> :You're not channel operator"
   #
   # - Any command requiring 'chanop' privileges (such as
-  # MODE messages) MUST return this error if the client
-  # making the attempt is not a chanop on the specified
-  # channel.
+  #   MODE messages) MUST return this error if the client
+  #   making the attempt is not a chanop on the specified
+  #   channel.
   #
   #
-  ERR_CANTKILLSERVER=483
+  ERR_CHANOPRIVSNEEDED=482
+
   # ":You can't kill a server!"
   #
   # - Any attempts to use the KILL command on a server
-  # are to be refused and this error returned directly
-  # to the client.
+  #   are to be refused and this error returned directly
+  #   to the client.
   #
-  ERR_RESTRICTED=484
+  ERR_CANTKILLSERVER=483
+
   # ":Your connection is restricted!"
   #
   # - Sent by the server to a user upon connection to indicate
-  # the restricted nature of the connection (user mode "+r").
+  #   the restricted nature of the connection (user mode "+r").
   #
-  ERR_UNIQOPPRIVSNEEDED=485
+  ERR_RESTRICTED=484
+
   # ":You're not the original channel operator"
   #
   # - Any MODE requiring "channel creator" privileges MUST
-  # return this error if the client making the attempt is not
-  # a chanop on the specified channel.
+  #   return this error if the client making the attempt is not
+  #   a chanop on the specified channel.
   #
-  ERR_NOOPERHOST=491
+  ERR_UNIQOPPRIVSNEEDED=485
+
   # ":No O-lines for your host"
   #
   # - If a client sends an OPER message and the server has
-  # not been configured to allow connections from the
-  # client's host as an operator, this error MUST be
-  # returned.
+  #   not been configured to allow connections from the
+  #   client's host as an operator, this error MUST be
+  #   returned.
   #
-  ERR_UMODEUNKNOWNFLAG=501
+  ERR_NOOPERHOST=491
+
   # ":Unknown MODE flag"
   #
   # - Returned by the server to indicate that a MODE
-  # message was sent with a nickname parameter and that
-  # the a mode flag sent was not recognized.
+  #   message was sent with a nickname parameter and that
+  #   the a mode flag sent was not recognized.
   #
-  ERR_USERSDONTMATCH=502
+  ERR_UMODEUNKNOWNFLAG=501
+
   # ":Cannot change mode for other users"
   #
   # - Error sent to any user trying to view or change the
-  # user mode for a user other than themselves.
+  #   user mode for a user other than themselves.
   #
+  ERR_USERSDONTMATCH=502
+
   # 5.3 Reserved numerics
   #
   # These numerics are not described above since they fall into one of
@@ -785,7 +913,8 @@ module Irc
   # 2. reserved for future planned use;
   #
   # 3. in current use but are part of a non-generic 'feature' of
-  # the current IRC server.
+  #    the current IRC server.
+  #
   RPL_SERVICEINFO=231
   RPL_ENDOFSERVICES=232
   RPL_SERVICE=233
@@ -811,14 +940,33 @@ module Irc
   ERR_NOSERVICEHOST=492
   RPL_DATASTR=290
 
-  # implements RFC 2812 and prior IRC RFCs.
-  # clients register handler proc{}s for different server events and IrcClient
-  # handles dispatch
-  class IrcClient
-    # create a new IrcClient instance
+  # Implements RFC 2812 and prior IRC RFCs.
+  #
+  # Clients should register Proc{}s to handle the various server events, and
+  # the Client class will handle dispatch.
+  class Client
+
+    # the Server we're connected to
+    attr_reader :server
+    # the User representing us on that server
+    attr_reader :user
+
+    # Create a new Client instance
     def initialize
+      @server = Server.new         # The Server
+      @user = @server.user("*!*@*")     # The User representing the client on this Server
+
       @handlers = Hash.new
-      @users = Array.new
+
+      # This is used by some messages to build lists of users that
+      # will be delegated when the ENDOF... message is received
+      @tmpusers = []
+    end
+
+    # Clear the server and reset the user
+    def reset
+      @server.clear
+      @user = @server.user("*!*@*")
     end
 
     # key::   server event to handle
@@ -827,8 +975,13 @@ module Irc
     #
     # ==server events currently supported:
     #
-    # created::     when the server was started
+    # TODO handle errors ERR_NOSUCHNICK, ERR_NOSUCHCHANNEL
+    # TODO handle errors ERR_CHANOPRIVSNEEDED, ERR_CANNOTSENDTOCHAN
+    #
+    # welcome::     server welcome message on connect
     # yourhost::    your host details (on connection)
+    # created::     when the server was started
+    # isupport::    information about what this server supports
     # ping::        server pings you (default handler returns a pong)
     # nicktaken::   you tried to change nick to one that's in use
     # badnick::     you tried to change nick to one that's invalid
@@ -836,7 +989,6 @@ module Irc
     # topicinfo::   on joining a channel or asking for the topic, tells you
     #               who set it and when
     # names::       server sends list of channel members when you join
-    # welcome::     server welcome message on connect
     # motd::        server message of the day
     # privmsg::     privmsg, the core of IRC, a message to you from someone
     # public::      optionally instead of getting privmsg you can hook to only
@@ -869,17 +1021,35 @@ module Irc
       data = Hash.new
       data[:serverstring] = serverstring
 
-      unless serverstring =~ /^(:(\S+)\s)?(\S+)(\s(.*))?/
-        raise "Unparseable Server Message!!!: #{serverstring}"
+      unless serverstring.chomp =~ /^(:(\S+)\s)?(\S+)(\s(.*))?$/
+        raise "Unparseable Server Message!!!: #{serverstring.inspect}"
       end
 
       prefix, command, params = $2, $3, $5
 
       if prefix != nil
-        data[:source] = prefix
-        if prefix =~ /^(\S+)!(\S+)$/
-          data[:sourcenick] = $1
-          data[:sourceaddress] = $2
+        # Most servers will send a full nick!user@host prefix for
+        # messages from users. Therefore, when the prefix doesn't match this
+        # syntax it's usually the server hostname.
+        #
+        # This is not always true, though, since some servers do not send a
+        # full hostmask for user messages.
+        #
+        if prefix =~ /^#{Regexp::Irc::BANG_AT}$/
+          data[:source] = @server.user(prefix)
+        else
+          if @server.hostname
+            if @server.hostname != prefix
+              # TODO do we want to be able to differentiate messages that are passed on to us from /other/ servers?
+              debug "Origin #{prefix} for message\n\t#{serverstring.inspect}\nis neither a user hostmask nor the server hostname\nI'll pretend that it's from the server anyway"
+              data[:source] = @server
+            else
+              data[:source] = @server
+            end
+          else
+            @server.instance_variable_set(:@hostname, prefix)
+            data[:source] = @server
+          end
         end
       end
 
@@ -887,19 +1057,36 @@ module Irc
       argv = []
       params.scan(/(?!:)(\S+)|:(.*)/) { argv << ($1 || $2) } if params
 
-      case command
-      when 'PING'
-        data[:pingid] = argv[0]
-        handle(:ping, data)
-      when 'PONG'
-        data[:pingid] = argv[0]
-        handle(:pong, data)
-      when /^(\d+)$/		# numeric server message
+      if command =~ /^(\d+)$/ # Numeric replies
+	data[:target] = argv[0]
+        # A numeric reply /should/ be directed at the client, except when we're connecting with a used nick, in which case
+        # it's directed at '*'
+        not_us = !([@user.nick, '*'].include?(data[:target]))
+        if not_us
+          warning "Server reply #{serverstring.inspect} directed at #{data[:target]} instead of client (#{@user.nick})"
+        end
+
         num=command.to_i
         case num
+        when RPL_WELCOME
+          data[:message] = argv[1]
+          # "Welcome to the Internet Relay Network
+          # <nick>!<user>@<host>"
+          if not_us
+            warning "Server thinks client (#{@user.inspect}) has a different nick"
+            @user.nick = data[:target]
+          end
+          if data[:message] =~ /([^@!\s]+)(?:!([^@!\s]+?))?@(\S+)/
+            nick = $1
+            user = $2
+            host = $3
+            warning "Welcome message nick mismatch (#{nick} vs #{data[:target]})" if nick != data[:target]
+            @user.user = user if user
+            @user.host = host if host
+          end
+          handle(:welcome, data)
         when RPL_YOURHOST
           # "Your host is <servername>, running version <ver>"
-          # TODO how standard is this "version <ver>? should i parse it?
           data[:message] = argv[1]
           handle(:yourhost, data)
         when RPL_CREATED
@@ -909,10 +1096,21 @@ module Irc
         when RPL_MYINFO
           # "<servername> <version> <available user modes>
           # <available channel modes>"
-          data[:servername] = argv[1]
-          data[:version] = argv[2]
-          data[:usermodes] = argv[3]
-          data[:chanmodes] = argv[4]
+          @server.parse_my_info(params.split(' ', 2).last)
+          data[:servername] = @server.hostname
+          data[:version] = @server.version
+          data[:usermodes] = @server.usermodes
+          data[:chanmodes] = @server.chanmodes
+          handle(:myinfo, data)
+        when RPL_ISUPPORT
+          # "PREFIX=(ov)@+ CHANTYPES=#& :are supported by this server"
+          # "MODES=4 CHANLIMIT=#:20 NICKLEN=16 USERLEN=10 HOSTLEN=63
+          # TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=#
+          # PREFIX=(ov)@+ CASEMAPPING=ascii CAPAB IRCD=dancer :are available
+          # on this server"
+          #
+          @server.parse_isupport(argv[1..-2].join(' '))
+          handle(:isupport, data)
         when ERR_NICKNAMEINUSE
           # "* <nick> :Nickname is already in use"
           data[:nick] = argv[1]
@@ -924,49 +1122,65 @@ module Irc
           data[:message] = argv[2]
           handle(:badnick, data)
         when RPL_TOPIC
-          data[:channel] = argv[1]
+          data[:channel] = @server.channel(argv[1])
           data[:topic] = argv[2]
+          data[:channel].topic.text = data[:topic]
+
           handle(:topic, data)
         when RPL_TOPIC_INFO
-          data[:nick] = argv[0]
-          data[:channel] = argv[1]
-          data[:source] = argv[2]
-          data[:unixtime] = argv[3]
+          data[:nick] = @server.user(argv[0])
+          data[:channel] = @server.channel(argv[1])
+
+          # This must not be an IRC::User because it might not be an actual User,
+          # and we risk overwriting valid User data
+          data[:source] = argv[2].to_irc_netmask(:server => @server)
+
+          data[:time] = Time.at(argv[3].to_i)
+
+          data[:channel].topic.set_by = data[:source]
+          data[:channel].topic.set_on = data[:time]
+
           handle(:topicinfo, data)
         when RPL_NAMREPLY
           # "( "=" / "*" / "@" ) <channel>
           # :[ "@" / "+" ] <nick> *( " " [ "@" / "+" ] <nick> )
           # - "@" is used for secret channels, "*" for private
           # channels, and "=" for others (public channels).
+          data[:channeltype] = argv[1]
+          data[:channel] = argv[2]
+
+          chan = @server.get_channel(data[:channel])
+          unless chan
+            warning "Received names #{data[:topic].inspect} for channel #{data[:channel].inspect} I was not on"
+            return
+          end
+
+          users = []
           argv[3].scan(/\S+/).each { |u|
-            if(u =~ /^([@+])?(.*)$/)
-              umode = $1 || ""
+            # FIXME beware of servers that allow multiple prefixes
+            if(u =~ /^([#{@server.supports[:prefix][:prefixes].join}])?(.*)$/)
+              umode = $1
               user = $2
-              @users << [user, umode]
+              users << [user, umode]
             end
           }
+
+          users.each { |ar|
+            u = @server.user(ar[0])
+            chan.add_user(u, :silent => true)
+            debug "Adding user #{u}"
+            if ar[1]
+              ms = @server.mode_for_prefix(ar[1].to_sym)
+              debug "\twith mode #{ar[1]} (#{ms})"
+              chan.mode[ms].set(u)
+            end
+          }
+          @tmpusers += users
         when RPL_ENDOFNAMES
           data[:channel] = argv[1]
-          data[:users] = @users
+          data[:users] = @tmpusers
           handle(:names, data)
-          @users = Array.new
-        when RPL_ISUPPORT
-          # "PREFIX=(ov)@+ CHANTYPES=#& :are supported by this server"
-          # "MODES=4 CHANLIMIT=#:20 NICKLEN=16 USERLEN=10 HOSTLEN=63
-          # TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=#
-          # PREFIX=(ov)@+ CASEMAPPING=ascii CAPAB IRCD=dancer :are available
-          # on this server"
-          #
-          argv[0,argv.length-1].each {|a|
-            if a =~ /^(.*)=(.*)$/
-              data[$1.downcase.to_sym] = $2
-              debug "server's #{$1.downcase.to_sym} is #{$2}"
-            else
-              data[a.downcase.to_sym] = true
-              debug "server supports #{a.downcase.to_sym}"
-            end
-          }
-          handle(:isupport, data)
+          @tmpusers = Array.new
         when RPL_LUSERCLIENT
           # ":There are <integer> users and <integer>
           # services on <integer> servers"
@@ -1005,28 +1219,14 @@ module Irc
           # (re)started)"
           data[:message] = argv[1]
           handle(:statsconn, data)
-        when RPL_WELCOME
-          # "Welcome to the Internet Relay Network
-          # <nick>!<user>@<host>"
-          case argv[1]
-          when /((\S+)!(\S+))/
-            data[:netmask] = $1
-            data[:nick] = $2
-            data[:address] = $3
-          when /Welcome to the Internet Relay Network\s(\S+)/
-            data[:nick] = $1
-          when /Welcome.*\s+(\S+)$/
-            data[:nick] = $1
-          when /^(\S+)$/
-            data[:nick] = $1
-          end
-          handle(:welcome, data)
         when RPL_MOTDSTART
           # "<nick> :- <server> Message of the Day -"
           if argv[1] =~ /^-\s+(\S+)\s/
             server = $1
-            @motd = ""
+          else
+            warning "Server doesn't have an RFC compliant MOTD start."
           end
+          @motd = ""
         when RPL_MOTD
           if(argv[1] =~ /^-\s+(.*)$/)
             @motd << $1
@@ -1038,65 +1238,168 @@ module Irc
         when RPL_DATASTR
           data[:text] = argv[1]
           handle(:datastr, data)
+	when RPL_WHOREPLY
+          data[:channel] = argv[1]
+          data[:user] = argv[2]
+          data[:host] = argv[3]
+          data[:userserver] = argv[4]
+          data[:nick] = argv[5]
+          if argv[6] =~ /^(H|G)(\*)?(.*)?$/
+            data[:away] = ($1 == 'G')
+            data[:ircop] = $2
+            data[:modes] = $3.scan(/./).map { |mode|
+              m = @server.supports[:prefix][:prefixes].index(mode.to_sym)
+              @server.supports[:prefix][:modes][m]
+            } rescue []
+          else
+            warning "Strange WHO reply: #{serverstring.inspect}"
+          end
+          data[:hopcount], data[:real_name] = argv[7].split(" ", 2)
+
+          user = @server.get_user(data[:nick])
+
+          user.user = data[:user]
+          user.host = data[:host]
+          user.away = data[:away] # FIXME doesn't provide the actual message
+          # TODO ircop status
+          # TODO userserver
+          # TODO hopcount
+          user.real_name = data[:real_name]
+
+          channel = @server.get_channel(data[:channel])
+
+          channel.add_user(user, :silent=>true)
+          data[:modes].map { |mode|
+            channel.mode[mode].set(user)
+          }
+
+          handle(:who, data)
+        when RPL_ENDOFWHO
+          handle(:eowho, data)
+        when RPL_CHANNELMODEIS
+          parse_mode(serverstring, argv[1..-1], data)
+          handle(:mode, data)
         else
+          warning "Unknown message #{serverstring.inspect}"
           handle(:unknown, data)
         end
-      # end of numeric replies
-      when 'PRIVMSG'
+	return # We've processed the numeric reply
+      end
+
+      # Otherwise, the command should be a single word
+      case command.to_sym
+      when :PING
+        data[:pingid] = argv[0]
+        handle(:ping, data)
+      when :PONG
+        data[:pingid] = argv[0]
+        handle(:pong, data)
+      when :PRIVMSG
         # you can either bind to 'PRIVMSG', to get every one and
         # parse it yourself, or you can bind to 'MSG', 'PUBLIC',
         # etc and get it all nicely split up for you.
-        data[:target] = argv[0]
+
+        begin
+          data[:target] = @server.user_or_channel(argv[0])
+        rescue
+          # The previous may fail e.g. when the target is a server or something
+          # like that (e.g. $<mask>). In any of these cases, we just use the
+          # String as a target
+          # FIXME we probably want to explicitly check for the #<mask> $<mask>
+          data[:target] = argv[0]
+        end
         data[:message] = argv[1]
         handle(:privmsg, data)
 
         # Now we split it
-        if(data[:target] =~ /^[#&!+].*/)
+        if data[:target].kind_of?(Channel)
           handle(:public, data)
         else
           handle(:msg, data)
         end
-      when 'KICK'
-        data[:channel] = argv[0]
-        data[:target] = argv[1]
+      when :NOTICE
+        begin
+          data[:target] = @server.user_or_channel(argv[0])
+        rescue
+          # The previous may fail e.g. when the target is a server or something
+          # like that (e.g. $<mask>). In any of these cases, we just use the
+          # String as a target
+          # FIXME we probably want to explicitly check for the #<mask> $<mask>
+          data[:target] = argv[0]
+        end
+        data[:message] = argv[1]
+        case data[:source]
+        when User
+          handle(:notice, data)
+        else
+          # "server notice" (not from user, noone to reply to)
+          handle(:snotice, data)
+        end
+      when :KICK
+        data[:channel] = @server.channel(argv[0])
+        data[:target] = @server.user(argv[1])
         data[:message] = argv[2]
+
+        @server.delete_user_from_channel(data[:target], data[:channel])
+        if data[:target] == @user
+          @server.delete_channel(data[:channel])
+        end
+
         handle(:kick, data)
-      when 'PART'
-        data[:channel] = argv[0]
+      when :PART
+        data[:channel] = @server.channel(argv[0])
         data[:message] = argv[1]
+
+        @server.delete_user_from_channel(data[:source], data[:channel])
+        if data[:source] == @user
+          @server.delete_channel(data[:channel])
+        end
+
         handle(:part, data)
-      when 'QUIT'
+      when :QUIT
         data[:message] = argv[0]
+        data[:was_on] = @server.channels.inject(ChannelList.new) { |list, ch|
+          list << ch if ch.has_user?(data[:source])
+          list
+        }
+
+        @server.delete_user(data[:source])
+
         handle(:quit, data)
-      when 'JOIN'
-        data[:channel] = argv[0]
+      when :JOIN
+        data[:channel] = @server.channel(argv[0])
+        data[:channel].add_user(data[:source])
+
         handle(:join, data)
-      when 'TOPIC'
-        data[:channel] = argv[0]
-        data[:topic] = argv[1]
+      when :TOPIC
+        data[:channel] = @server.channel(argv[0])
+        data[:topic] = Channel::Topic.new(argv[1], data[:source], Time.new)
+        data[:channel].topic.replace(data[:topic])
+
         handle(:changetopic, data)
-      when 'INVITE'
-        data[:target] = argv[0]
-        data[:channel] = argv[1]
+      when :INVITE
+        data[:target] = @server.user(argv[0])
+        data[:channel] = @server.channel(argv[1])
+
         handle(:invite, data)
-      when 'NICK'
-        data[:nick] = argv[0]
+      when :NICK
+        data[:is_on] = @server.channels.inject(ChannelList.new) { |list, ch|
+          list << ch if ch.has_user?(data[:source])
+          list
+        }
+
+        data[:newnick] = argv[0]
+        data[:oldnick] = data[:source].nick.dup
+        data[:source].nick = data[:newnick]
+
+        debug "#{data[:oldnick]} (now #{data[:newnick]}) was on #{data[:is_on].join(', ')}"
+
         handle(:nick, data)
-      when 'MODE'
-        data[:channel] = argv[0]
-        data[:modestring] = argv[1]
-        data[:targets] = argv[2]
+      when :MODE
+        parse_mode(serverstring, argv, data)
         handle(:mode, data)
-      when 'NOTICE'
-        data[:target] = argv[0]
-        data[:message] = argv[1]
-        if data[:sourcenick]
-          handle(:notice, data)
-        else
-          # "server notice" (not from user, noone to reply to
-          handle(:snotice, data)
-        end
       else
+        warning "Unknown message #{serverstring.inspect}"
         handle(:unknown, data)
       end
     end
@@ -1111,5 +1414,110 @@ module Irc
         @handlers[key].call(data)
       end
     end
+
+    # RPL_CHANNELMODEIS
+    # MODE ([+-]<modes> (<params>)*)*
+    # When a MODE message is received by a server,
+    # Type C will have parameters too, so we must
+    # be able to consume parameters for all
+    # but Type D modes
+    def parse_mode(serverstring, argv, data)
+      data[:target] = @server.user_or_channel(argv[0])
+      data[:modestring] = argv[1..-1].join(" ")
+      # data[:modes] is an array where each element
+      # is an array with two elements, the first of which
+      # is either :set or :reset, and the second symbol
+      # is the mode letter. An optional third element
+      # is present e.g. for channel modes that need
+      # a parameter
+      data[:modes] = []
+      case data[:target]
+      when User
+        # User modes aren't currently handled internally,
+        # but we still parse them and delegate to the client
+        warning "Unhandled user mode message '#{serverstring}'"
+        argv[1..-1].each { |arg|
+          setting = arg[0].chr
+          if "+-".include?(setting)
+            setting = setting == "+" ? :set : :reset
+            arg[1..-1].each_byte { |b|
+              m = b.chr.intern
+              data[:modes] << [setting, m]
+            }
+          else
+            # Although typically User modes don't take an argument,
+            # this is not true for all modes on all servers. Since
+            # we have no knowledge of which modes take parameters
+            # and which don't we just assign it to the last
+            # mode. This is not going to do strange things often,
+            # as usually User modes are only set one at a time
+            warning "Unhandled user mode parameter #{arg} found"
+            data[:modes].last << arg
+          end
+        }
+      else
+        # array of indices in data[:modes] where parameters
+        # are needed
+        who_wants_params = []
+
+        modes = argv[1..-1].dup
+        debug modes
+        getting_args = false
+        while arg = modes.shift
+          debug arg
+          if getting_args
+            # getting args for previously set modes
+            idx = who_wants_params.shift
+            if idx.nil?
+              warning "Oops, problems parsing #{serverstring.inspect}"
+              break
+            end
+            data[:modes][idx] << arg
+            getting_args = false if who_wants_params.empty?
+          else
+            debug @server.supports[:chanmodes]
+            setting = :set
+            arg.each_byte do |c|
+              m = c.chr.intern
+              case m
+              when :+
+                setting = :set
+              when :-
+                setting = :reset
+              else
+                data[:modes] << [setting, m]
+                case m
+                when *@server.supports[:chanmodes][:typea]
+                  who_wants_params << data[:modes].length - 1
+                when *@server.supports[:chanmodes][:typeb]
+                  who_wants_params << data[:modes].length - 1
+                when *@server.supports[:chanmodes][:typec]
+                  if setting == :set
+                    who_wants_params << data[:modes].length - 1
+                  end
+                when *@server.supports[:chanmodes][:typed]
+                  # Nothing to do
+                when *@server.supports[:prefix][:modes]
+                  who_wants_params << data[:modes].length - 1
+                else
+                  warning "Ignoring unknown mode #{m} in #{serverstring.inspect}"
+                  data[:modes].pop
+                end
+              end
+            end
+            getting_args = true unless who_wants_params.empty?
+          end
+        end
+
+        data[:modes].each { |mode|
+          set, key, val = mode
+          if val
+            data[:target].mode[key].send(set, val)
+          else
+            data[:target].mode[key].send(set)
+          end
+        }
+      end
+    end
   end
 end