protonbot-chanop 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89113e464b2106fac68e73d70dff4745fd058794
-  data.tar.gz: 97823e54d8fb57c71e9523cd7ff1a7f2ff930dea
+  metadata.gz: 48ea55e67b8525beda08823972f2143e2d086b20
+  data.tar.gz: 2851f74cf935a12139fef4b4318eae35e7591839
 SHA512:
-  metadata.gz: 9eec73915a23053407c612e3c87b2d37db8d46fb17660f195058bf5538f182d0703a522fbe8731b24cc672328d46b1790c40c9a7b17bd6fff79130c223727383
-  data.tar.gz: ce771242271d4a5ae6a4bf2eeb7d2b75c21c9777f6c201ee8e91421d90bfa74a1398d298e6e70a57c67fe1c62d07b2b30513306651ce2e05fc67b7700c03712d
+  metadata.gz: 98de97adc76d6b79b2f9f4f31a89f360a57d5ed497346c1206cd5c8b03a54f3d32534193c6c6bb34e4e66c9b3f7c40c1759eaee943d58498700f670cb77a90ab
+  data.tar.gz: 7b99239e01bfa28ddb053cfd22cfbca49b444ef39788e2885f463148f5c88537f8ba814a5e0cdceb645947c9517a1923d48264b1f7710ea8f92db118b2c24030

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+*.sublime*

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Nickolay
+Copyright (c) 2017 Nickolay Ilyushin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/protonbot/chanop/commands.rb

@@ -128,7 +128,7 @@ cmd(cmd: 'unexcempt') do |dat|
   end
 end.perm!('excempt')
 
-core.help_add('chanop', 'kick', 'kick [chan] <target>',
+core.help_add('chanop', 'kick', 'kick [chan] <target> [reason]',
   'Kicks target from this/given channel')
 cmd(cmd: 'kick') do |dat|
   case dat[:split].length
@@ -137,10 +137,15 @@ cmd(cmd: 'kick') do |dat|
   when 1
     dat[:plug].kick(dat[:target], dat[:split][0])
   when 2..512
-    dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length-1].join(' '))
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+    else
+      dat[:plug].kick(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+    end
   end
 end.perm!('kick')
 
+core.help_add('chanop', 'remove', 'remove [chan] <target> [reason]')
 cmd(cmd: 'remove') do |dat|
   case dat[:split].length
   when 0
@@ -148,11 +153,15 @@ cmd(cmd: 'remove') do |dat|
   when 1
     dat[:plug].remove(dat[:target], dat[:split][0])
   when 2..512
-    dat[:plug].remove(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length-1].join(' '))
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].remove(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+    else
+      dat[:plug].remove(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+    end
   end
 end.perm!('remove')
 
-core.help_add('chanop', 'kban', 'kban [chan] <target>',
+core.help_add('chanop', 'kban', 'kban [chan] <target> [reason]',
   'Kickbans target from this/given channel')
 cmd(cmd: 'kban') do |dat|
   case dat[:split].length
@@ -162,10 +171,35 @@ cmd(cmd: 'kban') do |dat|
     dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
     dat[:plug].kick(dat[:target], dat[:split][0])
   when 2..512
-    dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
-    dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length-1].join(' '))
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].ban(dat[:split][0], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+      dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+    else
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+      dat[:plug].kick(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+    end
   end
-end.perm!('kickban')
+end.perm!('kick', 'ban')
+
+core.help_add('chanop', 'rban', 'rban [chan] <target> [reason]',
+  'Removebans target from this/given channel')
+cmd(cmd: 'rban') do |dat|
+  case dat[:split].length
+  when 0
+    dat.nreply 'Not enough parameters!'
+  when 1
+    dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+    dat[:plug].remove(dat[:target], dat[:split][0])
+  when 2..512
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].ban(dat[:split][0], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+      dat[:plug].remove(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+    else
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+      dat[:plug].remove(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+    end
+  end
+end.perm!('remove', 'ban')
 
 core.help_add('chanop', 'arjk', 'arjk [chan] <target>',
   'Anti-Rejoin-Kicks target from this/given channel')
@@ -179,12 +213,19 @@ cmd(cmd: 'arjk') do |dat|
     sleep(5)
     dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
   when 2..512
-    dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
-    dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length-1].join(' '))
-    sleep(5)
-    dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+      dat[:plug].kick(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+      sleep(5)
+      dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+    else
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+      dat[:plug].kick(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+      sleep(5)
+      dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+    end
   end
-end.perm!('arjk')
+end.perm!('kick', 'ban')
 
 core.help_add('chanop', 'arjr', 'arjr [chan] <target>',
   'Anti-Rejoin-Removes target from this/given channel')
@@ -198,12 +239,19 @@ cmd(cmd: 'arjr') do |dat|
     sleep(5)
     dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
   when 2..512
-    dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
-    dat[:plug].remove(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length-1].join(' '))
-    sleep(5)
-    dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+    if %w(# + ! &).include? dat[:split][0][0]
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+      dat[:plug].remove(dat[:split][0], dat[:split][1], dat[:split][2..dat[:split].length].join(' '))
+      sleep(5)
+      dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][1]))
+    else
+      dat[:plug].ban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+      dat[:plug].remove(dat[:target], dat[:split][0], dat[:split][1..dat[:split].length].join(' '))
+      sleep(5)
+      dat[:plug].unban(dat[:target], '*!*@' + dat[:plug].gethost(dat[:split][0]))
+    end
   end
-end.perm!('arjr')
+end.perm!('remove', 'ban')
 
 core.help_add('chanop', 'umode', 'umode [chan] <user> <mode>',
   'Sets given mode on given user at this/given channel')
@@ -214,15 +262,15 @@ cmd(cmd: 'umode') do |dat|
   when 2
     unless /[+-]/ =~ dat[:split][1][0]
       dat.nreply 'Wrong mode!'
-      break
+    else
+      dat[:plug].usermode(dat[:target], dat[:split][0], dat[:split][1])
     end
-    dat[:plug].usermode(dat[:target], dat[:split][0], dat[:split][1])
   when 3..512
     unless /[+-]/ =~ dat[:split][2][0]
       dat.nreply 'Wrong mode!'
-      break
+    else
+      dat[:plug].usermode(dat[:split][0], dat[:split][1], dat[:split][2])
     end
-    dat[:plug].usermode(dat[:split][0], dat[:split][1], dat[:split][2])
   end
 end.perm!('umode')
 
@@ -258,4 +306,4 @@ cmd(cmd: 'invite') do |dat|
   when 2..512
     dat[:plug].invite(dat[:split][0], dat[:split][1])
   end
-end.perm!('invite')
+end.perm!('invite')

data/lib/protonbot/chanop/plugin.rb

@@ -7,12 +7,9 @@ ProtonBot::Plugin.new do
 
   core.permhash['admin'] << 'chanop'
   core.permhash['chanop'] = %w(
-    kickban
     kick
     remove
     ban
-    arjk
-    arjr
     excempt
     quiet
     umode

data/lib/protonbot/chanop.rb

@@ -1,5 +1,5 @@
 module ProtonBot
   module Chanop
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: protonbot-chanop
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nickolay Ilyushin
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: protonbot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-  name: protonbot
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,7 +75,7 @@ homepage: https://github.com/handicraftsman/protonbot-chanop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.8
+signing_key: 
 specification_version: 4
 summary: Chanop plugin for protonbot
 test_files: []