kag-gather 1.0.2 → 1.0.3

data/config/config.sample.json

@@ -11,6 +11,8 @@
   ,"pick_classes": true
   ,"classes": ["Knight","Knight","Knight","Archer","Builder"]
   ,"debug": true
+  ,"end_vote_threshold": 3
+  ,"restart_method": "nohup sh gather.sh &"
   ,"servers":{
     "server1": {
       "ip":"5.39.93.105"

data/lib/gather.rb

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

data/lib/kag/gather.rb

@@ -52,16 +52,7 @@ module KAG
 
     match "add", method: :evt_add
     def evt_add(m)
-      unless @queue.key?(m.user.nick) or in_match(m.user.nick)
-        @queue[m.user.nick] = SymbolTable.new({
-            :user => m.user,
-            :channel => m.channel,
-            :message => m.message,
-            :joined_at => Time.now
-        })
-        send_channels_msg "Added #{m.user.nick} to queue (#{get_match_type_as_string}) [#{@queue.length}]"
-        check_for_new_match(m)
-      end
+      add_user_to_queue(m,m.user.nick)
     end
 
     match "rem", method: :evt_rem
@@ -86,17 +77,32 @@ module KAG
 
     match "end", method: :evt_end
     def evt_end(m)
-      @matches.each do |k,match|
-        info = match[:server].info
-        if info
-          players_on = info[:serverStatus][:playerList].length
-          if players_on > 0
-            m.reply "Cannot end a match for #{match[:server][:key]} in progress, there are #{players_on.to_s} players still playing!"
-          else
-            @matches.delete(k)
-            send_channels_msg("Match at #{match[:server][:key]} finished!")
-          end
+      match_in = get_match_in(m.user.nick)
+      if match_in
+        match_in[:end_votes] = match_in[:end_votes] + 1
+        evt = KAG::Config.instance[:end_vote_threshold].to_i
+        evt = 3 if evt < 1
+        if match_in[:end_votes] >= evt
+          end_match(match_in)
+        else
+          needed = evt - match_in[:end_votes]
+          m.reply "End vote started, #{needed} more votes to end match at #{match_in[:server][:key]}"
         end
+      else
+        m.reply "You're not in a match, silly! Stop trying to hack me."
+      end
+    end
+
+    def add_user_to_queue(m,nick)
+      unless @queue.key?(nick) or in_match(nick)
+        @queue[nick] = SymbolTable.new({
+            :user => User(nick),
+            :channel => m.channel,
+            :message => m.message,
+            :joined_at => Time.now
+        })
+        send_channels_msg "Added #{nick} to queue (#{get_match_type_as_string}) [#{@queue.length}]"
+        check_for_new_match
       end
     end
 
@@ -107,6 +113,17 @@ module KAG
       end
     end
 
+    def end_match(match)
+      if match[:server].has_rcon?
+        match[:server].kick_all
+        match[:server].disconnect
+      else
+        debug "NO RCON, so could not kick!"
+      end
+      @matches.delete(match[:server][:key])
+      send_channels_msg("Match at #{match[:server][:key]} finished!")
+    end
+
     def remove_user_from_match(nick)
       match = get_match_in(nick)
       if match
@@ -136,7 +153,7 @@ module KAG
       "#{ts.to_s}v#{ts.to_s} #{KAG::Config.instance[:match_type]}"
     end
 
-    def check_for_new_match(m)
+    def check_for_new_match
       if @queue.length >= KAG::Config.instance[:match_size]
         playing = []
         @queue.each do |n,i|
@@ -181,10 +198,18 @@ module KAG
           User(p).send(msg+" Red Team #{team2.join(", ")}") unless p.include?("player")
         end
 
+        if server.has_rcon?
+          server.connect
+          server.restart_map
+        else
+          debug "Cannot restart map, no RCON!"
+        end
+
         @matches[server[:key]] = {
             :team1 => team1,
             :team2 => team2,
-            :server => server
+            :server => server,
+            :end_votes => 0
         }
       end
     end
@@ -246,6 +271,28 @@ module KAG
       end
     end
 
+    match /add (.+)/, method: :evt_add_admin
+    def evt_add_admin(m, arg)
+      if is_admin(m.user)
+        if m.channel.has_user?(arg)
+          add_user_to_queue(m,arg)
+        else
+          m.reply "User is not in this channel!"
+        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)
+        m.reply "Yes, #{nick} is an admin!"
+      else
+        m.reply "No, #{nick} is not an admin."
+      end
+    end
+
+
     match "quit", method: :evt_quit
     def evt_quit(m)
       if is_admin(m.user)
@@ -253,12 +300,21 @@ module KAG
       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 &")
+        puts cmd
+        pid = spawn cmd
+        debug "Restarting bot, new process ID is #{pid.to_s} ..."
+        exit
+      end
+    end
+    
     def get_team_classes(team)
       classes = KAG::Config.instance[:classes]
       classes.shuffle!
       classes
     end
-
   end
 end

data/lib/kag/server.rb

@@ -3,11 +3,129 @@ require 'symboltable'
 require 'json'
 require 'kagerator'
 require 'kag/config'
+require 'socket'
 
 module KAG
   class Server < SymbolTable
     def info
       Kagerator.server(self[:ip],self[:port])
     end
+
+    def has_rcon?
+      self[:rcon_password] and !self[:rcon_password].empty?
+    end
+
+    def socket
+      unless self[:_socket]
+        self[:_socket] = TCPSocket.new(self[:ip],self[:port])
+      end
+      self[:_socket]
+    end
+
+    def connect
+      return false unless self.socket
+      self.socket.puts self[:rcon_password]
+      z = self.socket.gets
+      z.include?("now authenticated")
+      self[:_connected] = true
+    end
+
+    def disconnect
+      if self[:_socket]
+        self[:_socket].close
+        self[:_connected] = false
+      end
+    end
+
+    def connected?
+      self[:_connected]
+    end
+
+    def _is_newline?(line)
+      line[10..line.length].rstrip.empty?
+    end
+
+    def _cycle
+      while (line = self.socket.gets)
+        puts line
+        break if _is_newline?(line)
+      end
+    end
+
+    def players
+      _command "/players"
+
+      players = []
+      while (line = self.socket.gets)
+        puts line
+        break if _is_newline?(line)
+
+        player = SymbolTable.new
+        line = line[10..line.length].strip
+
+        # get nick
+        sp = line.index("[")
+        next if sp == nil
+        ep = line.index("]",sp)
+        player[:nick] = line[(sp+1)..(ep-1)]
+        line = line[ep..line.length].strip
+
+        # get id
+        sp = line.index("(")
+        ep = line.index(")",sp)
+        player[:id] = line[(sp+4)..(ep-1)]
+        line = line[ep..line.length]
+
+        # get ip
+        sp = line.index("(")
+        ep = line.index(")",sp)
+        player[:ip] = line[(sp+4)..(ep-1)]
+        line = line[ep..line.length]
+
+        # get hwid
+        sp = line.index("(")
+        ep = line.index(")",sp)
+        player[:hwid] = line[(sp+6)..(ep-1)]
+
+        players << player
+      end
+      players
+    end
+
+    def kick(nick)
+      return false unless self.connected?
+      self.socket.puts "/kick #{nick}"
+      _cycle
+    end
+
+    def kick_all
+      ps = self.players
+      if ps
+        ps.each do |player|
+          _command "/kick #{player[:nick]}"
+        end
+      else
+        puts "No Players found on Server #{self[:ip]}!"
+      end
+      _cycle
+    end
+
+    def restart_map
+      _command "/restartmap"
+      _cycle
+    end
+
+    def next_map
+      _command "/nextmap"
+      _cycle
+    end
+
+    protected
+
+    def _command(cmd)
+      return false unless self.connected?
+      puts "[RCON] #{cmd.to_s}"
+      self.socket.puts cmd
+    end
   end
 end

data/lib/kag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: