cinch 2.0.5 → 2.0.6

data/examples/plugins/custom_prefix.rb

@@ -3,7 +3,7 @@ require 'cinch'
 class SomeCommand
   include Cinch::Plugin
 
-  prefix /^~/
+  set :prefix, /^~/
   match "somecommand"
 
   def execute(m)

data/examples/plugins/lambdas.rb

@@ -9,7 +9,7 @@ class DirectAddressing
   #
   # The reason we are using a lambda is that the bot's nick can change
   # and the prefix has to be up to date.
-  prefix lambda{ |m| Regexp.new("^" + Regexp.escape(m.bot.nick + ": " ))}
+  set :prefix, lambda{ |m| Regexp.new("^" + Regexp.escape(m.bot.nick + ": " ))}
 
   match "hello", method: :greet
   def greet(m)

data/lib/cinch/bot.rb

@@ -249,6 +249,8 @@ module Cinch
           channel.unsync_all
         end # reset state of all channels
 
+        @channels = [] # reset list of channels the bot is in
+
         @join_handler.unregister if @join_handler
         @join_timer.stop if @join_timer
 

data/lib/cinch/channel.rb

@@ -59,6 +59,14 @@ module Cinch
 
       @synced_attributes  = Set.new
       @when_requesting_synced_attribute = lambda {|attr|
+        if @in_channel && attr == :topic && !attribute_synced?(:topic)
+          # Even if we are in the channel, if there's no topic set,
+          # the attribute won't be synchronised yet. Explicitly
+          # request the topic.
+          @bot.irc.send "TOPIC #@name"
+          next
+        end
+
         unless @in_channel
           unsync(attr)
           case attr

data/lib/cinch/irc.rb

@@ -544,15 +544,23 @@ module Cinch
       end
 
 
-      if msg.message =~ /^\001DCC SEND (?:"([^"]+)"|(\S+)) (\d+) (\d+)(?: (\d+))?\001$/
+      if msg.message =~ /^\001DCC SEND (?:"([^"]+)"|(\S+)) (\S+) (\d+)(?: (\d+))?\001$/
         process_dcc_send($1 || $2, $3, $4, $5, msg, events)
       end
     end
 
     # @since 2.0.0
     def process_dcc_send(filename, ip, port, size, m, events)
-      ip   = ip.to_i
-      ip   = [24, 16, 8, 0].collect {|b| (ip >> b) & 255}.join('.')
+      if ip =~ /^\d$/
+        # If ip is a single integer, assume it's a specification
+        # compliant IPv4 address in network byte order. If it's any
+        # other string, assume that it's a valid IPv4 or IPv6 address.
+        # If it's not valid, let someone higher up the chain notice
+        # that.
+        ip   = ip.to_i
+        ip   = [24, 16, 8, 0].collect {|b| (ip >> b) & 255}.join('.')
+      end
+
       port = port.to_i
       size = size.to_i
 
@@ -632,8 +640,8 @@ module Cinch
     def on_319(msg, events)
       # RPL_WHOISCHANNELS
       user     = User(msg.params[1])
-      channels = msg.params[2].scan(/#{@isupport["CHANTYPES"].join}[^ ]+/o).map {|c| Channel(c) }
-      user.sync(:channels, channels, true)
+      channels = msg.params[2].scan(/[#{@isupport["CHANTYPES"].join}][^ ]+/o).map {|c| Channel(c) }
+      @whois_updates[user].merge!({:channels => channels})
     end
 
     def on_324(msg, events)

data/lib/cinch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies: []
 description: A simple, friendly DSL for creating IRC bots
 email: