qwtf_discord_bot 5.4.7 → 5.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494909e7fd239e609f01dd75f848bbe8137fc0d867acb5787b0944302ec5afc7
-  data.tar.gz: 9fea99c070c99eb6044fbc75f812ab200553208c656a494a5dbd6d8468fc8913
+  metadata.gz: 4b277234b785000212e913859cac63c94fc2c125bf6c2723ed5b7df6ba7419a7
+  data.tar.gz: b55f4861185865fb3b7bb8ceb19ddad26ebaef334aa02cc7e7504e0b6bf74a20
 SHA512:
-  metadata.gz: d0174509b7ef119457eba3d97367e3c53e176a6e8597888c235d74f030a28a8afcebbf63b7c416c63b3f64183cf81e655b5d9eb7628c7df533514d609b575b9d
-  data.tar.gz: d8296d6419b4cb26ede8395a7552154e926be59cfac50cae5d7d8dd2aa291699c7f9cb3b6923330a7ff1641a58b85af60ad5e2d43b5c4d54f4820f35c786e8ed
+  metadata.gz: db1415cd7144dbf88b0343cabf2d05daed1fc8da377a25c2d32117d7d84be9f7cb4fdbd96d16c5084a2abf00d78d7318baaff8accd96a6723657867fdcfb7422
+  data.tar.gz: 5af029b8abd9cf20438ae815ca4e6234b23c0d2279c3884bc0d267d31e06f7a91de523b0276719a7a37e6c373d14795b39e2e5b6774d84956828490834d5fc47

data/VERSION

@@ -1 +1 @@
-5.4.7
+5.4.12

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -65,8 +65,9 @@ class QwtfDiscordBotPug # :nodoc:
                       0
                     end
 
-        choose_fair_teams(pug: pug, event: e, iteration: iteration)
-        status(pug: pug, event: e)
+
+        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
 
@@ -260,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(
@@ -328,6 +320,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.full?
+          return send_embedded_message(
+            description: "Can't report unless PUG is full",
+            channel: event.channel
+          )
+        end
+
         unless args.any?
           return send_embedded_message(
             description: "Specify winning team; e.g. `!win 1`",
@@ -360,7 +359,7 @@ class QwtfDiscordBotPug # :nodoc:
           teams.merge({ name => { players: players, result: result } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -371,10 +370,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -389,6 +388,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.full?
+          return send_embedded_message(
+            description: "Can't report unless PUG is full",
+            channel: event.channel
+          )
+        end
+
         if pug.actual_teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",
@@ -404,7 +410,7 @@ class QwtfDiscordBotPug # :nodoc:
         teams.merge({ name => { players: players, result: 0 } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -415,10 +421,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "Match drawn. [Ratings](http://ratings.fortressone.org)",
+          description: "Match ##{id} drawn. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -605,11 +611,11 @@ class QwtfDiscordBotPug # :nodoc:
     if !pug.full?
       return send_embedded_message(
         description: "Can't choose teams until PUG is full",
-        channel: e.channel
-      )
+        channel: event.channel
+      ) && nil
     end
 
-    send_embedded_message(
+    message_obj = send_embedded_message(
       description: "Choosing fair teams...",
       channel: event.channel
     )
@@ -620,8 +626,9 @@ 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
 
     teams.each do |team_no, player_ids|
@@ -629,17 +636,20 @@ 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"
+      pug.game_map || "No map selected",
+      "#{pug.player_slots} joined",
     ].compact.join(MSG_SNIPPET_DELIMITER)
 
     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
@@ -716,11 +726,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.7
+  version: 5.4.12
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb