qwtf_discord_bot 5.3.5 → 5.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e4ea9a3df5bcc8c8cb14ba1d22a0708bdf8c4a994531d4c06fb8bbc75b33410
-  data.tar.gz: 1568efc1c854b8d4d43d60fd0caa48b0e52e4b09ca04336b6b8c1969090fb146
+  metadata.gz: 45dcf6ff7c764cda796f9048dde0184423bab3f0a45b6bd3d58341876435d6bc
+  data.tar.gz: f8e192337a8247a1fde818d5b1d53922d350734708ecaa0e1cf36865d1b3caff
 SHA512:
-  metadata.gz: 50d22f311c0c29ce8df6f1a9c473559812a60d7602f79aa2a9976ffec4a44b6e2f096d6c7c7ac45d390569854393ea14b4ca2afa7f6b7213ba093330221bf48e
-  data.tar.gz: cb34ac9dd1c0f5ff46c09700c1998c8e0cae344cc4b0944a40e2c8fad25bb46cfe3db8ab202e0079f20d982d1dfe74382cf01efe152484abc7f652a83008316f
+  metadata.gz: 0db6a8a62cbc130860904b63d169b4942b5264643fa507ee566dd3abddee682b1182b920eb1a06c83b044edebf5879cc88587dd94c1b520b5a9054608c072647
+  data.tar.gz: 62de3a2ef18d87b20c4804e9c311663d043b6c32d9aa9209ef63a94fa870cc1a589b27027613e44f319cf4ed1e1de8dc76a980cf0bcc1cc433c306454cb440fc

data/VERSION

@@ -1 +1 @@
-5.3.5
+5.3.6

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -204,9 +204,13 @@ class QwtfDiscordBotPug # :nodoc:
 
         return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
 
-        actual_teams = pug.teams.reject { |k| k == "0" }
+        if pug.actual_teams.count < 2
+          return send_msg(
+            "There must be at least two teams with players to submit a result", e.channel
+          )
+        end
 
-        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
           end
@@ -219,7 +223,11 @@ class QwtfDiscordBotPug # :nodoc:
           {
             match: {
               map: pug.game_map,
-              teams: team_results
+              teams: team_results,
+              discord_channel: {
+                channel_id: e.channel_id,
+                name: "#{e.channel.server.name} ##{e.channel.name}"
+              }
             }
           }.to_json
         )
@@ -242,9 +250,13 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        actual_teams = pug.teams.reject! { |k| k == "0" }
+        if pug.actual_teams.count < 2
+          return send_msg(
+            "There must be at least two teams with players to submit a result", e.channel
+          )
+        end
 
-        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
           end
@@ -256,7 +268,11 @@ class QwtfDiscordBotPug # :nodoc:
           {
             match: {
               map: pug.game_map,
-              teams: team_results
+              teams: team_results,
+              discord_channel: {
+                channel_id: e.channel_id,
+                name: "#{e.channel.server.name} ##{e.channel.name}"
+              }
             }
           }.to_json
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.3.5
+  version: 5.3.6
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb