qwtf_discord_bot 5.5.10 → 5.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe547dbec4ffa7cf1974c4c7286249329dec4a0947569281c811cef8bf170c8
-  data.tar.gz: fcefedfbb7f73aff24ed6765dbd4e0da18cfb296ac1978d97ddbf054db4c5b47
+  metadata.gz: b813d466ddbf8c36a783f042850df267dc0669497e109abd2216c32a39c6e41e
+  data.tar.gz: 2fc6dcf207ed665bc51a5a54d1173512236eca9842a7998e270d6f21f6cad70d
 SHA512:
-  metadata.gz: c805e76c390c327d8b6ed53c6a757fa2d844561fe8a65d074874420800e9dedddaac1a70aafcc00f84d8cbda4587913d34342554bd70bd8de3c3a8dd6d5adf6b
-  data.tar.gz: 66165f24f18f1e910a35420767a0f86db1d5fcf9d404091e93775490287daff90999e2fcc6efd5e06c8ca3197591d0b0f90964a127bcd60c66765b7820552b73
+  metadata.gz: b856f195e9ec4e47c660d7463192a76ba669d58216edea8b7bc93e2a9e9ded6283de6183ebdf8bc526e88c092fd9d0637d39a6286dbd83d5264ab059aba18081
+  data.tar.gz: 15fb7c42819c3cff35a02b2971502225b8218b442277cbcf042fd20d31756638b1e073f374169c59b7e3c084311cc844a0f731efff98f89e68b6122a1009153a

data/VERSION

@@ -1 +1 @@
-5.5.10
+5.5.15

data/lib/pug.rb

@@ -16,6 +16,7 @@ class Pug
   end
 
   def join_team(team_no:, player_id:)
+    redis.setnx(pug_key, Time.now.to_i)
     leave_teams(player_id)
     redis.sadd(team_key(team_no), player_id)
   end
@@ -146,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

@@ -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",
@@ -429,6 +456,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",

metadata

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