protonbot 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0949566ae0887a4ee1a5f088d5c04c31e48e7b
-  data.tar.gz: 8eca8663367b3c77ebf445dbe464cae4cebd8ae0
+  metadata.gz: a772965bfa57f36c06a51808af88c35fb4afbc61
+  data.tar.gz: 439f4b4d8a940956c5e5beaed8c16ef0d94d7c7f
 SHA512:
-  metadata.gz: 6037dc02298ed7f30697fe8329a1a01ea8627ec32b031486ef32e14fa56828ba89133c5372c4054817888c297faeac03bb647e48d37225686111b71fccdfd2a9
-  data.tar.gz: 773ea673e2555bb281537aaca4254ea562408f260deddae81d81b383969cf9b5894dfed5bb000c77522d2cde3c72e448cc5749f094f066c6daf89e51cddb9fca
+  metadata.gz: 5b00a3d7b99320460128b0c8e8dcd7c6b449890d7923d70cd5f2e6c2e62b8cff327949b471ad41e83d68ddc0901f327e387bc6388927e6d39ecf15cdfab38502
+  data.tar.gz: de17f7368e8e0df77565bbde008fcbf5659a30a136a821e847c634a8fe911cc8981695eeab3f648510b3a3621fdf5167db7aae4cd09f110bff6a5a97a775c421

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in protonbot.gemspec
-gem 'protonbot-chanop', '~> 0.1.0'
 gemspec

data/lib/protonbot/core_plugin/hooks/joinpart.rb

@@ -31,10 +31,12 @@ hook(type: :upart) do |dat|
 
   if dat[:nick] == dat[:plug].nick && /requested by .*/.match(dat[:message])
     dat[:plug].join(dat[:channel])
+  elsif dat[:nick] == dat[:plug].nick
+    dat[:plug].chans.delete(dat[:channel])
   end
 end
 
-hook(type: :uqit) do |dat|
+hook(type: :uquit) do |dat|
   dat[:plug].chans.each do |chan|
     chan[:users].delete(dat[:nick]) if chan[:users]
   end

data/lib/protonbot/core_plugin/hooks/kick.rb

@@ -13,5 +13,8 @@ hook(type: :ukick) do |dat|
   dat[:plug].chans[dat[:channel]][:users].delete dat[:target] if
     dat[:plug].chans[dat[:channel]][:users].include? dat[:target]
 
-  dat[:plug].join(dat[:channel]) if dat[:target] == dat[:plug].nick
+  if dat[:target] == dat[:plug].nick
+    dat[:plug].chans.delete dat[:channel]
+    dat[:plug].join(dat[:channel])
+  end
 end

data/lib/protonbot/core_plugin/hooks/privmsg.rb

@@ -19,12 +19,14 @@ hook(type: :privmsg) do |dat|
 
   # CTCP
   if dat[:message][0] == "\x01" && dat[:message][-1] == "\x01"
-    dat[:type] = :ctcp
-    dat[:message] = dat[:message][1..(dat[:message].length - 2)]
-    s = dat[:message].split(' ')
-    dat[:cmd] = s[0]
-    (dat[:split] = s[1, s.length - 1]) || []
-    emit(dat)
+    dat1 = dat.clone
+    dat1[:type] = :ctcp
+    dat1[:message] = dat1[:message][1..(dat1[:message].length - 2)]
+    s = dat1[:message].split(' ')
+    dat1[:cmd] = s[0]
+    (dat1[:split] = s[1, s.length - 1]) || []
+    privmsg_patch(dat1)
+    emit(dat1)
   end
 
   # Command-checker
@@ -52,11 +54,13 @@ hook(type: :notice) do |dat|
 
   # CTCP
   if dat[:message][0] == "\x01" && dat[:message][-1] == "\x01"
-    dat[:type] = :nctcp
-    dat[:message] = dat[:message][1..(dat[:message].length - 2)]
-    s = dat[:message].split(' ')
-    dat[:cmd] = s[0]
-    (dat[:split] = s[1, s.length - 1]) || []
-    emit(dat)
+    dat1 = dat.clone
+    dat1[:type] = :nctcp
+    dat1[:message] = dat1[:message][1..(dat1[:message].length - 2)]
+    s = dat1[:message].split(' ')
+    dat1[:cmd] = s[0]
+    (dat1[:split] = s[1, s.length - 1]) || []
+    privmsg_patch(dat1)
+    emit(dat1)
   end
 end

data/lib/protonbot/plug_events.rb

@@ -3,19 +3,20 @@ class ProtonBot::Plug
   # @param dat [Hash] Event hash
   # @return [Plug] self
   def emit(dat = {})
+    hooks = []
     bot.plugins.each do |_, p|
-      worked = []
-      p.hooks.each do |h|
-        next unless dat >= h.pattern && !worked.include?(h.object_id) && worked.empty?
-        canrun = true
-        h.chain.each do |l|
-          next unless canrun
-          canrun = l.call(dat, h)
-        end
-        worked << h.object_id
-        h.block.call(dat) if canrun
+      hooks += p.hooks
+    end
+    hooks = hooks.keep_if do |hook|
+      dat >= hook.pattern
+    end
+    hooks.each do |h|
+      canrun = true
+      h.chain.each do |l|
+        next unless canrun
+        canrun = l.call(dat, h)
       end
-      worked = []
+      h.block.call(dat) if canrun
     end
     event_locks.each_with_index do |el, k|
       if dat >= el.pattern

data/lib/protonbot/version.rb

@@ -1,4 +1,4 @@
 module ProtonBot
   # ProtonBot's version
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Nickolay Ilyushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler