qwtf_discord_bot 5.4.5 → 5.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e755d887d064bcf3067b5360e2b2c30d0f88f6fffd0c3e43f7255ff392ee4f
-  data.tar.gz: 3efe1df2e2ecf4ba8e1af9099e5969e36d77c08d56e5422a21cef7332573ddf2
+  metadata.gz: 5f57dc18281f366be0004ffcf3ab6a35938b155c5897922c28cba7c6cf7e18b5
+  data.tar.gz: a27fcdd5f32203382595bc5b135af9940690fc0b45f7dbd6a5e019777de0ff5a
 SHA512:
-  metadata.gz: 8509a4b5ea6b5c57fcf987524673b2b3f89488104e0680575b9e948ef4253d00aaeac67c02bdc29c7857bd9908dc253de8843a87e4ffb882fa61f6bdeaf23442
-  data.tar.gz: a4452e760d59de5175d52e90f7940653d1f5a595ed01f4b4e0a8249e3a5f07a929c1806d84e851f93c5b5e546a7906782b365b5f062c1e9bf9f2806641340335
+  metadata.gz: c3d452a44dd1506cad8d214089737a0f515edabd2fe189bb437a321d624346ecd1795fa0bcb79bd8734d9f56f952c41e7aec49126a563bda7fbb8d313676cc24
+  data.tar.gz: 0df2e2073331e1cec5332bf7d680bb9715c789d2bac18ccf9750d48d7b4df1eb7a46c515f38a14597aa99de206b58392a41e613f5060b4f2b82c4438797c298b

data/VERSION

@@ -1 +1 @@
-5.4.5
+5.4.6

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -7,7 +7,7 @@ class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
   MSG_SNIPPET_DELIMITER = ' · '
-  TEAM_NAMES = { 0 => "No team", 1 => "Blue", 2 => "Red" }
+  TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -31,7 +31,12 @@ class QwtfDiscordBotPug # :nodoc:
 
     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?
@@ -40,7 +45,12 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_embedded_message("Can't choose teams until PUG is full", e.channel) unless pug.full?
+        if !pug.full?
+          return send_embedded_message(
+            description: "Can't choose teams until PUG is full",
+            channel: e.channel
+          )
+        end
 
         pug.joined_players.each do |player_id|
           pug.join_team(team_no: 0, player_id: player_id)
@@ -52,14 +62,22 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :status 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.active?
+          return send_embedded_message(
+            description: "No PUG has been started. `!join` to create",
+            channel: e.channel
+          )
+        end
 
         footer = [
           pug.game_map,
           "#{pug.player_slots} joined",
         ].compact.join(MSG_SNIPPET_DELIMITER)
 
-        send_embedded_message(nil, e.channel) do |embed|
+        send_embedded_message(
+          description: nil,
+          channel: e.channel
+        ) do |embed|
           embed.footer = Discordrb::Webhooks::EmbedFooter.new(
             text: footer
           )
@@ -85,39 +103,54 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :teamsize 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 new_teamsize
-          pug.teamsize = new_teamsize
-
-          send_embedded_message(
-            [
-              "Team size set to #{pug.teamsize}",
+        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)
 
@@ -126,11 +159,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?
@@ -139,12 +173,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
 
@@ -152,7 +200,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
 
@@ -163,11 +214,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?
@@ -177,29 +229,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_NAMES[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(
-            [
+            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
 
@@ -207,17 +280,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(
-              [
+              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
@@ -229,26 +306,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?
-        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)
+        unless pug.active?
+          return send_embedded_message(
+            description: no_active_pug_message,
+            channel: e.channel
+          )
+        end
+
+        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
 
         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
 
@@ -274,17 +391,26 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_embedded_message("#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)", 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
 
@@ -309,13 +435,21 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_embedded_message("Match drawn. [Ratings](http://ratings.fortressone.org)", 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
@@ -324,47 +458,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
@@ -380,7 +572,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
 
@@ -390,6 +585,8 @@ class QwtfDiscordBotPug # :nodoc:
   private
 
   def team_name(team_no)
+    return "No team" if team_no == 0
+
     [team_no, TEAM_NAMES[team_no]].join(" ")
   end
 
@@ -401,13 +598,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)
@@ -419,7 +621,10 @@ class QwtfDiscordBotPug # :nodoc:
 
   def start_pug(pug, event)
     if !pug.actual_teams.any?
-      send_embedded_message("Choosing fair teams...", event.channel)
+      send_embedded_message(
+        description: "Choosing fair teams...",
+        channel: event.channel
+      )
       teams = get_fair_teams(pug.joined_players)
 
       teams.each do |team_no, player_ids|
@@ -434,14 +639,23 @@ class QwtfDiscordBotPug # :nodoc:
       "#{pug.player_slots} joined",
     ].compact.join(MSG_SNIPPET_DELIMITER)
 
-    send_embedded_message("Time to play!", event.channel) do |embed|
+    mentions = pug.joined_players.map do |player_id|
+      event.mention_for(player_id)
+    end
+
+    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.mention_for(player_id)
+          event.display_name_for(player_id)
         end
 
         embed.add_field(
@@ -459,18 +673,22 @@ class QwtfDiscordBotPug # :nodoc:
 
   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
+    embed.description = description
     yield(embed) if block_given?
-    channel.send_embed(nil, embed) && puts(message)
+    channel.send_embed(message, embed) && puts(message)
   end
 
   def post_results(json)

metadata

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