qwtf_discord_bot 5.4.6 → 5.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f57dc18281f366be0004ffcf3ab6a35938b155c5897922c28cba7c6cf7e18b5
-  data.tar.gz: a27fcdd5f32203382595bc5b135af9940690fc0b45f7dbd6a5e019777de0ff5a
+  metadata.gz: b7785ca7ed0ab47cdae89946225b60fe94c4e5ef21e8df14a1855ed70c262f9e
+  data.tar.gz: fbc91574a3557232b40236f750e4c6ad2e7e130f15e3176030ec18cfd519c776
 SHA512:
-  metadata.gz: c3d452a44dd1506cad8d214089737a0f515edabd2fe189bb437a321d624346ecd1795fa0bcb79bd8734d9f56f952c41e7aec49126a563bda7fbb8d313676cc24
-  data.tar.gz: 0df2e2073331e1cec5332bf7d680bb9715c789d2bac18ccf9750d48d7b4df1eb7a46c515f38a14597aa99de206b58392a41e613f5060b4f2b82c4438797c298b
+  metadata.gz: 8ba026861ed819cbf511bf92f15781d88558788e4617c0a9e8e6af939907d3d1cde267ff1ad3e61f0f660e9e1c50b7f1d90b03299583c6a14037a23d5617df0f
+  data.tar.gz: 710d552cea8daf99b052e842db5120a5e399667d3a7af4391441ea410029d90ab3a316a5d67af93a9f9ffec6195ad05f59b3eb35c07b9a7dfad34eb7a73dba9b

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.11

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,29 @@ 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
+
+
+        message_obj = choose_fair_teams(pug: pug, event: e, iteration: iteration)
+        status(pug: pug, event: e, message_obj: message_obj) if message_obj
       end
     end
 
@@ -69,35 +80,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
 
@@ -278,15 +261,6 @@ class QwtfDiscordBotPug # :nodoc:
 
             user_id = mention_to_user_id(mention)
             display_name = e.display_name_for(user_id) || arg
-
-            unless pug.joined?(user_id)
-              send_embedded_message(
-                description: "#{display_name} isn't in the PUG",
-                channel: e.channel
-              )
-              next
-            end
-
             pug.join_team(team_no: team_no, player_id: user_id)
 
             send_embedded_message(
@@ -378,7 +352,7 @@ class QwtfDiscordBotPug # :nodoc:
           teams.merge({ name => { players: players, result: result } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -389,10 +363,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -422,7 +396,7 @@ class QwtfDiscordBotPug # :nodoc:
         teams.merge({ name => { players: players, result: 0 } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -433,10 +407,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "Match drawn. [Ratings](http://ratings.fortressone.org)",
+          description: "Match ##{id} drawn. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -619,20 +593,74 @@ 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: event.channel
+      ) && nil
+    end
+
+    message_obj = 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,
+        message_obj: message_obj
+      ) && nil
+    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
+
+    message_obj
+  end
+
+  def status(pug:, event:, message_obj: nil)
+    footer = [
+      pug.game_map || "No map selected",
+      "#{pug.player_slots} joined",
+    ].compact.join(MSG_SNIPPET_DELIMITER)
+
+    send_embedded_message(
+      description: nil,
+      channel: event.channel,
+      message_obj: message_obj
+    ) do |embed|
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer
       )
-      teams = get_fair_teams(pug.joined_players)
 
-      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,
@@ -684,17 +712,27 @@ class QwtfDiscordBotPug # :nodoc:
     "There's no active PUG"
   end
 
-  def send_embedded_message(message: nil, description: nil, channel:)
+  def send_embedded_message(message: nil, description: nil, channel:, message_obj: nil)
     embed = Discordrb::Webhooks::Embed.new
     embed.description = description
     yield(embed) if block_given?
-    channel.send_embed(message, embed) && puts(message)
+
+    if message_obj
+      message_obj.edit(message, embed).tap do
+        puts(message)
+      end
+    else
+      channel.send_embed(message, embed).tap do
+        puts(message)
+      end
+    end
   end
 
   def post_results(json)
     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 +743,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.11
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb