qwtf_discord_bot 5.3.3 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 601af47db687365971e97efd281732ed5effb977d1cd0d451aeda38be1ab27df
-  data.tar.gz: 2d06e9cb9f311d0b427445760a13729df7f8a59b582ed8c536e219137c930a25
+  metadata.gz: 483a4220fb3dd783224fad769534ecb77812428dfb75dd070ce5a2299d50a6c0
+  data.tar.gz: 7fb143e346b0afa23f0af56d1282309d560855c41d302016514e434f01839445
 SHA512:
-  metadata.gz: b67d9dcc35b75b0ea64dc482df3f0c2d9e180aa70288b9ebb98f2c58016e08d9eb504a542cfaf2e51e449a40e3dda33f9ed05da992c226f5a0f465dc1805f951
-  data.tar.gz: 3a75ce85122e1d3db1e2dc8dfa5dc7f3c614633f2506353d31cee66a7db2d09d29fe9130030f036885ed8d56fcbea776fdb5ad087251ae75698f8239ebf87e43
+  metadata.gz: 75f5981bfa1c28dea2d79011de86ac2bf5610ae7791e147b85fb1f1819d2a332098b06695d689944d400880ac8d54469f2a153508310613d5a1ea1125b790d6e
+  data.tar.gz: def0724c06d819f0ffcdf49f2447562c261d48b0d2875c091df9b4f47500af28411b9aa62e62f924d1a57f1f71d3345b8634ba65d8935f64a5ca591335f60383

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.3
+5.4.0

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)
@@ -137,7 +141,7 @@ class QwtfDiscordBotPug # :nodoc:
         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)
 
         pug_already_full = pug.full?
 
@@ -204,20 +208,30 @@ 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
 
-        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(
           {
             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
         )
@@ -240,7 +254,13 @@ 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
@@ -252,7 +272,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
         )
@@ -362,6 +386,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)
@@ -428,4 +462,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.3
+  version: 5.4.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb