kag-gather 1.3.4 → 1.3.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -131,15 +131,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - readme.md
+- lib/commands/command.rb
+- lib/commands/commands.rb
+- lib/commands/help.rb
 - lib/gather.rb
-- lib/kag/bot.rb
+- lib/kag/bans/plugin.rb
+- lib/kag/bans/report.rb
+- lib/kag/bot/bot.rb
+- lib/kag/bot/plugin.rb
+- lib/kag/common.rb
 - lib/kag/config.rb
 - lib/kag/data.rb
-- lib/kag/gather.rb
-- lib/kag/match.rb
-- lib/kag/report.rb
+- lib/kag/gather/match.rb
+- lib/kag/gather/plugin.rb
+- lib/kag/gather/team.rb
+- lib/kag/irc/plugin.rb
 - lib/kag/server.rb
-- lib/kag/team.rb
 - lib/kag/version.rb
 - lib/patches.rb
 - config/config.sample.json

data/lib/kag/bot.rb

@@ -1,34 +0,0 @@
-require 'cinch'
-require 'kag/config'
-require 'kag/gather'
-
-module KAG
-  class Bot
-    def initialize
-      config = self.config
-      bot = Cinch::Bot.new do
-        configure do |c|
-          c.server = config[:server]
-          c.channels = config[:channels]
-          c.port = config[:port].to_i > 0 ? config[:port] : 6667
-          #c.ssl = config[:ssl]
-          c.nick = config[:nick].to_s != "" ? config[:nick] : "KAGatherer"
-          c.realname = config[:realname].to_s != "" ? config[:realname] : "KAG Gatherer"
-          c.messages_per_second = 1
-          c.server_queue_size = 1
-          c.plugins.plugins = [KAG::Gather]
-          if config[:sasl]
-            c.sasl.username = config[:sasl][:username]
-            c.sasl.password = config[:sasl][:password]
-          end
-        end
-      end
-
-      bot.start
-    end
-
-    def config
-      KAG::Config.instance
-    end
-  end
-end

data/lib/kag/gather.rb

@@ -1,507 +0,0 @@
-require 'cinch'
-require 'kag/bot'
-require 'kag/config'
-require 'kag/data'
-require 'kag/report'
-require 'kag/server'
-require 'kag/match'
-
-module KAG
-  class Gather
-    include Cinch::Plugin
-
-    attr_accessor :queue,:servers
-
-    def initialize(*args)
-      super
-      @queue = {}
-      @matches = {}
-      _load_servers
-    end
-
-    def _load_servers
-      @servers = {}
-      KAG::Config.instance[:servers].each do |k,s|
-        s[:key] = k
-        @servers[k] = KAG::Server.new(s)
-      end
-    end
-
-    #listen_to :channel, method: :channel_listen
-    #def channel_listen(m)
-    #end
-
-    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]
-          end
-        elsif @queue.key?(nick)
-          remove_user_from_queue(nick)
-        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
-    end
-
-    match "sub", :method => :evt_sub
-    def evt_sub(m)
-      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
-    end
-
-    match "add", :method => :evt_add
-    def evt_add(m)
-      unless is_banned?(m.user)
-        add_user_to_queue(m,m.user.nick)
-      end
-    end
-
-    match "rem", method: :evt_rem
-    def evt_rem(m)
-      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)
-      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
-    end
-
-    match "status", :method => :evt_status
-    def evt_status(m)
-      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)
-      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,"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(self,m,u)
-        else
-          reply m,"User #{nick} not found!"
-        end
-      end
-    end
-
-    def add_user_to_queue(m,nick,send_msg = true)
-      if @queue.key?(nick)
-        reply m,"#{nick} is already in the queue!"
-      elsif get_match_in(nick)
-        reply m,"#{nick} is already in a match!"
-      else
-        @queue[nick] = SymbolTable.new({
-            :user => User(nick),
-            :channel => m.channel,
-            :message => m.message,
-            :joined_at => Time.now
-        })
-        send_channels_msg "Added #{nick} to queue (#{KAG::Match.type_as_string}) [#{@queue.length}]" if send_msg
-        check_for_new_match
-      end
-    end
-
-    def remove_user_from_queue(nick,send_msg = true)
-      if @queue.key?(nick)
-        @queue.delete(nick)
-        send_channels_msg "Removed #{nick} from queue (#{KAG::Match.type_as_string}) [#{@queue.length}]" if send_msg
-        true
-      else
-        false
-      end
-    end
-
-    def get_match_in(nick)
-      m = false
-      @matches.each do |k,match|
-        if match.has_player?(nick)
-          m = match
-        end
-      end
-      m
-    end
-
-    def check_for_new_match
-      if @queue.length >= KAG::Config.instance[:match_size]
-        players = []
-        @queue.each do |n,i|
-          players << n
-        end
-
-        server = get_unused_server
-        unless server
-          send_channels_msg "Could not find any available servers!"
-          debug "FAILED TO FIND UNUSED SERVER"
-          return false
-        end
-
-        # reset queue first to prevent 11-player load
-        @queue = {}
-
-        match = KAG::Match.new(SymbolTable.new({
-          :server => server,
-          :players => players
-        }))
-        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) # prevent excess flood stuff
-        end
-        @matches[server[:key]] = match
-      end
-    end
-
-    def send_channels_msg(msg,colorize = true)
-      KAG::Config.instance[:channels].each do |c|
-        msg = Format(:grey,msg) if colorize
-        Channel(c).send(msg)
-      end
-    end
-
-    def reply(m,msg,colorize = true)
-      msg = Format(:grey,msg) if colorize
-      m.reply msg
-    end
-
-    def get_unused_server
-      server = false
-      @servers.shuffle!
-      @servers.each do |k,s|
-        server = s unless s.in_use?
-      end
-      server
-    end
-
-    # admin methods
-
-    def debug(msg)
-      if KAG::Config.instance[:debug]
-        puts msg
-      end
-    end
-
-    def is_admin(user)
-      user.refresh
-      o = (KAG::Config.instance[:owners] or [])
-      o.include?(user.authname)
-    end
-
-    match "clear", :method => :evt_clear
-    def evt_clear(m)
-      if is_admin(m.user)
-        send_channels_msg "Match queue cleared."
-        @queue = {}
-      end
-    end
-
-    match /rem (.+)/, :method => :evt_rem_admin
-    def evt_rem_admin(m, arg)
-      if is_admin(m.user)
-        arg = arg.split(" ")
-        arg.each do |nick|
-          remove_user_from_queue(nick)
-        end
-      end
-    end
-
-    match /rem_silent (.+)/, :method => :evt_rem_silent_admin
-    def evt_rem_silent_admin(m, arg)
-      if is_admin(m.user)
-        arg = arg.split(" ")
-        arg.each do |nick|
-          remove_user_from_queue(nick,false)
-        end
-      end
-    end
-
-    match /add (.+)/, :method => :evt_add_admin
-    def evt_add_admin(m, arg)
-      if is_admin(m.user)
-        arg = arg.split(" ")
-        arg.each do |nick|
-          add_user_to_queue(m,nick)
-        end
-      end
-    end
-
-    match /add_silent (.+)/, :method => :evt_add_silent_admin
-    def evt_add_silent_admin(m, arg)
-      if is_admin(m.user)
-        arg = arg.split(" ")
-        arg.each do |nick|
-          add_user_to_queue(m,nick,false)
-        end
-      end
-    end
-
-    match /is_admin (.+)/, :method => :evt_am_i_admin
-    def evt_am_i_admin(m,nick)
-      u = User(nick)
-      if is_admin(u)
-        reply m,"Yes, #{nick} is an admin!"
-      else
-        reply m,"No, #{nick} is not an admin."
-      end
-    end
-
-
-    match "quit", :method => :evt_quit
-    def evt_quit(m)
-      if is_admin(m.user)
-        m.bot.quit("Shutting down...")
-      end
-    end
-
-    match "restart", :method => :evt_restart
-    def evt_restart(m)
-      if is_admin(m.user)
-        cmd = (KAG::Config.instance[:restart_method] or "nohup sh gather.sh &")
-        debug cmd
-        pid = spawn cmd
-        debug "Restarting bot, new process ID is #{pid.to_s} ..."
-        exit
-      end
-    end
-
-    match "restart_map", :method => :evt_restart_map
-    def evt_restart_map(m)
-      if is_admin(m.user)
-        match = get_match_in(m.user.nick)
-        if match and match.server
-          match.server.restart_map
-        end
-      end
-    end
-
-    match /restart_map (.+)/, :method => :evt_restart_map_specify
-    def evt_restart_map_specify(m,arg)
-      if is_admin(m.user)
-        if @servers[key]
-          @servers[key].restart_map
-        else
-          m.reply "No server found with key #{arg}"
-        end
-      end
-    end
-
-    match "next_map", :method => :evt_next_map
-    def evt_next_map(m)
-      if is_admin(m.user)
-        match = get_match_in(m.user.nick)
-        if match and match.server
-          match.server.next_map
-        end
-      end
-    end
-
-    match /next_map (.+)/, :method => :evt_next_map_specify
-    def evt_next_map_specify(m,arg)
-      if is_admin(m.user)
-        if @servers[key]
-          @servers[key].next_map
-        else
-          m.reply "No server found with key #{arg}"
-        end
-      end
-    end
-
-    match /kick_from_match (.+)/, :method => :evt_kick_from_match
-    def evt_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"
-        else
-          m.reply "#{nick} is not in a match!"
-        end
-      end
-    end
-
-    match /op (.+)/,:method => :evt_op
-    def evt_op(m,nick)
-      if is_admin(m.user)
-        m.channel.op(nick)
-      end
-    end
-
-    match /deop (.+)/,:method => :evt_deop
-    def evt_deop(m,nick)
-      if is_admin(m.user)
-        m.channel.deop(nick)
-      end
-    end
-
-    match /voice (.+)/,:method => :evt_voice
-    def evt_voice(m,nick)
-      if is_admin(m.user)
-        m.channel.voice(nick)
-      end
-    end
-
-    match /devoice (.+)/,:method => :evt_devoice
-    def evt_devoice(m,nick,reason)
-      if is_admin(m.user)
-        m.channel.devoice(nick)
-      end
-    end
-
-    match /kick (.+) (.+)/,:method => :evt_kick
-    def evt_kick(m,nick,reason)
-      if is_admin(m.user)
-        m.channel.kick(nick,reason)
-      end
-    end
-
-    match "reload_config", :method => :evt_reload_config
-    def evt_reload_config(m)
-      if is_admin(m.user)
-        KAG::Config.instance.reload
-        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(self,m,user)
-        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(self,m,user)
-        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(self,m,user)
-        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
-      KAG::Config.data[:ignored] = {} unless KAG::Config.data[:ignored]
-      if d
-        d[:ignored].key?(user.host.to_sym)
-      else
-        false
-      end
-    end
-  end
-end