qwtf_discord_bot 5.5.12 → 5.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2014003c3eb073a45807b356a6605217fefbd0527b87f1fcb0a56f920d12086
-  data.tar.gz: 2f0a418cb8f54908c249cbec6d4a2382cefb1b8fed4d3d33698031497542cf61
+  metadata.gz: 55bf454fa327aa5bf7d0b29bd63829ae2c2b93de601e15de209f8deff570869f
+  data.tar.gz: f12ee66e6996bfee4400dba504de6227179595a84576cc195611a6ea3f79f2c8
 SHA512:
-  metadata.gz: 7fb0372d9c0a6bc2117af66080a0fe19ca77d4a7035463e651f09b01db3c19edca6d93c5b5da706c0cdfff67da7ff3dffe2f8fda18a66958b83b6a01d7a604ca
-  data.tar.gz: 4a2a97d48484ef821c08eb115831500c82aafd3134e7675571871da84413df493c5764ba0afb8ea4900105a8d39f7eff75b0e7a89e372781f74e2478876fb48d
+  metadata.gz: 9de0be068be49dfed25b62b8d1d45c4c380aadb67f7abe05384d606a25967814350b8ba026ecd1936e1d4e0bbd9adda3bc8c4c91a2e5f1c6d6e4635bf9ff8d03
+  data.tar.gz: 77454e92741377506ffaaea1c81a206cfd5902c7e0896515c1e67df2fe514aaee2b498be773650b4fc2c537b33ebf0866b77561b2ac7e07257723a4026f8ba66

data/VERSION

@@ -1 +1 @@
-5.5.12
+5.5.17

data/lib/pug.rb

@@ -148,7 +148,11 @@ class Pug
   end
 
   def equal_number_of_players_on_each_team?
-    actual_teams.map(&:size).uniq.size == 1
+    team_player_counts = actual_teams.map do |_name, players|
+      players.size
+    end
+
+    team_player_counts.uniq.size == 1
   end
 
   private

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,7 +376,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.equal_number_of_players_on_each_team?
+        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
@@ -370,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
@@ -411,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
@@ -436,7 +452,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.equal_number_of_players_on_each_team?
+        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
@@ -450,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
@@ -481,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
@@ -633,7 +647,7 @@ class QwtfDiscordBotPug # :nodoc:
   private
 
   def team_name(team_no)
-    return "No team" if team_no == 0
+    return "Queue" if team_no == 0
 
     [team_no, TEAM_NAMES[team_no]].join(" ")
   end
@@ -830,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.12
+  version: 5.5.17
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb