kag-gather 1.3.1 → 1.3.2

data/lib/gather.rb

@@ -1,3 +1,4 @@
+require 'patches'
 require 'kag/gather'
 
 KAG::Bot.new

data/lib/kag/config.rb

@@ -1,10 +1,12 @@
 require 'singleton'
 require 'symboltable'
 require 'json'
+require 'kag/data'
 
 module KAG
   class Config < SymbolTable
     include Singleton
+    @@data = KAG::Data.new
 
     def initialize
       super
@@ -23,5 +25,9 @@ module KAG
       puts "Reloading configuration file..."
       self.merge!(self._get_config)
     end
+
+    def self.data
+      @@data
+    end
   end
 end

data/lib/kag/data.rb

@@ -0,0 +1,41 @@
+require 'singleton'
+require 'symboltable'
+require 'json'
+
+module KAG
+  class Data < Hash
+    def initialize(hash=nil)
+      super
+      self.merge!(self._load)
+    end
+
+    def _load
+      unless File.exists?("config/data.json")
+        File.open("config/data.json","w") {|f| f.write("{}") }
+      end
+      f = ::IO.read("config/data.json")
+      if f and !f.empty?
+        SymbolTable.new(JSON.parse(f))
+      else
+        SymbolTable.new
+      end
+    end
+
+    def reload
+      puts "Reloading data file..."
+      self.merge!(self._load)
+    end
+
+    # Sets the value of the given +key+ to +val+.
+    def store(key, val)
+      super(key,val)
+      self.save
+    end
+
+    def save
+      File.open("config/data.json","w") do |f|
+        f.write(self.to_json)
+      end
+    end
+  end
+end

data/lib/kag/gather.rb

@@ -1,6 +1,8 @@
 require 'cinch'
 require 'kag/bot'
 require 'kag/config'
+require 'kag/data'
+require 'kag/report'
 require 'kag/server'
 require 'kag/match'
 
@@ -31,37 +33,43 @@ module KAG
 
     listen_to :leaving, :method => :on_leaving
     def on_leaving(m,nick)
-      nick = nick.to_s
-      match = get_match_in(nick)
-      if match
-        sub = match.remove_player(nick)
-        if sub
-          m.channel.msg sub[:msg]
+      unless is_banned?(m.user)
+        nick = nick.to_s
+        match = get_match_in(nick)
+        if match
+          sub = match.remove_player(nick)
+          if sub
+            m.channel.msg sub[:msg]
+          end
+        elsif @queue.key?(nick)
+          remove_user_from_queue(nick)
         end
-      elsif @queue.key?(nick)
-        remove_user_from_queue(nick)
       end
     end
 
     listen_to :nick, :method => :on_nick
     def on_nick(m)
-      match = get_match_in(m.user.last_nick)
-      if match
-        match.rename_player(m.user.last_nick,m.user.nick)
-      elsif @queue.key?(m.user.last_nick)
-        @queue[m.user.nick] = @queue[m.user.last_nick]
-        @queue.delete(m.user.last_nick)
+      unless is_banned?(m.user)
+        match = get_match_in(m.user.last_nick)
+        if match
+          match.rename_player(m.user.last_nick,m.user.nick)
+        elsif @queue.key?(m.user.last_nick)
+          @queue[m.user.nick] = @queue[m.user.last_nick]
+          @queue.delete(m.user.last_nick)
+        end
       end
     end
 
     match "sub", :method => :evt_sub
     def evt_sub(m)
-      @matches.each do |k,match|
-        if match.needs_sub?
-          placement = match.sub_in(m.user.nick)
-          if placement
-            reply m,placement[:channel_msg]
-            User(m.user.nick).send placement[:private_msg]
+      unless is_banned?(m.user)
+        @matches.each do |k,match|
+          if match.needs_sub?
+            placement = match.sub_in(m.user.nick)
+            if placement
+              reply m,placement[:channel_msg]
+              User(m.user.nick).send placement[:private_msg]
+            end
           end
         end
       end
@@ -69,50 +77,81 @@ module KAG
 
     match "add", :method => :evt_add
     def evt_add(m)
-      add_user_to_queue(m,m.user.nick)
+      unless is_banned?(m.user)
+        add_user_to_queue(m,m.user.nick)
+      end
     end
 
     match "rem", method: :evt_rem
     def evt_rem(m)
-      match = get_match_in(m.user.nick)
-      if match
-        match.remove_player(m.user.nick)
-        send_channels_msg "#{m.user.nick} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
-      elsif @queue.key?(m.user.nick)
-        unless remove_user_from_queue(m.user.nick)
-          debug "#{nick} is not in the queue."
+      unless is_banned?(m.user)
+        match = get_match_in(m.user.nick)
+        if match
+          match.remove_player(m.user.nick)
+          send_channels_msg "#{m.user.nick} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
+        elsif @queue.key?(m.user.nick)
+          unless remove_user_from_queue(m.user.nick)
+            debug "#{nick} is not in the queue."
+          end
         end
       end
     end
 
     match "list", :method => :evt_list
     def evt_list(m)
-      users = []
-      @queue.each do |n,u|
-        users << n
+      unless is_banned?(m.user)
+        users = []
+        @queue.each do |n,u|
+          users << n
+        end
+        m.user.send "Queue (#{KAG::Match.type_as_string}) [#{@queue.length}] #{users.join(", ")}"
       end
-      m.user.send "Queue (#{KAG::Match.type_as_string}) [#{@queue.length}] #{users.join(", ")}"
     end
 
     match "status", :method => :evt_status
     def evt_status(m)
-      reply m,"Matches in progress: #{@matches.length.to_s}"
+      unless is_banned?(m.user)
+        reply m,"Matches in progress: #{@matches.length.to_s}"
+      end
     end
 
     match "end", :method => :evt_end
     def evt_end(m)
-      match = get_match_in(m.user.nick)
-      if match
-        match.add_end_vote
-        if match.voted_to_end?
-          match.cease
-          @matches.delete(match.server[:key])
-          send_channels_msg("Match at #{match.server[:key]} finished!")
+      unless is_banned?(m.user)
+        match = get_match_in(m.user.nick)
+        if match
+          match.add_end_vote
+          if match.voted_to_end?
+            match.cease
+            @matches.delete(match.server[:key])
+            send_channels_msg("Match at #{match.server[:key]} finished!")
+          else
+            reply m,"End vote started, #{match.get_needed_end_votes_left} more votes to end match at #{match.server[:key]}"
+          end
         else
-          reply m,"End vote started, #{match.get_needed_end_votes_left} more votes to end match at #{match.server[:key]}"
+          reply m,"You're not in a match, silly! Stop trying to hack me."
+        end
+      end
+    end
+
+    match "help", :method => :evt_help
+    def evt_help(m)
+      unless is_banned?(m.user)
+        msg = "Commands: !add, !rem, !list, !status, !help, !end, !report"
+        msg = msg + ", !rem [nick], !add [nick], !add_silent, !rem_silent, !unreport, !clear, !restart, !quit" if is_admin(m.user)
+        User(m.user.nick).send(msg)
+      end
+    end
+
+    match /report (.+)/,:method => :report
+    def report(m,nick)
+      unless is_banned?(m.user)
+        u = User(nick)
+        if u and !u.unknown
+          KAG::Report.new(m,u)
+        else
+          reply m,"User #{nick} not found!"
         end
-      else
-        reply m,"You're not in a match, silly! Stop trying to hack me."
       end
     end
 
@@ -167,19 +206,20 @@ module KAG
           return false
         end
 
+        # reset queue first to prevent 11-player load
+        @queue = {}
+
         match = KAG::Match.new(SymbolTable.new({
           :server => server,
           :players => players
         }))
-        match.start
-        messages = match.notify_teams_of_match_start
+        match.start # prepare match data
+        messages = match.notify_teams_of_match_start # gather texts for private messages
+        send_channels_msg(match.text_for_match_start,false) # send channel-wide first
         messages.each do |nick,msg|
           User(nick.to_s).send(msg) unless nick.to_s.include?("player")
-          sleep(2)
+          sleep(2) # prevent excess flood stuff
         end
-        send_channels_msg(match.text_for_match_start,false)
-
-        @queue = {}
         @matches[server[:key]] = match
       end
     end
@@ -198,19 +238,13 @@ module KAG
 
     def get_unused_server
       server = false
+      @servers.shuffle!
       @servers.each do |k,s|
         server = s unless s.in_use?
       end
       server
     end
 
-    match "help", :method => :evt_help
-    def evt_help(m)
-      msg = "Commands: !add, !rem, !list, !status, !help, !end"
-      msg = msg + ", !rem [nick], !add [nick], !add_silent, !rem_silent, !clear, !restart, !quit" if is_admin(m.user)
-      User(m.user.nick).send(msg)
-    end
-
     # admin methods
 
     def debug(msg)
@@ -399,5 +433,74 @@ module KAG
         m.reply "Configuration reloaded."
       end
     end
+
+    match /unreport (.+)/,:method => :unreport
+    def unreport(m,nick)
+      if is_admin(m.user)
+        user = User(nick)
+        if user and !user.unknown
+          KAG::Report.remove(user,m,self)
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+
+    match /ignore (.+)/,:method => :ignore
+    def ignore(m,nick)
+      if is_admin(m.user)
+        user = User(nick)
+        if user and !user.unknown
+          KAG::Report.ignore(user,m,self)
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+
+    match /unignore (.+)/,:method => :unignore
+    def unignore(m,nick)
+      if is_admin(m.user)
+        user = User(nick)
+        if user and !user.unknown
+          KAG::Report.unignore(user,m,self)
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+
+    match /hostname (.+)/,:method => :hostname
+    def hostname(m,nick)
+      if is_admin(m.user)
+        user = User(nick)
+        if user and !user.unknown
+          reply m,"Hostname for #{nick} is #{user.host}"
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+
+    match /authname (.+)/,:method => :authname
+    def authname(m,nick)
+      if is_admin(m.user)
+        user = User(nick)
+        if user and !user.unknown
+          reply m,"Authname for #{nick} is #{user.authname}"
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+
+    def is_banned?(user)
+      d = KAG::Config.data
+      if d
+        d[:ignored].key?(user.host.to_sym)
+      else
+        false
+      end
+    end
   end
 end

data/lib/kag/report.rb

@@ -0,0 +1,146 @@
+require 'symboltable'
+require 'kag/data'
+require 'kag/config'
+
+module KAG
+  class Report < SymbolTable
+
+    def initialize(m,user)
+      hash = {
+        :nick => user.nick,
+        :authname => user.authname,
+        :host => user.host,
+        :realname => user.realname,
+        :gather => self,
+        :message => m,
+        :count => 1
+      }
+      super(hash)
+      _ensure_data
+      if reported?
+        if can_report?
+          if past_threshold?
+            ignore
+          else
+            up_report_count
+          end
+        else
+          self[:gather].reply self[:message],"You have already reported #{self[:nick]}. You can only report a user once."
+        end
+      else
+        report
+      end
+    end
+
+    def can_report?
+      r = _report
+      if r and r[:reporters]
+        !r[:reporters].include?(self[:message].user.authname)
+      else
+        true
+      end
+    end
+
+    def _ensure_data
+      data[:reported] = {} unless data[:reported]
+      data[:ignored] = {} unless data[:ignored]
+    end
+
+    def reported?
+      data[:reported].key?(self[:host].to_sym)
+    end
+
+    def report
+      puts self[:message].inspect
+      c = self.dup
+      c.delete(:gather)
+      c.delete(:message)
+      c[:reporters] = [self[:message].user[:authname]]
+      data[:reported][self[:host].to_sym] = c
+      data.save
+
+      self[:gather].reply self[:message],"User #{self[:nick]} reported." if self[:gather].class == KAG::Gather
+    end
+
+    def ignore
+      c = self.clone
+      c.delete(:gather)
+      c.delete(:message)
+      data[:ignored][self[:host].to_sym] = c
+      data.save
+      self[:gather].reply self[:message],"User #{self[:nick]} ignored." if gather.class == KAG::Gather
+    end
+
+    def past_threshold?
+      _report[:count].to_i > KAG::Config.instance[:report_threshold].to_i
+    end
+
+    def up_report_count
+      _report[:count] = _report[:count].to_i + 1
+      _report[:reporters] = [] unless _report[:reporters]
+      _report[:reporters] << self[:message].user.authname
+      data.save
+
+      gather.reply message,"User #{self[:nick]} reported. #{self[:nick]} has now been reported #{data[:reported][self[:host].to_sym][:count]} times." if gather.class == KAG::Gather
+    end
+
+    def self.ignore(user,message,gather)
+      KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
+      if KAG::Config.data[:ignored] and !KAG::Config.data[:ignored].key?(user.host.to_sym)
+        c = SymbolTable.new({
+          :nick => user.nick,
+          :authname => user.authname,
+          :host => user.host,
+          :realname => user.realname,
+          :gather => gather,
+          :message => message,
+          :reporters => [message.user.authname]
+        })
+        KAG::Config.data[:ignored][user.host.to_sym] = c
+        KAG::Config.data.save
+
+        gather.reply message,"User #{user.nick} added to ignore list." if gather.class == KAG::Gather
+        true
+      else
+        gather.reply message,"User #{user.nick} already in ignore list!" if gather.class == KAG::Gather
+        false
+      end
+    end
+
+    def self.remove(user,message,gather)
+      if KAG::Config.data[:reported] and KAG::Config.data[:reported].key?(user.host.to_sym)
+        KAG::Config.data[:reported].delete(user.host.to_sym)
+        KAG::Config.data.save
+
+        gather.reply message,"User #{user.nick} removed from report list." if gather.class == KAG::Gather
+        true
+      else
+        gather.reply message,"User #{user.nick} not in report list!" if gather.class == KAG::Gather
+        false
+      end
+    end
+
+    def self.unignore(user,message,gather)
+      if KAG::Config.data[:ignored] and KAG::Config.data[:ignored].key?(user.host.to_sym)
+        KAG::Config.data[:ignored].delete(user.host.to_sym)
+        KAG::Config.data.save
+
+        gather.reply message,"User #{user.nick} removed from ignore list." if gather.class == KAG::Gather
+        true
+      else
+        gather.reply message,"User #{user.nick} not in ignore list!" if gather.class == KAG::Gather
+        false
+      end
+    end
+
+    protected
+
+    def data
+      KAG::Config.data
+    end
+
+    def _report
+      data[:reported][self[:host].to_sym]
+    end
+  end
+end

data/lib/kag/server.rb

@@ -21,7 +21,12 @@ module KAG
 
     def socket
       unless self[:_socket]
-        self[:_socket] = TCPSocket.new(self[:ip],self[:port])
+        begin
+          self[:_socket] = TCPSocket.new(self[:ip],self[:port])
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace.join("\n")
+        end
       end
       puts self[:_]
       self[:_socket]
@@ -38,12 +43,19 @@ module KAG
         puts "[RCON] Could not establish TCP socket to connect"
         return false
       end
-      self.socket.puts self[:rcon_password]
-      z = self.socket.gets
-      puts "[RCON] "+z.to_s
-      z.include?("now authenticated")
-      self[:_connected] = true
-      true
+      success = false
+      begin
+        self.socket.puts self[:rcon_password]
+        z = self.socket.gets
+        puts "[RCON] "+z.to_s
+        z.include?("now authenticated")
+        self[:_connected] = true
+        success = true
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace.join("\n")
+      end
+      success
     end
 
     def disconnect

data/lib/kag/team.rb

@@ -58,7 +58,7 @@ module KAG
         sub = {}
         sub[:cls] = self[:players][nick]
         sub[:team] = self.clone
-        sub[:msg] = "Sub needed at #{self.match.server[:ip]} for #{sub[:team]}, #{sub[:cls]} Class! Type !sub to claim it!"
+        sub[:msg] = "Sub needed at #{self.match.server[:ip]} for #{sub[:team][:name]}, #{sub[:cls]} Class! Type !sub to claim it!"
         sub[:channel_msg] = "#{nick} is now subbing in for #{self[:name]} at #{self.match.server[:key]}. Subs still needed: #{self.match[:subs_needed].length}"
         sub[:private_msg] = "Please #{self.match.server.text_join} | #{sub[:cls]} on the #{self[:name]} Team"
         self[:players].delete(nick)

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
   def self.version
     VERSION
   end

data/lib/patches.rb

@@ -0,0 +1,16 @@
+class Hash
+  @keys_not_used = nil
+  def random_key
+    @keys_not_used = self.dup if (!@keys_not_used or @keys_not_used.size == 0)
+	  key = @keys_not_used.keys[rand(@keys_not_used.size)]
+	  @keys_not_used.delete(key)
+    key
+  end
+  def shuffle
+    self.class[self.to_a.sample(self.length)]
+  end
+
+  def shuffle!
+    self.replace(self.shuffle)
+  end
+end

metadata

@@ -1,128 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.3.1
+  version: 1.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Shaun McCormick
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: symboltable
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: kagerator
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 description: ''
 email:
 - splittingred@gmail.com
@@ -134,37 +134,38 @@ files:
 - lib/gather.rb
 - lib/kag/bot.rb
 - lib/kag/config.rb
+- lib/kag/data.rb
 - lib/kag/gather.rb
 - lib/kag/match.rb
+- lib/kag/report.rb
 - lib/kag/server.rb
 - lib/kag/team.rb
 - lib/kag/version.rb
+- lib/patches.rb
 - config/config.sample.json
 homepage: https://github.com/splittingred/kag-gather
 licenses:
 - GPLv2
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.25
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
 specification_version: 3
 summary: KAG Gather IRC Bot
 test_files: []
-has_rdoc:
-...