qwtf_discord_bot 5.4.2 → 5.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ecc26e71f4325677ded724c87d1f3496d1207d2cbd662146c09caba5c0d397
-  data.tar.gz: 3b5392f1a58fbbad660b17f2d88f8f8d29220e637069a353745963fc264ad0f4
+  metadata.gz: 494909e7fd239e609f01dd75f848bbe8137fc0d867acb5787b0944302ec5afc7
+  data.tar.gz: 9fea99c070c99eb6044fbc75f812ab200553208c656a494a5dbd6d8468fc8913
 SHA512:
-  metadata.gz: 45a536a9334a9caf56358b0b66aeffcdf9fc419e57e5ef09b33e0994b510e398bbeed76c9ba61d7513cc22dd4c3ebeca9c34e33de20aa70b8c5c340ae46c29d3
-  data.tar.gz: '018d569f3f282455e0e22cf73dac28f4dfb716242911a4130a7edefe41d598709da09d05efd086de5c41078eceb7ca8a4130f124926118f359480094c73b9015'
+  metadata.gz: d0174509b7ef119457eba3d97367e3c53e176a6e8597888c235d74f030a28a8afcebbf63b7c416c63b3f64183cf81e655b5d9eb7628c7df533514d609b575b9d
+  data.tar.gz: d8296d6419b4cb26ede8395a7552154e926be59cfac50cae5d7d8dd2aa291699c7f9cb3b6923330a7ff1641a58b85af60ad5e2d43b5c4d54f4820f35c786e8ed

data/README.md

@@ -90,13 +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>`
+  - `!map [map_name]`
+  - `!choose [n]`
   - `!win <team_no>`
   - `!draw`
   - `!notify <@role>`

data/VERSION

@@ -1 +1 @@
-5.4.2
+5.4.7

data/lib/pug.rb

@@ -122,13 +122,15 @@ class Pug
   end
 
   def teams
-    teams_keys.inject({}) do |teams, team|
-      teams.merge({ team.split(':').last => redis.smembers(team).map(&:to_i) })
+    all_teams = teams_keys.inject({}) do |teams, team|
+      teams.merge({ team.split(':').last.to_i => redis.smembers(team).map(&:to_i) })
     end
+
+    all_teams.sort.to_h
   end
 
   def actual_teams
-    teams.tap { |team| team.delete("0") }
+    teams.tap { |team| team.delete(0) }
   end
 
   private

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -7,6 +7,7 @@ class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
   MSG_SNIPPET_DELIMITER = ' · '
+  TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -25,68 +26,113 @@ 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>`, `!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|
       setup_pug(event) do |e, pug|
-        return send_embedded_message("You've already joined", e.channel) if pug.joined?(e.user_id)
+        if pug.joined?(e.user_id)
+          return send_embedded_message(
+            description: "You've already joined",
+            channel: e.channel
+          )
+        end
 
         join_pug(e, pug)
         start_pug(pug, e) if pug.full?
       end
     end
 
-    bot.command :status do |event, *args|
+    bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+        if pug.joined_players.count.odd?
+          return send_embedded_message(
+            description: "Can't choose teams with odd number of players",
+            channel: event.channel
+          )
+        end
 
-        send_embedded_message(
-          [
-            "#{pug.player_slots} joined",
-            "Map: #{pug.game_map}",
-            pug_teams_message(pug, e).join("\n")
-          ].join("\n"),
-          e.channel
-        )
+        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
+
+        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
 
-    bot.command :teamsize do |event, *args|
+    bot.command :status do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message("Team size is #{pug.teamsize}", e.channel) unless args.any?
-
-        new_teamsize = args[0].to_i
-        return send_embedded_message('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
+        if !pug.active?
+          return send_embedded_message(
+            description: "No PUG has been started. `!join` to create",
+            channel: e.channel
+          )
+        end
 
-        if new_teamsize
-          pug.teamsize = new_teamsize
+        status(pug: pug, event: e)
+      end
+    end
 
-          send_embedded_message(
-            [
-              "Team size set to #{pug.teamsize}",
+    bot.command :teamsize do |event, *args|
+      setup_pug(event) do |e, pug|
+        unless args.any?
+          return send_embedded_message(
+            description: [
+              "Each team has #{pug.teamsize} players",
               "#{pug.player_slots} joined"
             ].join(MSG_SNIPPET_DELIMITER),
-            e.channel
+            channel: e.channel
           )
+        end
 
-          start_pug(pug, e) if pug.full?
-        else
-          send_embedded_message(
-            [
-              "Current team size is #{pug.teamsize}",
-              "#{pug.player_slots} joined"
-            ].join(MSG_SNIPPET_DELIMITER),
-            e.channel
+        new_teamsize = args[0].to_i
+
+        if new_teamsize < 1
+          return send_embedded_message(
+            description: "Team size should be 1 or more",
+            channel: e.channel
           )
         end
+
+        pug.teamsize = new_teamsize
+
+        send_embedded_message(
+          description: [
+            "Each team has #{pug.teamsize} players",
+            "#{pug.player_slots} joined"
+          ].join(MSG_SNIPPET_DELIMITER),
+          channel: e.channel
+        )
+
+        start_pug(pug, e) if pug.full?
       end
     end
 
     bot.command :leave do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
-        return send_embedded_message("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
+
+        unless pug.joined?(e.user_id)
+          return send_embedded_message(
+            description: "You're not in the PUG",
+            channel: e.channel
+          )
+        end
 
         pug.leave(e.user_id)
 
@@ -95,11 +141,12 @@ class QwtfDiscordBotPug # :nodoc:
           "#{pug.player_slots} remain"
         ]
 
-        snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+        message = "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
         send_embedded_message(
-          snippets.join(MSG_SNIPPET_DELIMITER),
-          e.channel
+          message: message,
+          description: snippets.join(MSG_SNIPPET_DELIMITER),
+          channel: e.channel
         )
 
         end_pug(pug, e.channel) if pug.empty?
@@ -108,12 +155,26 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :kick do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message("Kick who? e.g. `!kick @#{e.display_name}`", e.channel) unless args.any?
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        unless args.any?
+          return send_embedded_message(
+            description: "Kick who? e.g. `!kick @#{e.display_name}`",
+            channel: e.channel
+          )
+        end
+
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
 
         args.each do |arg|
           unless arg.match(/<@!\d+>/)
-            send_embedded_message("#{arg} isn't a valid mention", e.channel)
+            send_embedded_message(
+              description: "#{arg} isn't a valid mention",
+              channel: e.channel
+            )
             next
           end
 
@@ -121,7 +182,10 @@ class QwtfDiscordBotPug # :nodoc:
           display_name = e.display_name_for(user_id) || arg
 
           unless pug.joined?(user_id)
-            send_embedded_message("#{display_name} isn't in the PUG", e.channel)
+            send_embedded_message(
+              description: "#{display_name} isn't in the PUG",
+              channel: e.channel
+            )
             next
           end
 
@@ -132,11 +196,12 @@ class QwtfDiscordBotPug # :nodoc:
             "#{pug.player_slots} remain"
           ]
 
-          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+          message = "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
           send_embedded_message(
-            snippets.join(MSG_SNIPPET_DELIMITER),
-            e.channel
+            message: message,
+            description: snippets.join(MSG_SNIPPET_DELIMITER),
+            channel: e.channel
           )
 
           break end_pug(pug, e.channel) if pug.empty?
@@ -146,29 +211,50 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :team do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message("Which team? E.G. `!team 1`", e.channel) unless args.any?
-        return send_embedded_message("Choose a team between 0 and 2", e.channel) unless ["0", "1", "2"].any?(args.first)
+        unless args.any?
+          return send_embedded_message(
+            description: "Which team? E.G. `!team 1`",
+            channel: e.channel
+          )
+        end
+
+        unless ["1", "2"].any?(args.first)
+          return send_embedded_message(
+            description: "Choose `!team 1`, `!team 2`, or `!unteam` to leave team",
+            channel: e.channel
+          )
+        end
 
         team_no = args.first.to_i
         pug_already_full = pug.full?
 
         if args.count == 1
           user_id = e.user_id
-          return send_embedded_message("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
+
+          if pug.team(team_no).include?(user_id)
+            return send_embedded_message(
+              description: "You're already in #{TEAM_NAMES[team_no]}",
+              channel: e.channel
+            )
+          end
 
           join_pug(e, pug) unless pug.joined?(user_id)
           pug.join_team(team_no: team_no, player_id: user_id)
 
           send_embedded_message(
-            [
-              "#{e.display_name} joins team #{team_no}",
+            description: [
+              "#{e.display_name} joins #{TEAM_NAMES[team_no]}",
               "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
-            ].join(MSG_SNIPPET_DELIMITER), e.channel
+            ].join(MSG_SNIPPET_DELIMITER),
+            channel: e.channel
           )
         else
           args[1..-1].each do |mention|
             unless mention.match(/<@!\d+>/)
-              send_embedded_message("#{arg} isn't a valid mention", e.channel)
+              send_embedded_message(
+                description: "#{arg} isn't a valid mention",
+                channel: e.channel
+              )
               next
             end
 
@@ -176,17 +262,21 @@ class QwtfDiscordBotPug # :nodoc:
             display_name = e.display_name_for(user_id) || arg
 
             unless pug.joined?(user_id)
-              send_embedded_message("#{display_name} isn't in the PUG", e.channel)
+              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(
-              [
-                "#{display_name} joins team #{team_no}",
+              description: [
+                "#{display_name} joins #{TEAM_NAMES[team_no]}",
                 "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
-              ].join(MSG_SNIPPET_DELIMITER), e.channel
+              ].join(MSG_SNIPPET_DELIMITER),
+              channel: e.channel
             )
           end
         end
@@ -198,26 +288,66 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :unteam do |event, *args|
       setup_pug(event) do |e, pug|
         user_id = e.user_id
-        return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
-        return send_embedded_message("You aren't in this PUG", e.channel) unless pug.joined?(user_id)
-        return send_embedded_message("You aren't in a team", e.channel) if pug.team(0).include?(user_id)
+
+        unless pug.active?
+          return send_embedded_message(
+            description: 'No PUG has been started. `!join` to create',
+            channel: e.channel
+          )
+        end
+
+        unless pug.joined?(user_id)
+          return send_embedded_message(
+            description: "You aren't in this PUG",
+            channel: e.channel
+          )
+        end
+
+        if pug.team(0).include?(user_id)
+          return send_embedded_message(
+            description: "You aren't in a team",
+            channel: e.channel
+          )
+        end
 
         pug.join_team(team_no: 0, player_id: user_id)
-        send_embedded_message("#{e.display_name} has no team", e.channel)
+
+        send_embedded_message(
+          description: "#{e.display_name} leaves team",
+          channel: e.channel
+        )
       end
     end
 
     bot.command :win do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
 
-        winning_team_no = args[0]
+        unless args.any?
+          return send_embedded_message(
+            description: "Specify winning team; e.g. `!win 1`",
+            channel: e.channel
+          )
+        end
+
+        unless ["1", "2"].any?(args.first)
+          return send_embedded_message(
+            description: "Invalid team number",
+            channel: e.channel
+          )
+        end
 
-        return send_embedded_message("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
+        winning_team_no = args.first.to_i
 
         if pug.actual_teams.count < 2
           return send_embedded_message(
-            "There must be at least two teams with players to submit a result", e.channel
+            description: "There must be at least two teams with players to submit a result",
+            channel: e.channel
           )
         end
 
@@ -243,27 +373,26 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        # winning_team = pug.team(winning_team_no).map do |player_id|
-        #   e.display_name_for(player_id)
-        # end
-
-        # non_winning_teams = pug.actual_teams.tap { |team| team.delete(winning_team_no) }
-
-        # losing_players = non_winning_teams.values.flatten.map do |player_id|
-        #   e.display_name_for(player_id)
-        # end
-
-        send_embedded_message("Team #{winning_team_no} wins", e.channel)
+        send_embedded_message(
+          description: "#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)",
+          channel: e.channel
+        )
       end
     end
 
     bot.command :draw do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
 
         if pug.actual_teams.count < 2
           return send_embedded_message(
-            "There must be at least two teams with players to submit a result", e.channel
+            description: "There must be at least two teams with players to submit a result",
+            channel: e.channel
           )
         end
 
@@ -288,13 +417,21 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_embedded_message("Match drawn", e.channel)
+        send_embedded_message(
+          description: "Match drawn. [Ratings](http://ratings.fortressone.org)",
+          channel: e.channel
+        )
       end
     end
 
     bot.command :end do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
 
         end_pug(pug, e.channel)
       end
@@ -303,47 +440,105 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :addmap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_embedded_message("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
+
+        unless maps.any?
+          return send_embedded_message(
+            description: "What map? e.g. `!addmap 2fort5r`",
+            channel: e.channel
+          )
+        end
 
         pug.add_maps(maps)
-        send_embedded_message("#{maps.join(', ')} added to maps", e.channel)
+
+        send_embedded_message(
+          description: "#{maps.join(', ')} added to maps",
+          channel: e.channel)
       end
     end
 
     bot.command :removemap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_embedded_message("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
+
+        unless maps.any?
+          return send_embedded_message(
+            description: "What map? e.g. `!removemap 2fort5r`",
+            channel: e.channel
+          )
+        end
 
         pug.remove_maps(maps)
-        send_embedded_message("#{maps.join(', ')} removed from maps", e.channel)
+
+        send_embedded_message(
+          description: "#{maps.join(', ')} removed from maps",
+          channel: e.channel
+        )
       end
     end
 
     bot.command :maps do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_embedded_message('No maps have been added. `!addmap`', e.channel) unless maps.any?
+        unless maps.any?
+          return send_embedded_message(
+            description: 'No maps have been added. `!addmap`',
+            channel: e.channel
+          )
+        end
 
-        send_embedded_message(maps.join(', '), e.channel)
+        send_embedded_message(
+          description: maps.join(', '),
+          channel: e.channel
+        )
       end
     end
 
     bot.command :map do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_embedded_message('No maps have been added. `!addmap`', e.channel) unless maps.any?
-        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+
+        unless maps.any?
+          return send_embedded_message(
+            description: 'No maps have been added. `!addmap`',
+            channel: e.channel
+          )
+        end
+
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
 
         if args.empty?
-          return send_embedded_message('No map has been set for the current PUG', e.channel) unless pug.game_map
-          send_embedded_message("Current map is #{pug.game_map}", e.channel)
+          unless pug.game_map
+            return send_embedded_message(
+              description: 'No map has been set for the current PUG',
+              channel: e.channel
+            )
+          end
+
+          send_embedded_message(
+            description: "Current map is #{pug.game_map}",
+            channel: e.channel
+          )
         else
           game_map = args.first
-          return send_embedded_message("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
+
+          unless maps.include?(game_map)
+            return send_embedded_message(
+              description: "#{game_map} isn't in the map list. `!addmap` to add it.",
+              channel: e.channel
+            )
+          end
 
           pug.game_map = game_map
-          send_embedded_message("Map set to #{game_map}", e.channel)
+
+          send_embedded_message(
+            description: "Map set to #{game_map}",
+            channel: e.channel
+          )
         end
       end
     end
@@ -359,7 +554,10 @@ class QwtfDiscordBotPug # :nodoc:
                 "Notification role set to #{roles}"
               end
 
-        send_embedded_message(msg, e.channel)
+        send_embedded_message(
+          description: msg,
+          channel: e.channel
+        )
       end
     end
 
@@ -368,6 +566,12 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
+  def team_name(team_no)
+    return "No team" if team_no == 0
+
+    [team_no, TEAM_NAMES[team_no]].join(" ")
+  end
+
   def mention_to_user_id(mention)
     mention[3..-2].to_i
   end
@@ -376,13 +580,18 @@ class QwtfDiscordBotPug # :nodoc:
     pug.join(e.user_id)
 
     if pug.joined_player_count == 1
-      snippets = ["#{e.display_name} creates a PUG", pug.player_slots, pug.notify_roles]
+      snippets = ["#{e.display_name} creates a PUG", "#{pug.player_slots} joined"]
+      message = pug.notify_roles
     else
-      snippets = ["#{e.display_name} joins the PUG", pug.player_slots]
-      snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
+      snippets = ["#{e.display_name} joins the PUG", "#{pug.player_slots} joined"]
+      message = "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
     end
 
-    send_embedded_message(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
+    send_embedded_message(
+      message: message,
+      description: snippets.join(MSG_SNIPPET_DELIMITER),
+      channel: e.channel
+    )
   end
 
   def setup_pug(event)
@@ -392,81 +601,133 @@ class QwtfDiscordBotPug # :nodoc:
     nil # stop discordrb printing return value
   end
 
-  def start_pug(pug, event)
-    if !pug.actual_teams.any?
-      teams = get_fair_teams(pug.joined_players)
+  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
 
-      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
+    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
+      )
     end
 
-    pug_teams = pug.teams.map do |team_no, player_ids|
-      team_mentions = player_ids.map do |player_id|
-        event.mention_for(player_id)
+    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
 
-      team_status_line(
-        team_no: team_no.to_i,
-        names: team_mentions,
-        teamsize: pug.teamsize
+  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
       )
-    end
 
-    msg = [
-      'Time to play!',
-      pug_teams
-    ].join("\n")
+      pug.teams.each do |team_no, player_ids|
+        team_display_names = player_ids.map do |player_id|
+          event.display_name_for(player_id)
+        end
 
-    send_embedded_message(msg, event.channel)
+        embed.add_field(
+          Discordrb::Webhooks::EmbedField.new(
+            {
+              inline: true,
+              name: team_name(team_no),
+              value: team_display_names.join("\n")
+            }
+          )
+        )
+      end
+    end
   end
 
-  def pug_teams_message(pug, event)
-    pug.teams.map do |team_no, player_ids|
-      team_display_names = player_ids.map do |player_id|
-        event.display_name_for(player_id)
-      end
+  def start_pug(pug, event)
+    choose_fair_teams(pug: pug, event: event) unless pug.actual_teams.any?
 
-      team_status_line(
-        team_no: team_no.to_i,
-        names: team_display_names,
-        teamsize: pug.teamsize
-      )
+    footer = [
+      pug.game_map,
+      "#{pug.player_slots} joined",
+    ].compact.join(MSG_SNIPPET_DELIMITER)
+
+    mentions = pug.joined_players.map do |player_id|
+      event.mention_for(player_id)
     end
-  end
 
-  def team_status_line(team_no:, names:, teamsize:)
-    if team_no.to_i.zero?
-      ["No team: #{names.join(', ')}"]
-    else
-      [
-        "Team #{team_no}: #{names.join(', ')}",
-        "#{names.count}/#{teamsize}"
-      ].join(MSG_SNIPPET_DELIMITER)
+    mention_line = "Time to play! #{mentions.join(" ")}"
+
+    send_embedded_message(
+      message: mention_line,
+      channel: event.channel
+    ) do |embed|
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer
+      )
+
+      pug.teams.each do |team_no, player_ids|
+        team_mentions = 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_mentions.join("\n")
+            }
+          )
+        )
+      end
     end
   end
 
   def end_pug(pug, channel_id)
     pug.end_pug
-    send_embedded_message('PUG ended', channel_id)
+
+    send_embedded_message(
+      description: 'PUG ended',
+      channel: channel_id
+    )
   end
 
   def no_active_pug_message
     "There's no active PUG"
   end
 
-  def send_embedded_message(message, channel)
+  def send_embedded_message(message: nil, description: nil, channel:)
     embed = Discordrb::Webhooks::Embed.new
-    embed.description = message
-    channel.send_embed(nil, embed) && puts(message)
+    embed.description = description
+    yield(embed) if block_given?
+    channel.send_embed(message, embed) && puts(message)
   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
@@ -477,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.2
+  version: 5.4.7
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb