qwtf_discord_bot 5.4.9 → 5.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3978acdc270b907c20e237c57690192b753aa96be251edcda59f80f60fa188a5
-  data.tar.gz: fbda19b74c0f215cbd2789743db1e303352dae5488fe4633e683c7982b7295f2
+  metadata.gz: c5bfd247ff3e811ab845a1cef86f043b93f54a6f30769885547d0ba1601c15ef
+  data.tar.gz: 72aebecdfaa233cd62e4d36b25c474a319dae5a1fa12d8ea8711536f23cf9549
 SHA512:
-  metadata.gz: 0b343f7bbcf1435df653f9cc6a810db2a09472d2238134a8acc39446c1e54a828a5c6d1e5fbef318271bd0019d70304febe39aab107ceefe8ceada2ae7318a99
-  data.tar.gz: e627fca364cd5f51fa3514c4c8c66d9bf80486f6114778bf82086165706503d808d89fc2b717ea4e2bcfc70d8fe7de5376432f68436a836d49e92b833611add4
+  metadata.gz: 89c358f811c6c0d17b31fb26e1a8d6234bf170f82bd5a820da5d8474052a42594f1adeafcd6fa387488147559370533a10d73bf50526bdfedb5b948325f78f7d
+  data.tar.gz: e2eb01bcd75ff2ab9251452c6cfac97b381d1199d5fddc5a146ee451def5e56747b4528e2977fd15e2d3d732a63cac03a1dcaa38a37cecaa6a75758075bdf770

data/VERSION

@@ -1 +1 @@
-5.4.9
+5.4.10

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -65,9 +65,9 @@ class QwtfDiscordBotPug # :nodoc:
                       0
                     end
 
-        if choose_fair_teams(pug: pug, event: e, iteration: iteration)
-          status(pug: pug, event: e)
-        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
 
@@ -261,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(
@@ -610,7 +601,7 @@ class QwtfDiscordBotPug # :nodoc:
       ) && nil
     end
 
-    send_embedded_message(
+    message_obj = send_embedded_message(
       description: "Choosing fair teams...",
       channel: event.channel
     )
@@ -621,7 +612,8 @@ class QwtfDiscordBotPug # :nodoc:
     if !teams
       return send_embedded_message(
         description: "There are only #{combinations.count} possible combinations",
-        channel: event.channel
+        channel: event.channel,
+        message_obj: message_obj
       ) && nil
     end
 
@@ -630,9 +622,11 @@ class QwtfDiscordBotPug # :nodoc:
         pug.join_team(team_no: team_no, player_id: player_id)
       end
     end
+
+    message_obj
   end
 
-  def status(pug:, event:)
+  def status(pug:, event:, message_obj: nil)
     footer = [
       pug.game_map,
       "#{pug.player_slots} joined"
@@ -640,7 +634,8 @@ class QwtfDiscordBotPug # :nodoc:
 
     send_embedded_message(
       description: nil,
-      channel: event.channel
+      channel: event.channel,
+      message_obj: message_obj
     ) do |embed|
       embed.footer = Discordrb::Webhooks::EmbedFooter.new(
         text: footer
@@ -717,11 +712,20 @@ 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)

metadata

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