qwtf_discord_bot 5.3.4 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287ada88fe7e7e8db0a61816eb5872adf7aa51aae6ceed90d55e446d42222484
-  data.tar.gz: 44b89de85fea1a429a14418d3fd0d5b3aabc7dec291502176a9ab16d5de45d69
+  metadata.gz: a1d4b0223feae05745b7050dc8dc25193136bac78bee3fca74818559dad0dd7c
+  data.tar.gz: 8a7b7a27d72b759ffa4111bdf85f73c0effae38c4db7c8164f5abca357912dd1
 SHA512:
-  metadata.gz: 3a3ea4bf9ef15c27795e60610a981948487eb626f65edd34eca71da52b3752f9134574598695ffe870046e9ea4f59e8feaa360ac76bdf3a3abe4a043c5bdcaec
-  data.tar.gz: d06a5a2efacdee2ee0ba62e180d9ee82dcacabc469828459619dc15174851b78aa726fcb35f56c0114eb843afeb83c3f15a2ff4c1c7a74684d3683394ffac746
+  metadata.gz: b621a49eefc9ab5c83c93e771a00d609aa72be3b675e627aa9f502cd1646832e4cd892e67b0864bdea9a9dbcaf9f0b691a6f3df71f852179d21a28d760312c28
+  data.tar.gz: 91ce0148eeb1a80d127bb722204153031087eb88b8460b64fab9004d834e0f96615bf605f35d3ef06a8df17ed23fdf4d863c1cbd0b2231070beb23e9b2b52dd7

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.4
+5.4.1

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -16,6 +16,10 @@ class QwtfDiscordBotPug # :nodoc:
       prefix: '!'
     )
 
+    bot.command :help do |event, *args|
+      "Pug commands: `!status`, `!join`, `!team <team_no>`, `!unteam`, `!leave`, `!kick <@player>`, `!win <team_no>`, `!draw`, `!end`, `!teamsize <no_of_players>`, `!addmap <map_name>`, `!removemap <map_name>`, `!maps`, `!map <map_name>`, `!notify <@role>`"
+    end
+
     bot.command :join do |event, *args|
       setup_pug(event) do |e, pug|
         return send_msg("You've already joined", e.channel) if pug.joined?(e.user_id)
@@ -135,10 +139,9 @@ 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?
+        return send_msg("Choose a team between 0 and 2", e.channel) unless ["0", "1", "2"].any?(args.first)
 
-        team_no = args[0].to_i
-        return send_msg("Choose a team between 0 and 4", e.channel) unless team_no.between?(0, 4)
-
+        team_no = args.first.to_i
         pug_already_full = pug.full?
 
         if args.count == 1
@@ -204,9 +207,13 @@ class QwtfDiscordBotPug # :nodoc:
 
         return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
 
-        actual_teams = pug.teams.reject! { |k| k == "0" }
+        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 = actual_teams.inject({}) do |teams, (name, player_ids)|
+        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
@@ -219,7 +226,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
         )
@@ -242,9 +253,13 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        actual_teams = pug.teams.reject! { |k| k == "0" }
+        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 = actual_teams.inject({}) do |teams, (name, player_ids)|
+        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
@@ -256,7 +271,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
         )
@@ -366,6 +385,16 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
+    if !pug.actual_teams.any?
+      teams = get_fair_teams(pug.joined_players)
+
+      teams.each do |team_no, player_ids|
+        player_ids.each do |player_id|
+          pug.join_team(team_no: team_no, player_id: player_id)
+        end
+      end
+    end
+
     pug_teams = pug.teams.map do |team_no, player_ids|
       team_mentions = player_ids.map do |player_id|
         event.mention_for(player_id)
@@ -432,4 +461,15 @@ class QwtfDiscordBotPug # :nodoc:
       http.request(req)
     end
   end
+
+  def get_fair_teams(players)
+    uri = URI("#{ENV['RATINGS_API_URL']}fair_teams/new")
+    params = { 'players[]' => players }
+    uri.query = URI.encode_www_form(params)
+    req = Net::HTTP::Get.new(uri)
+    res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+      http.request(req)
+    end
+    JSON.parse(res.body).first.to_h
+  end
 end

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -7,6 +7,10 @@ class QwtfDiscordBotServer
       prefix: '!'
     )
 
+    bot.command :help do |event, *args|
+      "Server commands: `!active`, `!all`, `!server <address>`"
+    end
+
     bot.command :server do |event, *args|
       if args.empty?
         message = 'Provide a server address e.g. `!server ' \

metadata

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