qwtf_discord_bot 5.3.0 → 5.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd211cda52ba5e8319f7c4cc1466abf47112c8d46b13180d8b89a09a1a2ca68
-  data.tar.gz: df7bd13a55e52d63128fceeaf07f3ea8c9237471480bbb6cb3e967e73c20babf
+  metadata.gz: 1e4ea9a3df5bcc8c8cb14ba1d22a0708bdf8c4a994531d4c06fb8bbc75b33410
+  data.tar.gz: 1568efc1c854b8d4d43d60fd0caa48b0e52e4b09ca04336b6b8c1969090fb146
 SHA512:
-  metadata.gz: 0b4a3e1df6ff63f47b167c959570d6d994d92fdc52bdf35b36a70734a09afe3b1caa20b2181b366bea83050c25ca1f3d748b1bf52cc93dfc26e5afd7c6d82150
-  data.tar.gz: 2974c3a18e557b7788fc75af370a781b43a50eafe85c47740b9298276c79fa33f7e260fc196e5e53eef4fca72a62b8ef19d7607397532469c15e4d8f7f6da911
+  metadata.gz: 50d22f311c0c29ce8df6f1a9c473559812a60d7602f79aa2a9976ffec4a44b6e2f096d6c7c7ac45d390569854393ea14b4ca2afa7f6b7213ba093330221bf48e
+  data.tar.gz: cb34ac9dd1c0f5ff46c09700c1998c8e0cae344cc4b0944a40e2c8fad25bb46cfe3db8ab202e0079f20d982d1dfe74382cf01efe152484abc7f652a83008316f

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.0
+5.3.5

data/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis
-      - RATINGS_API_URL=http://ratings.fortressone.org/api/v1/
+      - RATINGS_API_URL
     volumes:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"

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,11 +204,13 @@ class QwtfDiscordBotPug # :nodoc:
 
         return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
 
-        players = pug.joined_players.inject({}) do |memo, id|
-          memo.merge({ id => e.display_name_for(id) })
-        end
+        actual_teams = pug.teams.reject { |k| k == "0" }
+
+        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+          players = player_ids.inject({}) do |memo, id|
+            memo.merge({ id => e.display_name_for(id) })
+          end
 
-        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
           result = winning_team_no.to_i == name.to_i ? 1 : -1
           teams.merge({ name => { players: players, result: result } })
         end
@@ -210,12 +242,14 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        players = pug.joined_players.inject({}) do |memo, id|
-          memo.merge({ id => e.display_name_for(id) })
-        end
+        actual_teams = pug.teams.reject! { |k| k == "0" }
+
+        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+          players = player_ids.inject({}) do |memo, id|
+            memo.merge({ id => e.display_name_for(id) })
+          end
 
-        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
-          teams.merge({ name => { players: players, result: 0 } })
+        teams.merge({ name => { players: players, result: 0 } })
         end
 
         post_results(
@@ -307,6 +341,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 +428,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.0
+  version: 5.3.5
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb