qwtf_discord_bot 5.5.11 → 5.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80c495a035630d38507c5cb5f1d523a40b92f6e0bb7be6703e60124657d9eaf
-  data.tar.gz: d56c1c31f43fee69628d0ad10a631213a35f854a1109d0148c8b32486253254d
+  metadata.gz: bb00493577fe32e4a2f0a73fd049bec1c195d08f710d559d3bc61f3c399f8e9a
+  data.tar.gz: b9fe1647ba8814b8f2d25c5dbcaacd8c52c930f891f27fdded26028dae2ee392
 SHA512:
-  metadata.gz: 9c99d3227ae01315b829469e9cb14c28041917506e331a75de7773ec48241ae40ba8985ae3a12eb8437e57e944c6561b2d26373bcb7cecc584798842337cc3ab
-  data.tar.gz: 35dde220e2248935dd8e0f96bff722a35d9aecfc7b93f3c72dbba6bb0cd5fbfa3afb2943c36f18975c416fd763c505aa54903118ce60a372e6d5b67bd80d2053
+  metadata.gz: 03be912e0aa6aa8a46f9edad585bb4512aa1f22cf78689faabb4be646ba99bffe50cc03cddaf88e308c4fb40893d3d8107431dc2da3c7b59a809cec500d68381
+  data.tar.gz: 73bd5b3b894f3e422d983f1295959cb6cd12f165d47f5ce9f86481e6ff6731226fdc9b909051d0d00df67c6b586fa124bd880d72d992ca2406a00c7e91a2bc40

data/VERSION

@@ -1 +1 @@
-5.5.11
+5.5.16

data/lib/pug.rb

@@ -147,6 +147,14 @@ class Pug
     redis.get(last_result_time_key).to_i
   end
 
+  def equal_number_of_players_on_each_team?
+    team_player_counts = actual_teams.map do |_name, players|
+      players.size
+    end
+
+    team_player_counts.uniq.size == 1
+  end
+
   private
 
   def leave_teams(player_id)

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -8,7 +8,7 @@ class QwtfDiscordBotPug # :nodoc:
 
   MSG_SNIPPET_DELIMITER = ' · '
   TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
-  ONE_MINUTE = 60
+  TEN_MINUTES = 10 * 60
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -46,6 +46,13 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
+        if pug.joined_players.count > pug.maxplayers
+          return send_embedded_message(
+            description: "Too many players, increase `!teamsize` or `!kick` extras",
+            channel: event.channel
+          )
+        end
+
         if pug.joined_players.count.odd?
           return send_embedded_message(
             description: "Can't choose teams with odd number of players",
@@ -240,7 +247,13 @@ class QwtfDiscordBotPug # :nodoc:
             )
           end
 
-          join_pug(e, pug) unless pug.joined?(user_id)
+          if pug.team(team_no).size >= pug.teamsize
+            return send_embedded_message(
+              description: "Team is full",
+              channel: e.channel
+            )
+          end
+
           pug.join_team(team_no: team_no, player_id: user_id)
 
           send_embedded_message(
@@ -252,6 +265,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args[1..-1].each do |mention|
+            if pug.team(team_no).size >= pug.teamsize
+              return send_embedded_message(
+                description: "Team is full",
+                channel: e.channel
+              )
+            end
+
             unless mention.match(/<@!\d+>/)
               send_embedded_message(
                 description: "#{arg} isn't a valid mention",
@@ -356,6 +376,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.equal_number_of_players_on_each_team?
+          return send_embedded_message(
+            description: "Can't report unless teams have same number of players",
+            channel: event.channel
+          )
+        end
+
         unless ["1", "2"].any?(args.first)
           return send_embedded_message(
             description: "Invalid team number",
@@ -363,11 +390,9 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.last_result_time && pug.last_result_time > one_minute_ago
-          time_ago = Time.now.to_i - pug.last_result_time
-
+        if pug.last_result_time && pug.last_result_time > ten_minutes_ago
           return send_embedded_message(
-            description: "Please wait #{ONE_MINUTE - time_ago} more seconds before reporting",
+            description: "A match was reported less than 10 minutes ago",
             channel: event.channel
           )
         end
@@ -404,8 +429,6 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
-        pug.unteam_all_players
-
         send_embedded_message(
           description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
@@ -429,6 +452,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.equal_number_of_players_on_each_team?
+          return send_embedded_message(
+            description: "Can't report unless teams have same number of players",
+            channel: event.channel
+          )
+        end
+
         if pug.actual_teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",
@@ -436,11 +466,11 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.last_result_time && pug.last_result_time > one_minute_ago
+        if pug.last_result_time && pug.last_result_time > ten_minutes_ago
           time_ago = Time.now.to_i - pug.last_result_time
 
           return send_embedded_message(
-            description: "Please wait #{ONE_MINUTE - time_ago} more seconds before reporting",
+            description: "A match was reported less than 10 minutes ago",
             channel: event.channel
           )
         end
@@ -467,8 +497,6 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
-        pug.unteam_all_players
-
         send_embedded_message(
           description: "Match ##{id} drawn. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
@@ -816,7 +844,7 @@ class QwtfDiscordBotPug # :nodoc:
     JSON.parse(res.body).map(&:to_h)
   end
 
-  def one_minute_ago
-    Time.now.to_i - ONE_MINUTE
+  def ten_minutes_ago
+    Time.now.to_i - TEN_MINUTES
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.11
+  version: 5.5.16
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb