zetabot 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1fb2672260cce23a53495ccdf9c1d9c9b6f0e54
-  data.tar.gz: 82c52214d64fbad96b97c80f90da5b432177b26c
+  metadata.gz: 68d78754e661e90b35e886c10b1d8ef7b21b7f9d
+  data.tar.gz: 4fa6fce72cc93effcae2f371a3cf7e2ea6ced806
 SHA512:
-  metadata.gz: f7dc2e90e6a816c06d46b16a33f914c6bea7aa93f091b5386b90e24f17e1eb26b601a77fa87992ecbebd0c78b7081fd8dff6c2c7809897dbe267d433216e7fd4
-  data.tar.gz: 98735bd31c85d9d101fcaa7adc1806d5a4def525b6f7687d9590be79c1fbe198a5dae7eee23a1203f33b1279723a5c15742b57aae63fa821af20d55a76e5a7a1
+  metadata.gz: 76fc0c344ecfe0361ffd282444b387e8d521a0ed8c81aa7d481a390f13964a533b69a10f5e01cf2f74ced191a035f8bd7215733c8ff6b5018800db34eb0ba448
+  data.tar.gz: 1d8319db93efffd615e206e38bfa5dd72e69c5e5d503baa3ee84911fba90d6ec27281c099b19280aae90f193ca4b5611efec2a570f23dc2e2cbd9e901f689978

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zetabot (0.0.10)
+    zetabot (0.0.11)
       actionview
       chronic
       chronic_duration

data/lib/Zeta/access.rb

@@ -7,6 +7,8 @@ module Cinch
       end
     end
 
+    Spam = Struct.new(:nick, :time)
+
     def check?(m, lvl, secure_chan)
       # Make sure we are actually getting a channel object
       if m.class == Cinch::Channel

data/lib/Zeta/admin.rb

@@ -7,4 +7,5 @@ require 'Zeta/admin/plugins'
 require 'Zeta/admin/users'
 require 'Zeta/admin/autojoin'
 require 'Zeta/admin/ignore'
-require 'Zeta/admin/bot'
+require 'Zeta/admin/bot'
+require 'Zeta/admin/blacklister'

data/lib/Zeta/admin/blacklister.rb

@@ -0,0 +1,73 @@
+module Admin
+  class Blacklister
+    include Cinch::Plugin
+
+    enable_acl(:oper)
+
+    set(
+        plugin_name: "Bot_Eval",
+        help:        "Bot administrator-only private commands.\nUsage: `?er <code>`;",
+    )
+
+    # Regex
+    match /bl channel (\S+)/, method: :bl_channel
+    match /bl url (\S+)/, method: :bl_url
+    match /bl mask (\S+)/, method: :bl_mask
+    # match /bl plugin (\S+)/, method: :bl_plugin
+
+    # Load the defaults
+    match 'bl defaults', method: :bl_defaults
+
+    # Sync
+    match 'sync', method: :sync
+    match 'bl sync', method: :sync
+
+
+    def bl_channel(m, chan)
+      m.reply "#{chan} is already on BlackList" if Blacklist.channels.include? chan
+      Blacklist.channels << chan
+      save_blacklist()
+      m.reply "#{chan} is now on the BlackList"
+    end
+
+    def bl_url(m, url)
+      m.reply "#{url} is already on BlackList" if Blacklist.channels.include? url
+      Blacklist.urls << url
+      save_blacklist()
+      m.reply "#{url} is now on the BlackList"
+    end
+
+    def bl_mask(m, mask)
+      m.reply "#{mask} is already on BlackList" if Blacklist.masks.include? mask
+      Blacklist.masks << url
+      save_blacklist()
+      m.reply "#{mask} is now on the BlackList"
+    end
+
+    def bl_plugin(m, plugin)
+      # TODO: This needs alot more work because i need to disable by channel
+    end
+
+    def bl_defaults(m)
+      clear_blacklist()
+      Blacklist.urls = Config.options[:blacklist][:urls]
+      Blacklist.users = Config.options[:blacklist][:users]
+      Blacklist.masks = Config.options[:blacklist][:masks]
+      Blacklist.channels = Config.options[:blacklist][:channels]
+      save_blacklist()
+      m.reply 'Default Blacklist Loaded'
+    end
+
+    def sync(m)
+      save_blacklist()
+      m.action_reply 'Blacklist is now synced!'
+    end
+
+
+
+  end
+end
+
+
+# AutoLoad
+Bot.config.plugins.plugins.push Admin::Blacklister

data/lib/Zeta/admin/ignore.rb

@@ -21,8 +21,6 @@ module Admin
 
     match 'ignorelist', method: :ignore_list
 
-    match 'sync', method: :sync
-
     def finalize
       save_blacklist()
     end
@@ -99,10 +97,6 @@ module Admin
       m.reply "Currently ignored users are: #{Blacklist.users.join(', ')}"
     end
 
-    def sync(m)
-      save_blacklist()
-      m.action_reply 'is now synced!'
-    end
 
   end
 end

data/lib/Zeta/blacklist.rb

@@ -1,4 +1,4 @@
-BlackListStruct = Struct.new :channels, :users, :plugins
+BlackListStruct = Struct.new :channels, :users, :plugins, :urls, :masks
 
 # Load Cached
 if File.exists?(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
@@ -6,7 +6,7 @@ if File.exists?(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
     Blacklist = Marshal.load(file)
   end
 else
-  Blacklist = BlackListStruct.new([], [], [])
+  Blacklist = BlackListStruct.new([], [], [], [], [])
 end
 
 
@@ -21,5 +21,7 @@ def clear_blacklist()
   Blacklist.users = []
   Blacklist.plugins = []
   Blacklist.channels = []
+  Blacklist.urls = []
+  Blacklist.masks = []
   File.delete(File.join(Dir.home, '.zeta', 'cache', 'blacklist.rb'))
 end

data/lib/Zeta/plugins/snooper.rb

@@ -64,6 +64,9 @@ module Plugins
       # Parse URI
       p = URI(url)
 
+      # Disregaurd on blacklist
+      return if Blacklist.urls.include? p.host
+
       # API key lookup
       VideoInfo.provider_api_keys = { youtube: Config.secrets[:google] }
 

data/lib/Zeta/version.rb

@@ -1,3 +1,3 @@
 module Zeta
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zetabot
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Liothen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -552,6 +552,7 @@ files:
 - lib/Zeta/access.rb
 - lib/Zeta/admin.rb
 - lib/Zeta/admin/autojoin.rb
+- lib/Zeta/admin/blacklister.rb
 - lib/Zeta/admin/bot.rb
 - lib/Zeta/admin/channels.rb
 - lib/Zeta/admin/eval.rb