qwtf_discord_bot 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b630f0be26ff93132f961550613e3616dc423b53662e7cb44646746bb0126fc
-  data.tar.gz: 6dff05acbd136b65db0e0dac8958addd0b8113e51b9e1a68b00b278cfaf3f383
+  metadata.gz: 601af47db687365971e97efd281732ed5effb977d1cd0d451aeda38be1ab27df
+  data.tar.gz: 2d06e9cb9f311d0b427445760a13729df7f8a59b582ed8c536e219137c930a25
 SHA512:
-  metadata.gz: 5ccd8a77077495ec21e40047315d1e97f353978a0812ee87a9c6293505eb4064906651daa9d9a4e9fde6877039284d7fc606cf45815b75922aa682ec00ddce95
-  data.tar.gz: 69aa0ccde8912a548fd5bd57d244c82945c9adc05b6da50939899946bdc98fc8f50a055c477ca3a938d72aed1682d2b92ba355c1f6eabc7fbf47f1a4cfdfcfea
+  metadata.gz: b67d9dcc35b75b0ea64dc482df3f0c2d9e180aa70288b9ebb98f2c58016e08d9eb504a542cfaf2e51e449a40e3dda33f9ed05da992c226f5a0f465dc1805f951
+  data.tar.gz: 3a75ce85122e1d3db1e2dc8dfa5dc7f3c614633f2506353d31cee66a7db2d09d29fe9130030f036885ed8d56fcbea776fdb5ad087251ae75698f8239ebf87e43

data/VERSION

@@ -1 +1 @@
-5.3.2
+5.3.3

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -105,7 +105,7 @@ class QwtfDiscordBotPug # :nodoc:
             next
           end
 
-          user_id = arg[3..-2].to_i
+          user_id = mention_to_user_id(arg)
           display_name = e.display_name_for(user_id) || arg
 
           unless pug.joined?(user_id)
@@ -134,23 +134,53 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :team do |event, *args|
       setup_pug(event) do |e, pug|
+        return send_msg("Which team? E.G. `!team 1`", e.channel) unless args.any?
+
         team_no = args[0].to_i
         return send_msg("Choose a team between 1 and 4", e.channel) unless team_no.between?(1, 4)
 
-        user_id = e.user_id
-        return send_msg("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
+        pug_already_full = pug.full?
 
-        join_pug(e, pug) unless pug.joined?(user_id)
-        pug.join_team(team_no: team_no, player_id: user_id)
+        if args.count == 1
+          user_id = e.user_id
+          return send_msg("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
 
-        send_msg(
-          [
-            "#{e.display_name} joins team #{team_no}",
-            "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
-          ].join(MSG_SNIPPET_DELIMITER), e.channel
-        )
+          join_pug(e, pug) unless pug.joined?(user_id)
+          pug.join_team(team_no: team_no, player_id: user_id)
 
-        start_pug(pug, e) if pug.full?
+          send_msg(
+            [
+              "#{e.display_name} joins team #{team_no}",
+              "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
+            ].join(MSG_SNIPPET_DELIMITER), e.channel
+          )
+        else
+          args[1..-1].each do |mention|
+            unless mention.match(/<@!\d+>/)
+              send_msg("#{arg} isn't a valid mention", e.channel)
+              next
+            end
+
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || arg
+
+            unless pug.joined?(user_id)
+              send_msg("#{display_name} isn't in the PUG", e.channel)
+              next
+            end
+
+            pug.join_team(team_no: team_no, player_id: user_id)
+
+            send_msg(
+              [
+                "#{display_name} joins team #{team_no}",
+                "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
+              ].join(MSG_SNIPPET_DELIMITER), e.channel
+            )
+          end
+        end
+
+        start_pug(pug, e) if !pug_already_full && pug.full?
       end
     end
 
@@ -179,8 +209,8 @@ class QwtfDiscordBotPug # :nodoc:
             memo.merge({ id => e.display_name_for(id) })
           end
 
-          result = winning_team_no.to_i == name.to_i ? 1 : -1
-          teams.merge({ name => { players: players, result: result } })
+        result = winning_team_no.to_i == name.to_i ? 1 : -1
+        teams.merge({ name => { players: players, result: result } })
         end
 
         post_results(
@@ -215,7 +245,7 @@ class QwtfDiscordBotPug # :nodoc:
             memo.merge({ id => e.display_name_for(id) })
           end
 
-          teams.merge({ name => { players: players, result: 0 } })
+        teams.merge({ name => { players: players, result: 0 } })
         end
 
         post_results(
@@ -307,6 +337,10 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
+  def mention_to_user_id(mention)
+    mention[3..-2].to_i
+  end
+
   def join_pug(e, pug)
     pug.join(e.user_id)
 
@@ -390,7 +424,7 @@ class QwtfDiscordBotPug # :nodoc:
     uri = URI("#{ENV['RATINGS_API_URL']}matches/")
     req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
     req.body = json
-    res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+    Net::HTTP.start(uri.hostname, uri.port) do |http|
       http.request(req)
     end
   end

metadata

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