qwtf_discord_bot 5.3.6 → 5.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45dcf6ff7c764cda796f9048dde0184423bab3f0a45b6bd3d58341876435d6bc
-  data.tar.gz: f8e192337a8247a1fde818d5b1d53922d350734708ecaa0e1cf36865d1b3caff
+  metadata.gz: bb40c561739b201a25554221a3b07ff74da6ef621121a8032cf7ff0638e8040d
+  data.tar.gz: 3215cfed66032d0e0f96689b885d427f9529b55cf07934dc9c8606ba76d467b4
 SHA512:
-  metadata.gz: 0db6a8a62cbc130860904b63d169b4942b5264643fa507ee566dd3abddee682b1182b920eb1a06c83b044edebf5879cc88587dd94c1b520b5a9054608c072647
-  data.tar.gz: 62de3a2ef18d87b20c4804e9c311663d043b6c32d9aa9209ef63a94fa870cc1a589b27027613e44f319cf4ed1e1de8dc76a980cf0bcc1cc433c306454cb440fc
+  metadata.gz: 2cc6e47321572b0459ef66a518631df912ac96726b4a62c7f508c174236a756c65b8c6898757a61b0c5854b145907e6d9b9e525db8df972ddd520b492512bed2
+  data.tar.gz: f8a5aff8a87cb70a32438199e5b85aa0388f5ef3918ed7f5b578d3241f199e354e799eac6cadb7a81075a799f9a42ac724152d3e783fc98a5dee0924c32b3866

data/VERSION

@@ -1 +1 @@
-5.3.6
+5.4.3

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,25 +198,25 @@ 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?
 
         if pug.actual_teams.count < 2
-          return send_msg(
+          return send_embedded_message(
             "There must be at least two teams with players to submit a result", e.channel
           )
         end
@@ -232,26 +243,16 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        # winning_team = pug.team(winning_team_no).map do |player_id|
-        #   e.display_name_for(player_id)
-        # end
-
-        # non_winning_teams = pug.actual_teams.tap { |team| team.delete(winning_team_no) }
-
-        # losing_players = non_winning_teams.values.flatten.map do |player_id|
-        #   e.display_name_for(player_id)
-        # end
-
-        send_msg("Team #{winning_team_no} wins", e.channel)
+        send_embedded_message("Team #{winning_team_no} wins. [Ratings](http://ratings.fortressone.org)", 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?
 
         if pug.actual_teams.count < 2
-          return send_msg(
+          return send_embedded_message(
             "There must be at least two teams with players to submit a result", e.channel
           )
         end
@@ -277,13 +278,13 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         )
 
-        send_msg("Match drawn", e.channel)
+        send_embedded_message("Match drawn. [Ratings](http://ratings.fortressone.org)", 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
@@ -292,47 +293,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
@@ -348,7 +349,7 @@ class QwtfDiscordBotPug # :nodoc:
                 "Notification role set to #{roles}"
               end
 
-        send_msg(msg, e.channel)
+        send_embedded_message(msg, e.channel)
       end
     end
 
@@ -371,7 +372,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)
@@ -382,6 +383,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)
@@ -399,7 +410,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)
@@ -429,15 +440,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)
@@ -448,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.6
+  version: 5.4.3
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-10 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb