qwtf_discord_bot 5.4.6 → 5.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f57dc18281f366be0004ffcf3ab6a35938b155c5897922c28cba7c6cf7e18b5
-  data.tar.gz: a27fcdd5f32203382595bc5b135af9940690fc0b45f7dbd6a5e019777de0ff5a
+  metadata.gz: 494909e7fd239e609f01dd75f848bbe8137fc0d867acb5787b0944302ec5afc7
+  data.tar.gz: 9fea99c070c99eb6044fbc75f812ab200553208c656a494a5dbd6d8468fc8913
 SHA512:
-  metadata.gz: c3d452a44dd1506cad8d214089737a0f515edabd2fe189bb437a321d624346ecd1795fa0bcb79bd8734d9f56f952c41e7aec49126a563bda7fbb8d313676cc24
-  data.tar.gz: 0df2e2073331e1cec5332bf7d680bb9715c789d2bac18ccf9750d48d7b4df1eb7a46c515f38a14597aa99de206b58392a41e613f5060b4f2b82c4438797c298b
+  metadata.gz: d0174509b7ef119457eba3d97367e3c53e176a6e8597888c235d74f030a28a8afcebbf63b7c416c63b3f64183cf81e655b5d9eb7628c7df533514d609b575b9d
+  data.tar.gz: d8296d6419b4cb26ede8395a7552154e926be59cfac50cae5d7d8dd2aa291699c7f9cb3b6923330a7ff1641a58b85af60ad5e2d43b5c4d54f4820f35c786e8ed

data/README.md

@@ -90,14 +90,14 @@ This responds to discord messages:
   - `!join`
   - `!leave`
   - `!teamsize <no_of_players>`
-  - `!kick <@player>`
+  - `!kick <@player> [@player2]`
   - `!team <team_no>`
   - `!unteam`
   - `!addmap <map_name>`
   - `!removemap <map_name>`
   - `!maps`
-  - `!map <map_name>`
-  - `!choose`
+  - `!map [map_name]`
+  - `!choose [n]`
   - `!win <team_no>`
   - `!draw`
   - `!notify <@role>`

data/VERSION

@@ -1 +1 @@
-5.4.6
+5.4.7

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -26,7 +26,7 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :help do |event, *args|
-      "Pug commands: `!status`, `!join`, `!team <team_no>`, `!unteam`, `!leave`, `!kick <@player>`, `!win <team_no>`, `!draw`, `!end`, `!teamsize <no_of_players>`, `!addmap <map_name>`, `!removemap <map_name>`, `!maps`, `!map <map_name>`, `!choose`, `!notify <@role>`"
+      "Pug commands: `!status`, `!join`, `!team <team_no> [@player1] [@player2]`, `!unteam`, `!leave`, `!kick <@player>`, `!win <team_no>`, `!draw`, `!end`, `!teamsize <no_of_players>`, `!addmap <map_name>`, `!removemap <map_name>`, `!maps`, `!map [map_name]`, `!choose [n]`, `!notify <@role>`"
     end
 
     bot.command :join do |event, *args|
@@ -45,18 +45,28 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
-        if !pug.full?
+        if pug.joined_players.count.odd?
           return send_embedded_message(
-            description: "Can't choose teams until PUG is full",
-            channel: e.channel
+            description: "Can't choose teams with odd number of players",
+            channel: event.channel
           )
         end
 
-        pug.joined_players.each do |player_id|
-          pug.join_team(team_no: 0, player_id: player_id)
+        if args.any? && args.first.to_i < 1
+          return send_embedded_message(
+            description: "Choose a number higher than 0; e.g. `!choose 2`",
+            channel: e.channel
+          )
         end
 
-        start_pug(pug, e)
+        iteration = if args.any?
+                      args.first.to_i - 1
+                    else
+                      0
+                    end
+
+        choose_fair_teams(pug: pug, event: e, iteration: iteration)
+        status(pug: pug, event: e)
       end
     end
 
@@ -69,35 +79,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        footer = [
-          pug.game_map,
-          "#{pug.player_slots} joined",
-        ].compact.join(MSG_SNIPPET_DELIMITER)
-
-        send_embedded_message(
-          description: nil,
-          channel: e.channel
-        ) do |embed|
-          embed.footer = Discordrb::Webhooks::EmbedFooter.new(
-            text: footer
-          )
-
-          pug.teams.each do |team_no, player_ids|
-            team_display_names = player_ids.map do |player_id|
-              e.display_name_for(player_id)
-            end
-
-            embed.add_field(
-              Discordrb::Webhooks::EmbedField.new(
-                {
-                  inline: true,
-                  name: team_name(team_no),
-                  value: team_display_names.join("\n")
-                }
-              )
-            )
-          end
-        end
+        status(pug: pug, event: e)
       end
     end
 
@@ -619,20 +601,70 @@ class QwtfDiscordBotPug # :nodoc:
     nil # stop discordrb printing return value
   end
 
-  def start_pug(pug, event)
-    if !pug.actual_teams.any?
-      send_embedded_message(
-        description: "Choosing fair teams...",
+  def choose_fair_teams(pug:, event:, iteration: 0)
+    if !pug.full?
+      return send_embedded_message(
+        description: "Can't choose teams until PUG is full",
+        channel: e.channel
+      )
+    end
+
+    send_embedded_message(
+      description: "Choosing fair teams...",
+      channel: event.channel
+    )
+
+    combinations = get_fair_teams(pug.joined_players)
+    teams = combinations[iteration]
+
+    if !teams
+      return send_embedded_message(
+        description: "There are only #{combinations.count} possible combinations",
         channel: event.channel
       )
-      teams = get_fair_teams(pug.joined_players)
+    end
+
+    teams.each do |team_no, player_ids|
+      player_ids.each do |player_id|
+        pug.join_team(team_no: team_no, player_id: player_id)
+      end
+    end
+  end
+
+  def status(pug:, event:)
+    footer = [
+      pug.game_map,
+      "#{pug.player_slots} joined"
+    ].compact.join(MSG_SNIPPET_DELIMITER)
+
+    send_embedded_message(
+      description: nil,
+      channel: event.channel
+    ) do |embed|
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer
+      )
 
-      teams.each do |team_no, player_ids|
-        player_ids.each do |player_id|
-          pug.join_team(team_no: team_no, player_id: player_id)
+      pug.teams.each do |team_no, player_ids|
+        team_display_names = player_ids.map do |player_id|
+          event.display_name_for(player_id)
         end
+
+        embed.add_field(
+          Discordrb::Webhooks::EmbedField.new(
+            {
+              inline: true,
+              name: team_name(team_no),
+              value: team_display_names.join("\n")
+            }
+          )
+        )
       end
     end
+  end
+
+  def start_pug(pug, event)
+    choose_fair_teams(pug: pug, event: event) unless pug.actual_teams.any?
 
     footer = [
       pug.game_map,
@@ -695,6 +727,7 @@ class QwtfDiscordBotPug # :nodoc:
     uri = URI("#{ENV['RATINGS_API_URL']}matches/")
     req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
     req.body = json
+
     Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(req)
     end
@@ -705,9 +738,11 @@ class QwtfDiscordBotPug # :nodoc:
     params = { 'players[]' => players }
     uri.query = URI.encode_www_form(params)
     req = Net::HTTP::Get.new(uri)
+
     res = Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(req)
     end
-    JSON.parse(res.body).first.to_h
+
+    JSON.parse(res.body).map(&:to_h)
   end
 end

metadata

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