cinch 2.0.10 → 2.0.11

data/lib/cinch/dcc/incoming/send.rb

@@ -112,7 +112,7 @@ module Cinch
               socket.write_nonblock [total].pack("N")
             rescue Errno::EWOULDBLOCK, Errno::AGAIN
               # Nobody cares about ACKs, really. And if the sender
-              # couldn't receive it at this point, he probably doesn't
+              # couldn't receive it at this point, they probably don't
               # care, either.
             end
             io << buf

data/lib/cinch/irc.rb

@@ -36,7 +36,7 @@ module Cinch
     def setup
       @registration  = []
       @network       = Network.new(:unknown, :unknown)
-      @whois_updates = Hash.new {|h, k| h[k] = {}}
+      @whois_updates = {}
       @in_lists      = Set.new
     end
 
@@ -233,7 +233,7 @@ module Cinch
       msg          = Message.new(input, @bot)
       events       = [[:catchall]]
 
-      if ("001".."004").include? msg.command
+      if ["001", "002", "003", "004", "422"].include?(msg.command)
         @registration << msg.command
         if registered?
           events << [:connect]
@@ -276,7 +276,7 @@ module Cinch
 
     # @return [Boolean] true if we successfully registered yet
     def registered?
-      (("001".."004").to_a - @registration).empty?
+      (("001".."004").to_a - @registration).empty? || @registration.include?("422")
     end
 
     # Send a message to the server.
@@ -366,6 +366,11 @@ module Cinch
       end
     end
 
+    def update_whois(user, data)
+      @whois_updates[user] ||= {}
+      @whois_updates[user].merge!(data)
+    end
+
     # @since 2.0.0
     def on_away(msg, events)
       if msg.message.to_s.empty?
@@ -538,10 +543,10 @@ module Cinch
 
       if msg.message.downcase == "excess flood" && msg.user == @bot
         @bot.warn ["Looks like your bot has been kicked because of excess flood.",
-                    "If you haven't modified the throttling options manually, please file a bug report at https://github.com/cinchrb/cinch/issues and include the following information:",
-                    "- Server: #{@bot.config.server}",
-                    "- Messages per second: #{@bot.config.messages_per_second}",
-                    "- Server queue size: #{@bot.config.server_queue_size}"]
+                   "If you haven't modified the throttling options manually, please file a bug report at https://github.com/cinchrb/cinch/issues and include the following information:",
+                   "- Server: #{@bot.config.server}",
+                   "- Messages per second: #{@bot.config.messages_per_second}",
+                   "- Server queue size: #{@bot.config.server_queue_size}"]
       end
     end
 
@@ -603,7 +608,7 @@ module Cinch
       away = msg.message
 
       if @whois_updates[user]
-        @whois_updates[user].merge!({:away => away})
+        update_whois(user, {:away => away})
       end
     end
 
@@ -611,36 +616,38 @@ module Cinch
     def on_307(msg, events)
       # RPL_WHOISREGNICK
       user = User(msg.params[1])
-      @whois_updates[user].merge!({:authname => user.nick})
+      update_whois(user, {:authname => user.nick})
     end
 
     def on_311(msg, events)
       # RPL_WHOISUSER
       user = User(msg.params[1])
-      @whois_updates[user].merge!({
-                                    :user => msg.params[2],
-                                    :host => msg.params[3],
-                                    :realname => msg.params[5],
-                                  })
+      update_whois(user, {
+                     :user => msg.params[2],
+                     :host => msg.params[3],
+                     :realname => msg.params[5],
+                   })
     end
 
     def on_317(msg, events)
       # RPL_WHOISIDLE
       user = User(msg.params[1])
-      @whois_updates[user].merge!({
-                                    :idle => msg.params[2].to_i,
-                                    :signed_on_at => Time.at(msg.params[3].to_i),
-                                  })
+      update_whois(user, {
+                     :idle => msg.params[2].to_i,
+                     :signed_on_at => Time.at(msg.params[3].to_i),
+                   })
     end
 
     def on_318(msg, events)
       # RPL_ENDOFWHOIS
       user = User(msg.params[1])
 
-      if @whois_updates[user].empty? && !user.attr(:unknown?, true, true)
-        user.end_of_whois(nil)
-      else
-        user.end_of_whois(@whois_updates[user])
+      if @whois_updates[user]
+        if @whois_updates[user].empty? && !user.attr(:unknown?, true, true)
+          user.end_of_whois(nil)
+        else
+          user.end_of_whois(@whois_updates[user])
+        end
         @whois_updates.delete user
       end
     end
@@ -815,10 +822,7 @@ module Cinch
 
     def on_401(msg, events)
       # ERR_NOSUCHNICK
-      user = User(msg.params[1])
-      user.sync(:unknown?, true, true)
-      msg.user.online = false
-      if @whois_updates.key?(user)
+      if user = @bot.user_list.find(msg.params[1])
         user.end_of_whois(nil, true)
         @whois_updates.delete user
       end

data/lib/cinch/message.rb

@@ -231,7 +231,7 @@ module Cinch
         chantypes = @bot.irc.isupport["CHANTYPES"]
         if chantypes.include?(@params.first[0])
           @bot.channel_list.find_ensured(@params.first)
-        elsif numeric_reply? and chantypes.include?(@params[1][0])
+        elsif numeric_reply? and @params.size > 1 and chantypes.include?(@params[1][0])
           @bot.channel_list.find_ensured(@params[1])
         end
       end

data/lib/cinch/user.rb

@@ -365,6 +365,10 @@ module Cinch
     # @return [void]
     def update_nick(new_nick)
       @last_nick, @name = @name, new_nick
+      # Unsync authname because some networks tie authentication to
+      # the nick, so the user might not be authenticated anymore after
+      # changing his nick
+      unsync(:authname)
       @bot.user_list.update_nick(self)
     end
 

data/lib/cinch/user_list.rb

@@ -22,6 +22,7 @@ module Cinch
     # @return [User]
     # @see Bot#User
     def find_ensured(*args)
+      user, host = nil, nil
       case args.size
       when 1
         nick = args.first
@@ -29,12 +30,20 @@ module Cinch
       when 3
         nick = args[1]
         bargs = args
+        user, _, host = bargs
       else
         raise ArgumentError
       end
       downcased_nick = nick.irc_downcase(@bot.irc.isupport["CASEMAPPING"])
       @mutex.synchronize do
-        @cache[downcased_nick] ||= User.new(*bargs, @bot)
+        user_obj = @cache[downcased_nick] ||= User.new(*bargs, @bot)
+        if user && host
+          # Explicitly set user and host whenever we request a User
+          # object to update them on e.g. JOIN.
+          user_obj.sync(:user, user, true)
+          user_obj.sync(:host, host, true)
+        end
+        user_obj
       end
     end
 

data/lib/cinch/version.rb

@@ -1,4 +1,4 @@
 module Cinch
   # Version of the library
-  VERSION = '2.0.10'
+  VERSION = '2.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies: []
 description: A simple, friendly DSL for creating IRC bots
 email: