qwtf_discord_bot 5.3.1 → 5.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020c98479af02b628d8218cb1fdc1225d8b8d38f942b3343504189f6f86af623
-  data.tar.gz: 9bdcf614b0783cda3b7e5377a0fc51d808fcc3db4272e4f8a2c315099c40f62b
+  metadata.gz: 45dcf6ff7c764cda796f9048dde0184423bab3f0a45b6bd3d58341876435d6bc
+  data.tar.gz: f8e192337a8247a1fde818d5b1d53922d350734708ecaa0e1cf36865d1b3caff
 SHA512:
-  metadata.gz: 20cdff7ed5d1d17e45b2b79c6b7f68d4a6c8161d086722dd827126f552abded756c0ead3ebd8622452f329eb2840148eff3e503e6cfa111274d09f0eeba2d145
-  data.tar.gz: f9badce721eb64aa4812eb1ae139c2f18cc809c6e20803b67f29cc081dd563374bf452b74ab58bfc6c68badde07dacd6dac0bb50ea0a5dd56610fe7c75761760
+  metadata.gz: 0db6a8a62cbc130860904b63d169b4942b5264643fa507ee566dd3abddee682b1182b920eb1a06c83b044edebf5879cc88587dd94c1b520b5a9054608c072647
+  data.tar.gz: 62de3a2ef18d87b20c4804e9c311663d043b6c32d9aa9209ef63a94fa870cc1a589b27027613e44f319cf4ed1e1de8dc76a980cf0bcc1cc433c306454cb440fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.1.12)
+    qwtf_discord_bot (5.3.5)
       discordrb (~> 3.3)
       redis (~> 4.1)
       thor (~> 0.20)

data/VERSION

@@ -1 +1 @@
-5.3.1
+5.3.6

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)
+        return send_msg("Choose a team between 0 and 4", e.channel) unless team_no.between?(0, 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
 
@@ -174,7 +204,13 @@ class QwtfDiscordBotPug # :nodoc:
 
         return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
 
-        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
+        if pug.actual_teams.count < 2
+          return send_msg(
+            "There must be at least two teams with players to submit a result", e.channel
+          )
+        end
+
+        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
           end
@@ -187,7 +223,11 @@ class QwtfDiscordBotPug # :nodoc:
           {
             match: {
               map: pug.game_map,
-              teams: team_results
+              teams: team_results,
+              discord_channel: {
+                channel_id: e.channel_id,
+                name: "#{e.channel.server.name} ##{e.channel.name}"
+              }
             }
           }.to_json
         )
@@ -210,19 +250,29 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
+        if pug.actual_teams.count < 2
+          return send_msg(
+            "There must be at least two teams with players to submit a result", e.channel
+          )
+        end
+
+        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             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(
           {
             match: {
               map: pug.game_map,
-              teams: team_results
+              teams: team_results,
+              discord_channel: {
+                channel_id: e.channel_id,
+                name: "#{e.channel.server.name} ##{e.channel.name}"
+              }
             }
           }.to_json
         )
@@ -307,6 +357,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 +444,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.1
+  version: 5.3.6
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb