qwtf_discord_bot 5.5.14 → 5.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3106f91d2202ab45546b2b082f865db04dc8bf5e69c165101dd6e23f1fa4e9c7
-  data.tar.gz: 012b9c79d830fdcc7c2ff70a6dcdc7fe8e8e16039571723dce5ff23f71f6996e
+  metadata.gz: b813d466ddbf8c36a783f042850df267dc0669497e109abd2216c32a39c6e41e
+  data.tar.gz: 2fc6dcf207ed665bc51a5a54d1173512236eca9842a7998e270d6f21f6cad70d
 SHA512:
-  metadata.gz: a8dfbdf3eac06edf1641e74984d43ddf210978f51d3879c1628ed38fab29b118a8b5fb3fc8938a841d2fc5884d270d05a17b25334870c84e3c7998557ffe17fa
-  data.tar.gz: '000608afc046e58aa735fefc2cb7c4a5d13709e1b1abc93cc9bae1791d7184e33956ed54ff798f56ce700f7827b8a272108c7b24c95438677eb89ff7ef494f3d'
+  metadata.gz: b856f195e9ec4e47c660d7463192a76ba669d58216edea8b7bc93e2a9e9ded6283de6183ebdf8bc526e88c092fd9d0637d39a6286dbd83d5264ab059aba18081
+  data.tar.gz: 15fb7c42819c3cff35a02b2971502225b8218b442277cbcf042fd20d31756638b1e073f374169c59b7e3c084311cc844a0f731efff98f89e68b6122a1009153a

data/VERSION

@@ -1 +1 @@
-5.5.14
+5.5.15

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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.14
+  version: 5.5.15
 platform: ruby
 authors:
 - Sheldon Johnson