protonbot 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8031a11e22b7ce80ab962f2552bf8677667c1cc
-  data.tar.gz: 89076fc1c0082722cb99c73069f8a892caf5de6c
+  metadata.gz: '084bda3603fab091a4b8804592d075b5b728b9a1'
+  data.tar.gz: 3fb9a4aa904ee68554f1f86c845ae5d4a0045213
 SHA512:
-  metadata.gz: 0da601d89f36d0df01acb1229a4c560f6bd109a01e541a2cbc42f298f9465b0b239d677a4f328e7bbe4f311af20ed62cb32f6c3a1d0a3ff01ebac0d4969c02cd
-  data.tar.gz: dbb001abf81f094fdffe89d7ce03087c2a20d8b0ec3342736a5525fde11883be6bde8bee752e80ab17cc8cd8262799955a5480846b76c6d110fa9771e1acf617
+  metadata.gz: bdb15bc87df5d29387fdaebf6d63b382f3cb6c5d3d2b5e84b0e7e37b814584c1bc54c6f75b31549516f2148e19341197e2850c8e5dbe1dd2c64b7204ea9ff1d4
+  data.tar.gz: 289f79bbb2063c941952e714d7a1d84ecdaae3bac283120306e89c9131d21bc27e6d021fe36a2557507fa1e054675b4fed793f0be0395a48723e7e2021895819

data/lib/protonbot/core_plugin/codes/index.rb

@@ -1,3 +1,4 @@
 run 'codes/names'
 run 'codes/welcome'
-run 'codes/whois'
+run 'codes/whois'
+run 'codes/topic'

data/lib/protonbot/core_plugin/codes/names.rb

@@ -1,8 +1,11 @@
 hook(type: :code, code: @numeric::NAMREPLY) do |dat|
   m = /[=*@] (.+?) :(.+)/.match(dat[:extra])
 
-  if !dat[:plug].chans[m[1]] || !dat[:plug].chans[m[1]][:collecting]
+  unless dat[:plug].chans[m[1]]
     dat[:plug].chans[m[1]] = {}
+  end
+
+  unless dat[:plug].chans[m[1]][:collecting]
     dat[:plug].chans[m[1]][:collecting] = true
     dat[:plug].chans[m[1]][:users] = []
   end

data/lib/protonbot/core_plugin/codes/topic.rb

@@ -0,0 +1,7 @@
+hook(type: :code, code: @numeric::TOPIC) do |dat|
+  m = /(.+?) :(.+)/.match(dat[:extra])
+  unless dat[:plug].chans[m[1]]
+    dat[:plug].chans[m[1]] = {}
+  end
+  dat[:plug].chans[m[1]][:topic] = m[2]
+end

data/lib/protonbot/core_plugin/commands/admin.rb

@@ -59,39 +59,52 @@ cmd(cmd: 'nick') do |dat|
   end
 end.perm!('nick')
 
-core.help_add('admin', 'msg', 'msg [target] <message>', 'Sends given message to target')
+core.help_add('admin', 'msg', 'msg <target> <message>', 'Sends given message to target')
 cmd(cmd: 'msg') do |dat|
   if dat[:split].empty?
     dat.nreply ProtonBot::Messages::NOT_ENOUGH_PARAMETERS
   else
-    dat[:plug].privmsg(dat[:split][0], dat[:split][1, dat[:split].length - 1].join(' '))
+    dat[:plug].privmsg(dat[:split][0], dat[:split][1, dat[:split].length].join(' '))
   end
 end.perm!('msg')
 
-core.help_add('admin', 'ctcp', 'ctcp [target] <message>', 'Sends given ctcp to target')
+core.help_add('admin', 'ctcp', 'ctcp <target> <message>', 'Sends given ctcp to target')
 cmd(cmd: 'ctcp') do |dat|
   if dat[:split].empty?
     dat.nreply ProtonBot::Messages::NOT_ENOUGH_PARAMETERS
   else
-    dat[:plug].ctcp(dat[:split][0], dat[:split][1, dat[:split].length - 1].join(' '))
+    dat[:plug].ctcp(dat[:split][0], dat[:split][1, dat[:split].length].join(' '))
   end
 end.perm!('ctcp')
 
-core.help_add('admin', 'notice', 'notice [target] <message>', 'Sends given notice to target')
+core.help_add('admin', 'action', 'action [target] <message>', 'Sends given ctcp ACTION to target')
+cmd(cmd: 'action') do |dat|
+  if dat[:split].empty?
+    dat.nreply ProtonBot::Messages::NOT_ENOUGH_PARAMETERS
+  else
+    if %w(! + # &).include? dat[:split][0][0]
+      dat[:plug].action(dat[:split][0], dat[:split][1, dat[:split].length].join(' '))
+    else
+      dat[:plug].action(dat[:target], dat[:split][0, dat[:split].length].join(' '))
+    end
+  end
+end.perm!('ctcp')
+
+core.help_add('admin', 'notice', 'notice <target> <message>', 'Sends given notice to target')
 cmd(cmd: 'notice') do |dat|
   if dat[:split].empty?
     dat.nreply ProtonBot::Messages::NOT_ENOUGH_PARAMETERS
   else
-    dat[:plug].notice(dat[:split][0], dat[:split][1, dat[:split].length - 1].join(' '))
+    dat[:plug].notice(dat[:split][0], dat[:split][1, dat[:split].length].join(' '))
   end
 end.perm!('notice')
 
-core.help_add('admin', 'nctcp', 'nctcp [target] <message>', 'Sends given nctcp to target')
+core.help_add('admin', 'nctcp', 'nctcp <target> <message>', 'Sends given nctcp to target')
 cmd(cmd: 'nctcp') do |dat|
   if dat[:split].empty?
     dat.nreply ProtonBot::Messages::NOT_ENOUGH_PARAMETERS
   else
-    dat[:plug].nctcp(dat[:split][0], dat[:split][1, dat[:split].length - 1].join(' '))
+    dat[:plug].nctcp(dat[:split][0], dat[:split][1, dat[:split].length].join(' '))
   end
 end.perm!('nctcp')
 

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

@@ -1,7 +1,8 @@
 hook(type: :ctcp, cmd: 'VERSION') do |dat|
-  dat[:plug].nctcp(dat[:nick], %(VERSION ProtonBot v#{ProtonBot::VERSION} on Ruby ) +
-    %(v#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}/#{RUBY_PLATFORM} and Heliodor ) +
-    %(v#{Gem.loaded_specs['heliodor'].version.version}))
+  dat[:plug].nctcp(dat[:nick], %(VERSION ) + 
+    %(%B%C%BLUEProtonBot v#{ProtonBot::VERSION}%N ) +
+    %(on %B%C%REDRuby v#{RUBY_VERSION}.#{RUBY_PATCHLEVEL}/#{RUBY_PLATFORM}@#{RUBY_ENGINE}#{RUBY_ENGINE_VERSION}%N ) +
+    %(and %B%C%YELLOWHeliodor v#{Gem.loaded_specs['heliodor'].version.version}%N))
 end
 
 hook(type: :ctcp, cmd: 'PING') do |dat|

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

@@ -5,4 +5,5 @@ run 'hooks/privmsg'
 run 'hooks/ctcp'
 run 'hooks/joinpart'
 run 'hooks/nick'
-run 'hooks/sasl'
+run 'hooks/topic'
+run 'hooks/sasl'

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

@@ -1,7 +1,13 @@
 hook(type: :unick) do |dat|
-  u = dat[:plug].users[dat[:nick]].clone
-  dat[:plug].users.delete(dat[:nick])
-  dat[:plug].users[dat[:to]] = u
+  u = nil
+  if dat[:plug].users[dat[:nick]]
+    u = dat[:plug].users[dat[:nick]].clone
+    dat[:plug].users.delete(dat[:nick]) 
+    dat[:plug].users[dat[:to]] = u
+  else
+    u = {}
+    dat[:plug].users[dat[:nick]] = u
+  end
   u[:nick] = dat[:to]
   u[:user] = dat[:user]
   u[:host] = dat[:host]

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

@@ -17,7 +17,7 @@ hook(type: :raw) do |dat|
   elsif m = /^:(.+?)!(.+?)@(.+?) NOTICE (.+?) :(.+)/.match(dat[:raw_data])
     emitt(dat.merge(type: :notice, nick: m[1], user: m[2], host: m[3],
                     target: m[4], message: m[5]))
-  elsif m = /^:(.+?)!(.+?)@(.+?) TOPIC (.+?) :(.+)/.match(dat[:raw_data]) # NYI
+  elsif m = /^:(.+?)!(.+?)@(.+?) TOPIC (.+?) :(.+)/.match(dat[:raw_data])
     emit(dat.merge(type: :utopic, nick: m[1], user: m[2], host: m[3],
                    channel: m[4], topic: m[5]))
   elsif m = /^:(.+?)!(.+?)@(.+?) JOIN :(.+)/.match(dat[:raw_data])

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

@@ -0,0 +1,8 @@
+hook(type: :utopic) do |dat|
+  dat[:plug].users[dat[:nick]] = dat[:plug].users[dat[:nick]] or {}
+  u = dat[:plug].users[dat[:nick]]
+  u[:nick] = dat[:nick]
+  u[:user] = dat[:user]
+  u[:host] = dat[:host]
+  dat[:plug].chans[dat[:chan]][:topic] = dat[:topic]
+end

data/lib/protonbot/plug_utils.rb

@@ -95,6 +95,15 @@ class ProtonBot::Plug
     self
   end
 
+  # Sends CTCP ACTION to given target
+  # @param target [String]
+  # @param msg [String]
+  # @return [Plug] self
+  def action(target, msg)
+    ctcp(target, "ACTION #{msg}")
+    self
+  end
+
   # Sends NCTCP to given target.
   # @param target [String]
   # @param msg [String]

data/lib/protonbot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protonbot
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Nickolay Ilyushin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/protonbot/core_plugin/apis/perms.rb
 - lib/protonbot/core_plugin/codes/index.rb
 - lib/protonbot/core_plugin/codes/names.rb
+- lib/protonbot/core_plugin/codes/topic.rb
 - lib/protonbot/core_plugin/codes/welcome.rb
 - lib/protonbot/core_plugin/codes/whois.rb
 - lib/protonbot/core_plugin/commands/admin.rb
@@ -143,6 +144,7 @@ files:
 - lib/protonbot/core_plugin/hooks/privmsg.rb
 - lib/protonbot/core_plugin/hooks/raw.rb
 - lib/protonbot/core_plugin/hooks/sasl.rb
+- lib/protonbot/core_plugin/hooks/topic.rb
 - lib/protonbot/core_plugin/plugin.rb
 - lib/protonbot/event_lock.rb
 - lib/protonbot/hook.rb