qwtf_discord_bot 5.3.5 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e4ea9a3df5bcc8c8cb14ba1d22a0708bdf8c4a994531d4c06fb8bbc75b33410
-  data.tar.gz: 1568efc1c854b8d4d43d60fd0caa48b0e52e4b09ca04336b6b8c1969090fb146
+  metadata.gz: a0ecc26e71f4325677ded724c87d1f3496d1207d2cbd662146c09caba5c0d397
+  data.tar.gz: 3b5392f1a58fbbad660b17f2d88f8f8d29220e637069a353745963fc264ad0f4
 SHA512:
-  metadata.gz: 50d22f311c0c29ce8df6f1a9c473559812a60d7602f79aa2a9976ffec4a44b6e2f096d6c7c7ac45d390569854393ea14b4ca2afa7f6b7213ba093330221bf48e
-  data.tar.gz: cb34ac9dd1c0f5ff46c09700c1998c8e0cae344cc4b0944a40e2c8fad25bb46cfe3db8ab202e0079f20d982d1dfe74382cf01efe152484abc7f652a83008316f
+  metadata.gz: 45a536a9334a9caf56358b0b66aeffcdf9fc419e57e5ef09b33e0994b510e398bbeed76c9ba61d7513cc22dd4c3ebeca9c34e33de20aa70b8c5c340ae46c29d3
+  data.tar.gz: '018d569f3f282455e0e22cf73dac28f4dfb716242911a4130a7edefe41d598709da09d05efd086de5c41078eceb7ca8a4130f124926118f359480094c73b9015'

data/VERSION

@@ -1 +1 @@
-5.3.5
+5.4.2

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -13,12 +13,24 @@ class QwtfDiscordBotPug # :nodoc:
       token: QwtfDiscordBot.config.token,
       client_id: QwtfDiscordBot.config.client_id,
       help_command: false,
-      prefix: '!'
+      prefix: proc do |message|
+        match = /^\!(\w+)(.*)/.match(message.content)
+        if match
+          first = match[1]
+          rest = match[2]
+          # Return the modified string with the first word lowercase:
+          "#{first.downcase}#{rest}"
+        end
+      end
     )
 
+    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)
+        return send_embedded_message("You've already joined", e.channel) if pug.joined?(e.user_id)
 
         join_pug(e, pug)
         start_pug(pug, e) if pug.full?
@@ -27,9 +39,9 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :status do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+        return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
 
-        send_msg(
+        send_embedded_message(
           [
             "#{pug.player_slots} joined",
             "Map: #{pug.game_map}",
@@ -42,15 +54,15 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :teamsize do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("Team size is #{pug.teamsize}", e.channel) unless args.any?
+        return send_embedded_message("Team size is #{pug.teamsize}", e.channel) unless args.any?
 
         new_teamsize = args[0].to_i
-        return send_msg('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
+        return send_embedded_message('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
 
         if new_teamsize
           pug.teamsize = new_teamsize
 
-          send_msg(
+          send_embedded_message(
             [
               "Team size set to #{pug.teamsize}",
               "#{pug.player_slots} joined"
@@ -60,7 +72,7 @@ class QwtfDiscordBotPug # :nodoc:
 
           start_pug(pug, e) if pug.full?
         else
-          send_msg(
+          send_embedded_message(
             [
               "Current team size is #{pug.teamsize}",
               "#{pug.player_slots} joined"
@@ -73,8 +85,8 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :leave do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
-        return send_msg("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
 
         pug.leave(e.user_id)
 
@@ -85,7 +97,7 @@ class QwtfDiscordBotPug # :nodoc:
 
         snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
-        send_msg(
+        send_embedded_message(
           snippets.join(MSG_SNIPPET_DELIMITER),
           e.channel
         )
@@ -96,12 +108,12 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :kick do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg("Kick who? e.g. `!kick @#{e.display_name}`", e.channel) unless args.any?
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message("Kick who? e.g. `!kick @#{e.display_name}`", e.channel) unless args.any?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         args.each do |arg|
           unless arg.match(/<@!\d+>/)
-            send_msg("#{arg} isn't a valid mention", e.channel)
+            send_embedded_message("#{arg} isn't a valid mention", e.channel)
             next
           end
 
@@ -109,7 +121,7 @@ class QwtfDiscordBotPug # :nodoc:
           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)
+            send_embedded_message("#{display_name} isn't in the PUG", e.channel)
             next
           end
 
@@ -122,7 +134,7 @@ class QwtfDiscordBotPug # :nodoc:
 
           snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
-          send_msg(
+          send_embedded_message(
             snippets.join(MSG_SNIPPET_DELIMITER),
             e.channel
           )
@@ -134,21 +146,20 @@ 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 0 and 4", e.channel) unless team_no.between?(0, 4)
+        return send_embedded_message("Which team? E.G. `!team 1`", e.channel) unless args.any?
+        return send_embedded_message("Choose a team between 0 and 2", e.channel) unless ["0", "1", "2"].any?(args.first)
 
+        team_no = args.first.to_i
         pug_already_full = pug.full?
 
         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)
+          return send_embedded_message("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
 
           join_pug(e, pug) unless pug.joined?(user_id)
           pug.join_team(team_no: team_no, player_id: user_id)
 
-          send_msg(
+          send_embedded_message(
             [
               "#{e.display_name} joins team #{team_no}",
               "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
@@ -157,7 +168,7 @@ class QwtfDiscordBotPug # :nodoc:
         else
           args[1..-1].each do |mention|
             unless mention.match(/<@!\d+>/)
-              send_msg("#{arg} isn't a valid mention", e.channel)
+              send_embedded_message("#{arg} isn't a valid mention", e.channel)
               next
             end
 
@@ -165,13 +176,13 @@ class QwtfDiscordBotPug # :nodoc:
             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)
+              send_embedded_message("#{display_name} isn't in the PUG", e.channel)
               next
             end
 
             pug.join_team(team_no: team_no, player_id: user_id)
 
-            send_msg(
+            send_embedded_message(
               [
                 "#{display_name} joins team #{team_no}",
                 "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
@@ -187,26 +198,30 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :unteam do |event, *args|
       setup_pug(event) do |e, pug|
         user_id = e.user_id
-        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
-        return send_msg("You aren't in this PUG", e.channel) unless pug.joined?(user_id)
-        return send_msg("You aren't in a team", e.channel) if pug.team(0).include?(user_id)
+        return send_embedded_message('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+        return send_embedded_message("You aren't in this PUG", e.channel) unless pug.joined?(user_id)
+        return send_embedded_message("You aren't in a team", e.channel) if pug.team(0).include?(user_id)
 
         pug.join_team(team_no: 0, player_id: user_id)
-        send_msg("#{e.display_name} has no team", e.channel)
+        send_embedded_message("#{e.display_name} has no team", e.channel)
       end
     end
 
     bot.command :win do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         winning_team_no = args[0]
 
-        return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
+        return send_embedded_message("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_embedded_message(
+            "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 +234,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
         )
@@ -234,17 +253,21 @@ class QwtfDiscordBotPug # :nodoc:
         #   e.display_name_for(player_id)
         # end
 
-        send_msg("Team #{winning_team_no} wins", e.channel)
+        send_embedded_message("Team #{winning_team_no} wins", e.channel)
       end
     end
 
     bot.command :draw do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(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_embedded_message(
+            "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,18 +279,22 @@ 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
         )
 
-        send_msg("Match drawn", e.channel)
+        send_embedded_message("Match drawn", e.channel)
       end
     end
 
     bot.command :end do |event, *args|
       setup_pug(event) do |e, pug|
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         end_pug(pug, e.channel)
       end
@@ -276,47 +303,47 @@ class QwtfDiscordBotPug # :nodoc:
     bot.command :addmap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_msg("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
+        return send_embedded_message("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
 
         pug.add_maps(maps)
-        send_msg("#{maps.join(', ')} added to maps", e.channel)
+        send_embedded_message("#{maps.join(', ')} added to maps", e.channel)
       end
     end
 
     bot.command :removemap do |event, *args|
       setup_pug(event) do |e, pug|
         maps = args
-        return send_msg("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
+        return send_embedded_message("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
 
         pug.remove_maps(maps)
-        send_msg("#{maps.join(', ')} removed from maps", e.channel)
+        send_embedded_message("#{maps.join(', ')} removed from maps", e.channel)
       end
     end
 
     bot.command :maps do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
+        return send_embedded_message('No maps have been added. `!addmap`', e.channel) unless maps.any?
 
-        send_msg(maps.join(', '), e.channel)
+        send_embedded_message(maps.join(', '), e.channel)
       end
     end
 
     bot.command :map do |event, *args|
       setup_pug(event) do |e, pug|
         maps = pug.maps
-        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
-        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_embedded_message('No maps have been added. `!addmap`', e.channel) unless maps.any?
+        return send_embedded_message(no_active_pug_message, e.channel) unless pug.active?
 
         if args.empty?
-          return send_msg('No map has been set for the current PUG', e.channel) unless pug.game_map
-          send_msg("Current map is #{pug.game_map}", e.channel)
+          return send_embedded_message('No map has been set for the current PUG', e.channel) unless pug.game_map
+          send_embedded_message("Current map is #{pug.game_map}", e.channel)
         else
           game_map = args.first
-          return send_msg("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
+          return send_embedded_message("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
 
           pug.game_map = game_map
-          send_msg("Map set to #{game_map}", e.channel)
+          send_embedded_message("Map set to #{game_map}", e.channel)
         end
       end
     end
@@ -332,7 +359,7 @@ class QwtfDiscordBotPug # :nodoc:
                 "Notification role set to #{roles}"
               end
 
-        send_msg(msg, e.channel)
+        send_embedded_message(msg, e.channel)
       end
     end
 
@@ -355,7 +382,7 @@ class QwtfDiscordBotPug # :nodoc:
       snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
     end
 
-    send_msg(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
+    send_embedded_message(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
   end
 
   def setup_pug(event)
@@ -366,6 +393,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)
@@ -383,7 +420,7 @@ class QwtfDiscordBotPug # :nodoc:
       pug_teams
     ].join("\n")
 
-    send_msg(msg, event.channel)
+    send_embedded_message(msg, event.channel)
   end
 
   def pug_teams_message(pug, event)
@@ -413,15 +450,17 @@ class QwtfDiscordBotPug # :nodoc:
 
   def end_pug(pug, channel_id)
     pug.end_pug
-    send_msg('PUG ended', channel_id)
+    send_embedded_message('PUG ended', channel_id)
   end
 
   def no_active_pug_message
     "There's no active PUG"
   end
 
-  def send_msg(message, channel)
-    channel.send_message(message) && puts(message)
+  def send_embedded_message(message, channel)
+    embed = Discordrb::Webhooks::Embed.new
+    embed.description = message
+    channel.send_embed(nil, embed) && puts(message)
   end
 
   def post_results(json)
@@ -432,4 +471,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.5
+  version: 5.4.2
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb