qwtf_discord_bot 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc84e11371480f598813279fc0187c53c9241fddd123bbf28aae6ab88a477cbf
-  data.tar.gz: 7c464e592963d05acacbb7031202ee00cf4d3d347a953240120d77a385a2c4b1
+  metadata.gz: ef799a9699bf7b62c4435d87c07caf0f231eb742bf8e5e93a2ae1669c5cc69c0
+  data.tar.gz: '059ff5da336b962f96c0e1018127ed990ff866136cc4293ab2772a1ec388bcb5'
 SHA512:
-  metadata.gz: cbd3c2355a8e9632ea791d09f44f8b85c08d6600d4f0de345adb9469bc8bd2387b6be15278128a75d08954228c18ad2ff302e638f934bed869863b8ac5c4fdee
-  data.tar.gz: ef4459c97b80fe085dfa0b7530bea692afda1ee0b1c36b1333d43dadd6897db684b4403e03b7fe6340d93fb8d6fc7aced9926af8cc4e32f681aed9dd98b6ad3c
+  metadata.gz: f0121efb30344cba06f9c8aa9f0f73d1fcaea839c47a62ad672eed95656ef788e80e82f26400caa7adeb4b42cec2e85df30e75ea23484c965345c27e3d21d1b1
+  data.tar.gz: fba25ccac611e95db804200810a3a8eb512eb4598327a052d6ba6c4371071c2ecf9dbece198fe0ed3894510b43d54dbcfd4ba7c8333f83b26ed227f953d37bb2

data/Gemfile

@@ -5,4 +5,11 @@ gemspec
 gem 'bundler'
 gem 'discordrb'
 gem 'thor'
-gem 'rspec'
+
+group :development do
+  gem 'pry'
+end
+
+group :test do
+  gem 'rspec'
+end

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (0.5.0)
+    qwtf_discord_bot (0.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
     discordrb (3.2.1)
       discordrb-webhooks (~> 3.2.0.1)
@@ -21,12 +22,16 @@ GEM
     ffi (1.9.25)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    method_source (0.9.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     netrc (0.11.0)
     opus-ruby (1.0.1)
       ffi
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rbnacl (3.4.0)
       ffi
     rest-client (2.0.2)
@@ -61,6 +66,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   discordrb
+  pry
   qwtf_discord_bot!
   rspec
   thor

data/lib/qstat_request.rb

@@ -6,28 +6,41 @@ class QstatRequest
 
   def teams
     @teams ||= begin
+                 return nil unless has_players?
+
                  roster = {}
+
                  teams = players.map(&:team).uniq
                  teams.each { |team| roster[team] = [] }
 
                  players.each do |player|
                    roster[player.team] << player
                  end
+
                  roster
                end
   end
 
-  def output
+  def to_message
     return server_summary unless has_players?
     [server_summary, player_table].join("\n")
   end
 
   def to_embed
+    return nil unless has_players?
+
     embed = Discordrb::Webhooks::Embed.new
+
     teams.each do |team, players|
       player_list = players.map(&:to_row).join('\n')
       score = players.first.score
-      field_name = "#{team} #{score}"
+
+      case
+      when team.empty? then field_name = "No Team"
+      when score < 0 then field_name = "#{team.capitalize}"
+      when score >= 0 then field_name = "#{team.capitalize} | #{score}"
+      end
+
       embed.add_field(Discordrb::Webhooks::EmbedField.new(inline: true, name: field_name, value: player_list))
     end
 
@@ -35,11 +48,12 @@ class QstatRequest
   end
 
   def server_summary
+    return "#{@endpoint} isn't responding" unless game_map
     "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}"
   end
 
   def has_players?
-    @data["players"] || false
+    @data["player"] && @data["players"].any?
   end
 
   def player_names

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 class QwtfDiscordBotServer < QwtfDiscordBot
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -11,7 +13,11 @@ class QwtfDiscordBotServer < QwtfDiscordBot
       message = qstat_request.server_summary
       embed = qstat_request.to_embed
 
-      event.channel.send_embed(message, embed)
+      if embed
+        event.channel.send_embed(message, embed)
+      else
+        event.channel.send_message(message)
+      end
     end
 
     bot.run

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies: []
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email: