qwtf_discord_bot 5.4.3 → 5.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb40c561739b201a25554221a3b07ff74da6ef621121a8032cf7ff0638e8040d
-  data.tar.gz: 3215cfed66032d0e0f96689b885d427f9529b55cf07934dc9c8606ba76d467b4
+  metadata.gz: 81a6cd600bd16f113cbfd1a44b05a5d362428c5f31e3bc3a1310fc243cbb14d7
+  data.tar.gz: 0da538524b5ad76d74ce7eaf380331769759e540ffc80719d784abea9d0789eb
 SHA512:
-  metadata.gz: 2cc6e47321572b0459ef66a518631df912ac96726b4a62c7f508c174236a756c65b8c6898757a61b0c5854b145907e6d9b9e525db8df972ddd520b492512bed2
-  data.tar.gz: f8a5aff8a87cb70a32438199e5b85aa0388f5ef3918ed7f5b578d3241f199e354e799eac6cadb7a81075a799f9a42ac724152d3e783fc98a5dee0924c32b3866
+  metadata.gz: 2c349a08aaeb38a0dee3448fe0f57307dd20d17b71ff6dbae4e6a1da2d4c6198c13ed04ca560386013fcc89cafa7d584a5f5388b965594d6e8879c71d86efdc4
+  data.tar.gz: 73e8b9482f07568f16fc3c1100103aa2679e84f4cf656d163bb0f5dc7d51259b8d422498b7dfcef2c62fca5f093b8a6981814dae956da0d5bd49eae044e076b1

data/VERSION

@@ -1 +1 @@
-5.4.3
+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,6 +7,7 @@ class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
   MSG_SNIPPET_DELIMITER = ' · '
+  TEAM_NAMES = { 0 => "No team", 1 => "Blue", 2 => "Red" }
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -41,14 +42,32 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
 
-        send_embedded_message(
-          [
-            "#{pug.player_slots} joined",
-            "Map: #{pug.game_map}",
-            pug_teams_message(pug, e).join("\n")
-          ].join("\n"),
-          e.channel
-        )
+        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
 
@@ -154,14 +173,14 @@ class QwtfDiscordBotPug # :nodoc:
 
         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)
+          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_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
           )
@@ -184,7 +203,7 @@ class QwtfDiscordBotPug # :nodoc:
 
             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
             )
@@ -210,10 +229,10 @@ class QwtfDiscordBotPug # :nodoc:
     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?
+        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_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(
@@ -243,7 +262,7 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_embedded_message("Team #{winning_team_no} wins. [Ratings](http://ratings.fortressone.org)", e.channel)
+        send_embedded_message("#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)", e.channel)
       end
     end
 
@@ -358,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
@@ -384,6 +407,7 @@ class QwtfDiscordBotPug # :nodoc:
 
   def start_pug(pug, event)
     if !pug.actual_teams.any?
+      send_embedded_message("Choosing fair teams...", event.channel)
       teams = get_fair_teams(pug.joined_players)
 
       teams.each do |team_no, player_ids|
@@ -393,48 +417,31 @@ class QwtfDiscordBotPug # :nodoc:
       end
     end
 
-    pug_teams = pug.teams.map do |team_no, player_ids|
-      team_mentions = player_ids.map do |player_id|
-        event.mention_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_mentions,
-        teamsize: pug.teamsize
+    send_embedded_message("Time to play!", event.channel) do |embed|
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer
       )
-    end
 
-    msg = [
-      'Time to play!',
-      pug_teams
-    ].join("\n")
-
-    send_embedded_message(msg, event.channel)
-  end
+      pug.teams.each do |team_no, player_ids|
+        team_mentions = player_ids.map do |player_id|
+          event.mention_for(player_id)
+        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)
+        embed.add_field(
+          Discordrb::Webhooks::EmbedField.new(
+            {
+              inline: true,
+              name: team_name(team_no),
+              value: team_mentions.join("\n")
+            }
+          )
+        )
       end
-
-      team_status_line(
-        team_no: team_no.to_i,
-        names: team_display_names,
-        teamsize: pug.teamsize
-      )
-    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)
     end
   end
 
@@ -450,6 +457,7 @@ class QwtfDiscordBotPug # :nodoc:
   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
 

metadata

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