qwtf_discord_bot 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f3564733016efd63023d456c13f2d5635ea15b1d4ef68d7f61d4f724383005
-  data.tar.gz: b27586638ec43753c37e77f960449c03ede61521018d0e8d55ce8e15e1b02218
+  metadata.gz: 625dc50fbaa6381cf034e4c390056a569214b48353640b10964dcb98c9398d81
+  data.tar.gz: 77edfe65a8d87813c53a51b2eeaf7f28902bdf842a16dba02887a71163ce44fc
 SHA512:
-  metadata.gz: c55ca87e0642fb10337aad2dca53541a64c5bcd4407849497f2e4b149ec0de872ae1679774fbeaef8398a31dc5907869a509b162a97e9178079c8c2bde8f4cb9
-  data.tar.gz: 67783c44fed2b6870599b7b141cdfea210dd8e0472e93381c085190146cc007da079dcddc3862699fb61b709c82fd5c57ebe8f60056c7d457acf9a0ad9645f68
+  metadata.gz: f8a3e1e910013ef151e4d8d955987064530bcb67e4e185967cc3029785832df64b4fadf36833a030b49fe63e01ef6cc59204592919ce59445f6342da72a07aa2
+  data.tar.gz: fc32085412a1b9c1fdf21a7e7523bbfc87fbfd673974f08f335b4e86c53c3a8987e8b404560b2ff5dfc38c41c315dbdbd73d31047d0d4aabadcbaf617c1d63e8

data/Gemfile.lock

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

data/lib/qstat_request.rb

@@ -7,17 +7,7 @@ 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
+                 build_roster
                end
   end
 
@@ -31,17 +21,8 @@ class QstatRequest
 
     embed = Discordrb::Webhooks::Embed.new
 
-    teams.each do |team, players|
-      player_list = players.map(&:to_row).join("\n")
-      score = players.first.score
-
-      field_name = case
-                   when team.empty? then "No Team"
-                   when score < 0 then "#{team.capitalize}"
-                   when score >= 0 then "#{team.capitalize} | #{score}"
-                   end
-
-      embed.add_field(Discordrb::Webhooks::EmbedField.new(inline: true, name: field_name, value: player_list))
+    teams.each do |_name, team|
+      embed.add_field(team.to_embed_field)
     end
 
     embed
@@ -86,6 +67,19 @@ class QstatRequest
       @data["maxplayers"]
     end
 
+    def build_roster
+      roster = {}
+
+      @data["players"].map do |player_data|
+        player = Player.new(player_data)
+        team_name = player.team
+        roster[team_name] ||= Team.new(team_name)
+        roster[team_name].enlist(player)
+      end
+
+      roster
+    end
+
     def players
       @data["players"].map do |player_data|
         Player.new(player_data)

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -6,7 +6,7 @@ class QwtfDiscordBotWatcher < QwtfDiscordBot
     every(THIRTY_SECONDS) do
       request = QstatRequest.new(endpoint)
 
-      if request.player_names
+      if request.has_players?
         request.player_names.each do |name|
           unless seen_recently?(name)
             report_joined(name: name, server_summary: request.server_summary)

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.5.6'.freeze
 end

data/lib/team.rb

@@ -1,13 +1,44 @@
 class Team
-  attr_accessor :number
+  attr_accessor :name, :number, :players
 
-  TEAMS = { spec: 0, blue: 1, red: 2, yell: 3, gren: 4 }.freeze
+  TEAMS = { "blue": 1, "red": 2, "yell": 3, "gren": 4, "spec": 5 }.freeze
 
-  def initialize(sym)
-    @number = TEAMS[sym] || 0
+  def initialize(name)
+    @name = build_name(name)
+    @number = TEAMS[name] || 5
+    @players = []
   end
 
-  def to_s
-    TEAMS.key(@number).to_s
+  def enlist(player)
+    @players << player
   end
+
+  def to_embed_field
+    Discordrb::Webhooks::EmbedField.new(inline: true, name: field_name, value: player_list)
+  end
+
+  private
+
+    def field_name
+      return "#{@name}" unless playing?
+      "#{@name} | #{score}"
+    end
+
+    def playing?
+      [1..4].include?(@number)
+    end
+
+    def player_list
+      players.map(&:to_row).join("\n")
+    end
+
+    def score
+      nil if @name == "Spec"
+      @players.first.score
+    end
+
+    def build_name(name)
+      name = TEAMS[name] || "spec"
+      name.capitalize
+    end
 end

metadata

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