kag-gather 1.3.5 → 1.4.0

data/lib/kag/bans/report.rb

@@ -143,10 +143,20 @@ module KAG
 
       def self.is_banned?(user)
         KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
-        begin
-          KAG::Config.data[:ignored].key?(user.authname.to_sym)
-        rescue Exception => e
-          puts e.message
+        if KAG::Config.data.flooding?(user)
+          return true
+        end
+
+        if user.authname and user.authname != ""
+          begin
+            KAG::Config.data[:ignored].key?(user.authname.to_sym)
+          rescue Exception => e
+            puts e.message
+            puts e.backtrace
+          end
+        else
+          user.send "You must first AUTH on the IRC server before you can use this bot."
+          KAG::Config.data.add_action(user)
         end
       end
 

data/lib/kag/bot/bot.rb

@@ -6,6 +6,7 @@ require 'kag/gather/plugin'
 require 'kag/bans/plugin'
 require 'kag/irc/plugin'
 require 'kag/bot/plugin'
+require 'kag/user/plugin'
 require 'commands/help'
 
 module KAG
@@ -23,7 +24,14 @@ module KAG
             c.realname = config[:realname].to_s != "" ? config[:realname] : "KAG Gatherer"
             c.messages_per_second = 1
             c.server_queue_size = 1
-            c.plugins.plugins = [Cinch::Commands::Help,KAG::Bot::Plugin,KAG::Gather::Plugin,KAG::Bans::Plugin,KAG::IRC::Plugin]
+            c.plugins.plugins = [
+              Cinch::Commands::Help,
+              KAG::Bot::Plugin,
+              KAG::Gather::Plugin,
+              KAG::Bans::Plugin,
+              KAG::IRC::Plugin,
+              KAG::User::Plugin
+            ]
             if config[:sasl]
               c.sasl.username = config[:sasl][:username]
               c.sasl.password = config[:sasl][:password]

data/lib/kag/data.rb

@@ -37,5 +37,20 @@ module KAG
         f.write(self.to_json)
       end
     end
+
+    def add_action(user)
+      self[:action_log] = [] unless self[:action_log]
+      self[:action_log] << user.nick
+      self[:action_log].shift if self[:action_log].length > 10
+      save
+    end
+
+    def flooding?(user)
+      flooding = false
+      if self[:action_log]
+        flooding = true if self[:action_log].count(user.nick) > 8
+      end
+      flooding
+    end
   end
 end

data/lib/kag/gather/match.rb

@@ -1,11 +1,15 @@
 require 'cinch'
+require 'cinch/helpers'
 require 'symboltable'
 require 'kag/config'
 require 'kag/gather/team'
+require 'kag/user/user'
 
 module KAG
   module Gather
     class Match < SymbolTable
+      include Cinch::Helpers
+
       def self.type_as_string
         ms = KAG::Config.instance[:match_size].to_i
         ts = (ms / 2).ceil
@@ -24,6 +28,13 @@ module KAG
         debug "LOWER BOUND: #{lb.to_s}"
         debug "PLAYERS: #{self[:players].join(",")}"
 
+        self[:players].each do |player|
+          u = User(player.to_s)
+          if u
+            KAG::User::User.add_match(u)
+          end
+        end
+
         self[:teams] = []
         self[:teams] << KAG::Gather::Team.new({
           :players => self[:players].slice(0,lb),
@@ -82,10 +93,10 @@ module KAG
         evt - self[:end_votes]
       end
 
-      def has_player?(nick)
+      def has_player?(user)
         playing = false
         self[:teams].each do |team|
-          playing = true if team.has_player?(nick)
+          playing = true if team.has_player?(user)
         end
         playing
       end
@@ -116,11 +127,11 @@ module KAG
         end
       end
 
-      def remove_player(nick)
+      def remove_player(user)
         sub = false
         self[:teams].each do |team|
-          if team.has_player?(nick)
-            sub = team.remove_player(nick)
+          if team.has_player?(user)
+            sub = team.remove_player(user)
           end
         end
         if sub
@@ -141,10 +152,10 @@ module KAG
         placement
       end
 
-      def rename_player(last_nick,new_nick)
+      def rename_player(user)
         self[:teams].each do |team|
-          if team.has_player?(last_nick)
-            team.rename_player(last_nick,new_nick)
+          if team.has_player?(user)
+            team.rename_player(user)
           end
         end
       end

data/lib/kag/gather/plugin.rb

@@ -37,34 +37,41 @@ module KAG
       listen_to :leaving, :method => :on_leaving
       def on_leaving(m,nick)
         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]
+          user = User(nick.to_s)
+          if user
+            match = get_match_in(user)
+            if match
+              sub = match.remove_player(user)
+              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)
+          else
+            reply m,"User #{nick} not found"
           end
         end
       end
 
       listen_to :nick, :method => :on_nick
       def on_nick(m)
-        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
+
+        #unless is_banned?(m.user)
+        #  match = get_match_in(m.user)
+        #  if match
+        #    match.rename_player(m.user)
+        #  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)
+      command :sub,{},
+        summary: "Sub into a match",
+        description: "If a player leaves a match early, you can use this command to sub in and join the match"
+      def sub(m)
         unless is_banned?(m.user)
           @matches.each do |k,match|
             if match.needs_sub?
@@ -90,9 +97,9 @@ module KAG
         summary: "Remove yourself from the active queue for the next match"
       def rem(m)
         unless is_banned?(m.user)
-          match = get_match_in(m.user.nick)
+          match = get_match_in(m.user)
           if match
-            match.remove_player(m.user.nick)
+            match.remove_player(m.user)
             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)
@@ -127,7 +134,7 @@ module KAG
         description: "End the current match. This will only work if you are in the match. After !end is called by 3 different players, the match will end."
       def end(m)
         unless is_banned?(m.user)
-          match = get_match_in(m.user.nick)
+          match = get_match_in(m.user)
           if match
             match.add_end_vote
             if match.voted_to_end?
@@ -170,10 +177,10 @@ module KAG
         end
       end
 
-      def get_match_in(nick)
+      def get_match_in(user)
         m = false
         @matches.each do |k,match|
-          if match.has_player?(nick)
+          if match.has_player?(user)
             m = match
           end
         end
@@ -199,7 +206,8 @@ module KAG
 
           match = KAG::Gather::Match.new(SymbolTable.new({
             :server => server,
-            :players => players
+            :players => players,
+            :bot => self.bot
           }))
           match.start # prepare match data
           messages = match.notify_teams_of_match_start # gather texts for private messages
@@ -288,7 +296,7 @@ module KAG
         admin: true
       def restart_map(m)
         if is_admin(m.user)
-          match = get_match_in(m.user.nick)
+          match = get_match_in(m.user)
           if match and match.server
             match.server.restart_map
           end
@@ -314,7 +322,7 @@ module KAG
         admin: true
       def next_map(m)
         if is_admin(m.user)
-          match = get_match_in(m.user.nick)
+          match = get_match_in(m.user)
           if match and match.server
             match.server.next_map
           end
@@ -340,12 +348,17 @@ module KAG
         admin: true
       def kick_from_match(m,nick)
         if is_admin(m.user)
-          match = get_match_in(nick)
-          if match
-            match.remove_player(nick)
-            m.reply "#{nick} has been kicked from the match"
+          user = User(nick.to_s)
+          if user
+            match = get_match_in(user)
+            if match
+              match.remove_player(user)
+              m.reply "#{user.nick} has been kicked from the match"
+            else
+              m.reply "#{user.nick} is not in a match!"
+            end
           else
-            m.reply "#{nick} is not in a match!"
+            reply m,"User #{nick} not found"
           end
         end
       end

data/lib/kag/gather/team.rb

@@ -2,6 +2,7 @@ require 'cinch'
 require 'cinch/user'
 require 'symboltable'
 require 'kag/config'
+require 'kag/user/user'
 
 module KAG
   module Gather
@@ -42,30 +43,32 @@ module KAG
         "#{self[:color]}#{self[:players].keys.join(", ")} (#{self[:name]})"
       end
 
-      def has_player?(nick)
-        self[:players].keys.include?(nick.to_sym)
+      def has_player?(user)
+        self[:players].keys.include?(user.nick.to_sym)
       end
 
-      def rename_player(last_nick,new_nick)
-        if has_player?(nick)
-          cls = self[:players][last_nick.to_sym]
-          self[:players].delete(last_nick.to_sym)
-          self[:players][new_nick.to_sym] = cls
+      def rename_player(user)
+        if self[:players].keys.include?(user.last_nick.to_sym)
+          cls = self[:players][user.last_nick.to_sym]
+          self[:players].delete(user.last_nick.to_sym)
+          self[:players][user.nick.to_sym] = cls
         end
       end
 
-      def remove_player(nick)
-        if has_player?(nick)
+      def remove_player(user)
+        if has_player?(user)
           sub = {}
-          sub[:cls] = self[:players][nick]
+          sub[:cls] = self[:players][user.nick]
           sub[:team] = self.clone
           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[:channel_msg] = "#{user.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)
+          self[:players].delete(user.nick)
+
+          KAG::User::User.subtract_match(user)
 
           if self.match and self.match.server
-            self.match.server.kick(nick)
+            self.match.server.kick(user.nick)
           end
 
           sub

data/lib/kag/user/plugin.rb

@@ -0,0 +1,32 @@
+require 'cinch'
+require 'kag/common'
+require 'commands/help'
+require 'kag/user/user'
+
+module KAG
+  module User
+    class Plugin
+      include Cinch::Plugin
+      include Cinch::Commands
+      include KAG::Common
+
+      command :stats,{},
+        summary: "Get the stats for a user"
+      def stats(m)
+        reply m,KAG::User::User.stats(m.user)
+      end
+
+      command :stats,{nick: :string},
+        summary: "Get the stats for a user",
+        method: :stats_specific
+      def stats_specific(m,nick)
+        user = User(nick)
+        if user and !user.unknown
+          reply m,KAG::User::User.stats(user)
+        else
+          reply m,"Could not find user #{nick}"
+        end
+      end
+    end
+  end
+end

data/lib/kag/user/user.rb

@@ -0,0 +1,71 @@
+require 'symboltable'
+require 'json'
+
+module KAG
+  module User
+    class User < SymbolTable
+
+      def initialize(user)
+        self[:authname] = user.authname
+        super({})
+        self.merge!(_load)
+      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("data/#{self.authname}.json","w") do |f|
+          f.write(self.to_json)
+        end
+      end
+
+      def self.add_match(user)
+        u = KAG::User::User.new(user)
+        u[:matches] = 0 unless u[:matches]
+        u[:matches] = u[:matches].to_i + 1
+        u.save
+      end
+
+      def self.subtract_match(user)
+        u = KAG::User::User.new(user)
+        if u[:matches]
+          u[:matches] = u[:matches].to_i + 1
+        else
+          u[:matches] = 0
+        end
+        u.save
+      end
+
+      def self.stats(user)
+        u = KAG::User::User.new(user)
+        "#{user.nick} has played in #{u.matches} matches."
+      end
+
+      protected
+
+      def _load
+        return {} unless self[:authname]
+
+        unless File.exists?("data/#{self[:authname]}.json")
+          File.open("data/#{self[:authname]}.json","w") {|f| f.write("{}") }
+        end
+
+        f = ::IO.read("data/#{self[:authname]}.json")
+        if f and !f.empty?
+          SymbolTable.new(JSON.parse(f))
+        else
+          SymbolTable.new
+        end
+      end
+    end
+  end
+end

data/lib/kag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -147,6 +147,8 @@ files:
 - lib/kag/gather/team.rb
 - lib/kag/irc/plugin.rb
 - lib/kag/server.rb
+- lib/kag/user/plugin.rb
+- lib/kag/user/user.rb
 - lib/kag/version.rb
 - lib/patches.rb
 - config/config.sample.json