qwtf_discord_bot 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f90cbd31c83661734c27b7dd1c965ad52a6059fc5cd49b16a2f13f23b29920
-  data.tar.gz: ef56a673b3ac0e92b38dd8211e0c0cd60d5ad7b1629f4fdd139de671c7ce1bf6
+  metadata.gz: 1bd7254f41fd6d3cd8f1179854e859ac125682ef8206f82b4248c1e35adce4dc
+  data.tar.gz: ff9c1b9b447c76399170518bff90675094daabe6d26e8a0738dbec62656b3716
 SHA512:
-  metadata.gz: 1a570a0a3d9b13ead7cfa821c4ef8bb9e29c08b8ff470b874221bd1c1a139aeaa2609aaf076d340513cef45e78ac3eba4cb24c233648205ca68e0ed8e70de3a5
-  data.tar.gz: 99a2f177908b13de64a1ae90e67a29e898a9f405aff427ada5e2aca20767caa2ee410114c3f6888bae3ab3f0459558e6cf8239b04f205b2dbc5af768c6f31629
+  metadata.gz: 67eefb3c5b4eff0989b0b12c9c2364c750d177548023c68295a4e722110f089cf7c74ed15cf7b04585bf1d5cad695997eb6717a0aad4df61367475cd08545fac
+  data.tar.gz: db2293dfa8d5f80ac5454ac690c58650ad79c003b4f31f899fb829c6691b4bfef238829b65a8180ef59c8d7e9349f48759ef722d1252faffd7c81dcb79a506e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (0.5.8)
+    qwtf_discord_bot (0.5.9)
 
 GEM
   remote: https://rubygems.org/

data/lib/player.rb

@@ -28,6 +28,7 @@ class Player
   end
 
   def team
+    return 'spec' unless valid_score?
     @data['team']
   end
 
@@ -48,4 +49,8 @@ class Player
   def skin
     @data['skin']
   end
+
+  def valid_score?
+    score >= 0
+  end
 end

data/lib/qstat_request.rb

@@ -5,19 +5,16 @@ class QstatRequest
   end
 
   def teams
-    @teams ||= begin
-                 return nil unless has_players?
-                 build_roster
-               end
+    @teams ||= build_roster
   end
 
   def to_message
-    return server_summary unless has_players?
+    return server_summary if is_empty?
     [server_summary, player_table].join("\n")
   end
 
   def to_embed
-    return nil unless has_players?
+    return nil if is_empty?
 
     embed = Discordrb::Webhooks::Embed.new
 
@@ -30,11 +27,20 @@ class QstatRequest
 
   def server_summary
     return "#{@endpoint} isn't responding" unless game_map
-    "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}"
+    return "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}" unless has_spectators?
+    "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers} players | #{numspectators}/#{maxspectators} spectators" 
+  end
+
+  def is_empty?
+    !has_players? && !has_spectators?
+  end
+
+  def has_spectators?
+    numspectators > 0
   end
 
   def has_players?
-    @data["players"] && @data["players"].any?
+    numplayers > 0
   end
 
   def player_names
@@ -67,7 +73,17 @@ class QstatRequest
       @data["maxplayers"]
     end
 
+    def numspectators
+      @data["numspectators"]
+    end
+
+    def maxspectators
+      @data["maxspectators"]
+    end
+
     def build_roster
+      return nil if is_empty?
+
       roster = {}
 
       @data["players"].map do |player_data|

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '0.5.8'.freeze
+  VERSION = '0.5.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Sheldon Johnson