qwtf_discord_bot 5.3.7 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac8fe73d3dd003dd07f87fdfcbdafd11641af03cbebacb1181b3fa0f579bc45
-  data.tar.gz: e8a954d514218d8817ee9f2c6dbebf081e6d2e6138c20c953d086db2f3ed8297
+  metadata.gz: 81a6cd600bd16f113cbfd1a44b05a5d362428c5f31e3bc3a1310fc243cbb14d7
+  data.tar.gz: 0da538524b5ad76d74ce7eaf380331769759e540ffc80719d784abea9d0789eb
 SHA512:
-  metadata.gz: 562a7b2393565703a390938a2da2468af526cb239349472eaa93f69f31d6d00d1a5eb6f389cb949e181615ce56786d96fe96d220acc60d10cc1afffa9401ca86
-  data.tar.gz: 7f8e88bf439e2d8faeea68440549ea09e0519e4607ff2899d5c7ae5deff6d9bd29ede1dae0c55d219966518ffcdf25f2c71adf9ea992ac54c7e68838366fc273
+  metadata.gz: 2c349a08aaeb38a0dee3448fe0f57307dd20d17b71ff6dbae4e6a1da2d4c6198c13ed04ca560386013fcc89cafa7d584a5f5388b965594d6e8879c71d86efdc4
+  data.tar.gz: 73e8b9482f07568f16fc3c1100103aa2679e84f4cf656d163bb0f5dc7d51259b8d422498b7dfcef2c62fca5f093b8a6981814dae956da0d5bd49eae044e076b1

data/VERSION

@@ -1 +1 @@
-5.3.7
+5.4.4

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,13 +7,22 @@ class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
   MSG_SNIPPET_DELIMITER = ' · '
+  TEAM_NAMES = { 0 => "No team", 1 => "Blue", 2 => "Red" }
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
       token: QwtfDiscordBot.config.token,
       client_id: QwtfDiscordBot.config.client_id,
       help_command: false,
-      prefix: '!'
+      prefix: proc do |message|
+        match = /^\!(\w+)(.*)/.match(message.content)
+        if match
+          first = match[1]
+          rest = match[2]
+          # Return the modified string with the first word lowercase:
+          "#{first.downcase}#{rest}"
+        end
+      end
     )
 
     bot.command :help do |event, *args|
@@ -22,7 +31,7 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :join do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("You've already joined", e.channel) if pug.joined?(e.user_id)
+        return send_embedded_message("You've already joined", e.channel) if pug.joined?(e.user_id)
 
         join_pug(e, pug)
         start_pug(pug, e) if pug.full?
@@ -31,30 +40,48 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :status do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
-
-        send_msg(
-          [
-            "#{pug.player_slots} joined",
-            "Map: #{pug.game_map}",
-            pug_teams_message(pug, e).join("\n")
-          ].join("\n"),
-          e.channel
-        )
+        return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+
+        footer = [
+          pug.game_map,
+          "#{pug.player_slots} joined",
+        ].compact.join(MSG_SNIPPET_DELIMITER)
+
+        send_embedded_message(nil, 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
       end
     end
 
     bot.command :teamsize do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("Team size is #{pug.teamsize}", e.channel) unless args.any?
+        return send_embedded_message("Team size is #{pug.teamsize}", e.channel) unless args.any?
 
         new_teamsize = args[0].to_i
-        return send_msg('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
+        return send_embedded_message('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
 
         if new_teamsize
           pug.teamsize = new_teamsize
 
-          send_msg(
+          send_embedded_message(
             [
               "Team size set to #{pug.teamsize}",
               "#{pug.player_slots} joined"
@@ -64,7 +91,7 @@ class QwtfDiscordBotPug # :nodoc:
 
           start_pug(pug, e) if pug.full?
         else
-          send_msg(
+          send_embedded_message(
             [
               "Current team size is #{pug.teamsize}",
               "#{pug.player_slots} joined"
@@ -77,8 +104,8 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :leave do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
-        return send_msg("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
+        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)
 
         pug.leave(e.user_id)
 
@@ -89,7 +116,7 @@ class QwtfDiscordBotPug # :nodoc:
 
         snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
-        send_msg(
+        send_embedded_message(
           snippets.join(MSG_SNIPPET_DELIMITER),
           e.channel
         )
@@ -100,12 +127,12 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :kick do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("Kick who? e.g. `!kick @#{e.display_name}`", e.channel) unless args.any?
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        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?
 
         args.each do |arg|
           unless arg.match(/<@!\d+>/)
-            send_msg("#{arg} isn't a valid mention", e.channel)
+            send_embedded_message("#{arg} isn't a valid mention", e.channel)
             next
           end
 
@@ -113,7 +140,7 @@ class QwtfDiscordBotPug # :nodoc:
           display_name = e.display_name_for(user_id) || arg
 
           unless pug.joined?(user_id)
-            send_msg("#{display_name} isn't in the PUG", e.channel)
+            send_embedded_message("#{display_name} isn't in the PUG", e.channel)
             next
           end
 
@@ -126,7 +153,7 @@ class QwtfDiscordBotPug # :nodoc:
 
           snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
-          send_msg(
+          send_embedded_message(
             snippets.join(MSG_SNIPPET_DELIMITER),
             e.channel
           )
@@ -138,30 +165,29 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :team do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("Which team? E.G. `!team 1`", e.channel) unless args.any?
-
-        team_no = args[0].to_i
-        return send_msg("Choose a team between 0 and 4", e.channel) unless team_no.between?(0, 4)
+        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)
 
+        team_no = args.first.to_i
         pug_already_full = pug.full?
 
         if args.count == 1
           user_id = e.user_id
-          return send_msg("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
+          return send_embedded_message("You're already in #{TEAM_NAMES[team_no]}", e.channel) if pug.team(team_no).include?(user_id)
 
           join_pug(e, pug) unless pug.joined?(user_id)
           pug.join_team(team_no: team_no, player_id: user_id)
 
-          send_msg(
+          send_embedded_message(
             [
-              "#{e.display_name} joins team #{team_no}",
+              "#{e.display_name} joins #{TEAM_NAMES[team_no]}",
               "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
             ].join(MSG_SNIPPET_DELIMITER), e.channel
           )
         else
           args[1..-1].each do |mention|
             unless mention.match(/<@!\d+>/)
-              send_msg("#{arg} isn't a valid mention", e.channel)
+              send_embedded_message("#{arg} isn't a valid mention", e.channel)
               next
             end
 
@@ -169,15 +195,15 @@ class QwtfDiscordBotPug # :nodoc:
             display_name = e.display_name_for(user_id) || arg
 
             unless pug.joined?(user_id)
-              send_msg("#{display_name} isn't in the PUG", e.channel)
+              send_embedded_message("#{display_name} isn't in the PUG", e.channel)
               next
             end
 
             pug.join_team(team_no: team_no, player_id: user_id)
 
-            send_msg(
+            send_embedded_message(
               [
-                "#{display_name} joins team #{team_no}",
+                "#{display_name} joins #{TEAM_NAMES[team_no]}",
                 "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
               ].join(MSG_SNIPPET_DELIMITER), e.channel
             )
@@ -191,25 +217,25 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :unteam do |event, *args|
       setup_pug(event) do |e, pug|
         user_id = e.user_id
-        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
-        return send_msg("You aren't in this PUG", e.channel) unless pug.joined?(user_id)
-        return send_msg("You aren't in a team", e.channel) if pug.team(0).include?(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)
 
         pug.join_team(team_no: 0, player_id: user_id)
-        send_msg("#{e.display_name} has no team", e.channel)
+        send_embedded_message("#{e.display_name} has no team", e.channel)
       end
     end
 
     bot.command :win do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message("Specify winning team; e.g. `!win 1`", e.channel) unless args.any?
+        return send_embedded_message("Invalid team number", e.channel) unless ["1", "2"].any?(args.first)
 
-        winning_team_no = args[0]
-
-        return send_msg("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_msg(
+          return send_embedded_message(
             "There must be at least two teams with players to submit a result", e.channel
           )
         end
@@ -236,26 +262,16 @@ 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_msg("Team #{winning_team_no} wins", e.channel)
+        send_embedded_message("#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)", e.channel)
       end
     end
 
     bot.command :draw do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         if pug.actual_teams.count < 2
-          return send_msg(
+          return send_embedded_message(
             "There must be at least two teams with players to submit a result", e.channel
           )
         end
@@ -281,13 +297,13 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_msg("Match drawn", e.channel)
+        send_embedded_message("Match drawn. [Ratings](http://ratings.fortressone.org)", e.channel)
       end
     end
 
     bot.command :end do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         end_pug(pug, e.channel)
       end
@@ -296,47 +312,47 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :addmap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_msg("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
+        return send_embedded_message("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
 
         pug.add_maps(maps)
-        send_msg("#{maps.join(', ')} added to maps", e.channel)
+        send_embedded_message("#{maps.join(', ')} added to maps", e.channel)
       end
     end
 
     bot.command :removemap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_msg("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
+        return send_embedded_message("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
 
         pug.remove_maps(maps)
-        send_msg("#{maps.join(', ')} removed from maps", e.channel)
+        send_embedded_message("#{maps.join(', ')} removed from maps", e.channel)
       end
     end
 
     bot.command :maps do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
+        return send_embedded_message('No maps have been added. `!addmap`', e.channel) unless maps.any?
 
-        send_msg(maps.join(', '), e.channel)
+        send_embedded_message(maps.join(', '), e.channel)
       end
     end
 
     bot.command :map do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        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?
 
         if args.empty?
-          return send_msg('No map has been set for the current PUG', e.channel) unless pug.game_map
-          send_msg("Current map is #{pug.game_map}", e.channel)
+          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)
         else
           game_map = args.first
-          return send_msg("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
+          return send_embedded_message("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
 
           pug.game_map = game_map
-          send_msg("Map set to #{game_map}", e.channel)
+          send_embedded_message("Map set to #{game_map}", e.channel)
         end
       end
     end
@@ -352,7 +368,7 @@ class QwtfDiscordBotPug # :nodoc:
                 "Notification role set to #{roles}"
               end
 
-        send_msg(msg, e.channel)
+        send_embedded_message(msg, e.channel)
       end
     end
 
@@ -361,6 +377,10 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
+  def team_name(team_no)
+    [team_no, TEAM_NAMES[team_no]].join(" ")
+  end
+
   def mention_to_user_id(mention)
     mention[3..-2].to_i
   end
@@ -375,7 +395,7 @@ class QwtfDiscordBotPug # :nodoc:
       snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
     end
 
-    send_msg(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
+    send_embedded_message(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
   end
 
   def setup_pug(event)
@@ -386,62 +406,59 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
-    pug_teams = pug.teams.map do |team_no, player_ids|
-      team_mentions = player_ids.map do |player_id|
-        event.mention_for(player_id)
-      end
+    if !pug.actual_teams.any?
+      send_embedded_message("Choosing fair teams...", event.channel)
+      teams = get_fair_teams(pug.joined_players)
 
-      team_status_line(
-        team_no: team_no.to_i,
-        names: team_mentions,
-        teamsize: pug.teamsize
-      )
+      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
 
-    msg = [
-      'Time to play!',
-      pug_teams
-    ].join("\n")
-
-    send_msg(msg, event.channel)
-  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
+    footer = [
+      pug.game_map,
+      "#{pug.player_slots} joined",
+    ].compact.join(MSG_SNIPPET_DELIMITER)
 
-      team_status_line(
-        team_no: team_no.to_i,
-        names: team_display_names,
-        teamsize: pug.teamsize
+    send_embedded_message("Time to play!", event.channel) do |embed|
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer
       )
-    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)
+      pug.teams.each do |team_no, player_ids|
+        team_mentions = player_ids.map do |player_id|
+          event.mention_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_msg('PUG ended', channel_id)
+    send_embedded_message('PUG ended', channel_id)
   end
 
   def no_active_pug_message
     "There's no active PUG"
   end
 
-  def send_msg(message, channel)
-    channel.send_message(message) && puts(message)
+  def send_embedded_message(message, channel)
+    embed = Discordrb::Webhooks::Embed.new
+    embed.description = message
+    yield(embed) if block_given?
+    channel.send_embed(nil, embed) && puts(message)
   end
 
   def post_results(json)
@@ -452,4 +469,15 @@ class QwtfDiscordBotPug # :nodoc:
       http.request(req)
     end
   end
+
+  def get_fair_teams(players)
+    uri = URI("#{ENV['RATINGS_API_URL']}fair_teams/new")
+    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
+  end
 end

metadata

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