qwtf_discord_bot 5.4.8 → 5.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0cd4500b420de235f08b79fb20ae3ce42740811ee6a75a780d1c4a1b44125e
-  data.tar.gz: c3d6bd3347b2661d6db8672bc659dab1a4efe78f13da96cc89e7339b6d21c02d
+  metadata.gz: 256bc5dd2a321a2e9495764c946142a36bdc4cec6f4871a70c3d8b2b6e0d1357
+  data.tar.gz: 16d3964888b04bdb1580ef62b1541375876dfdd2a24847ff60bc2927871f8ab3
 SHA512:
-  metadata.gz: fb897f2b93c97bab3cb3d6fb391eb5b929b47afaf103998c3df41547385369dea49f99b8fdef59e28a4cb09c056088c57ef98fc54a1b5d9aae13e71f3a973106
-  data.tar.gz: f4ffee4a777a3a4538d35d27c30068a3b3f2171aa087ec66f056885a6b5c93ef305faf088ae2736313dbb4acf7569402cb520fe9f1e2c88b8b052400965c0394
+  metadata.gz: c153a53da144bd6af78ea5013dd080d1f7da909ec532da2fa3787aa872ef03d778aaf30857d63ed204934cdfe5be3ff23aab166f6a747291ccb67f94ea23f10e
+  data.tar.gz: 986cc092056e071b8dcd877a4869d98911e9366253842f48e75df0f333445bfab71da2a6bab20e8242127a38a4fa187c930279497a3b632bc81ad63327972b65

data/VERSION

@@ -1 +1 @@
-5.4.8
+5.4.13

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(
@@ -296,26 +288,47 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        unless pug.joined?(user_id)
-          return send_embedded_message(
-            description: "You aren't in this PUG",
-            channel: e.channel
-          )
-        end
+        if args.empty?
+          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",
+          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(
+            description: "#{e.display_name} leaves team",
             channel: e.channel
           )
-        end
+        else
+          args.each do |mention|
+            unless mention.match(/<@!\d+>/)
+              send_embedded_message(
+                description: "#{arg} isn't a valid mention",
+                channel: e.channel
+              )
+              next
+            end
 
-        pug.join_team(team_no: 0, player_id: user_id)
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || arg
+            pug.join_team(team_no: 0, player_id: user_id)
 
-        send_embedded_message(
-          description: "#{e.display_name} leaves team",
-          channel: e.channel
-        )
+            send_embedded_message(
+              description: "#{display_name} leaves team",
+              channel: e.channel
+            )
+          end
+        end
       end
     end
 
@@ -328,6 +341,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 +380,7 @@ class QwtfDiscordBotPug # :nodoc:
           teams.merge({ name => { players: players, result: result } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -371,10 +391,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 +409,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 +431,7 @@ class QwtfDiscordBotPug # :nodoc:
         teams.merge({ name => { players: players, result: 0 } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -415,10 +442,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
@@ -606,10 +633,10 @@ class QwtfDiscordBotPug # :nodoc:
       return send_embedded_message(
         description: "Can't choose teams until PUG is full",
         channel: event.channel
-      )
+      ) && nil
     end
 
-    send_embedded_message(
+    message_obj = send_embedded_message(
       description: "Choosing fair teams...",
       channel: event.channel
     )
@@ -620,8 +647,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 +657,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 +747,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.8
+  version: 5.4.13
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb