qwtf_discord_bot 6.1.5 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b502dce9e5188d2ac6cb3695ff9f9af13953fc8ad97b3d7aaafaa8802df788c1
-  data.tar.gz: 0fa775500df5d9cf58f05600a89a82ff09a6764d1cdf9f9bbd5a0f22a3486dbd
+  metadata.gz: 5080bf7689a79bfcaf97063a08ccf320ae2f0e4ecac5893942fdbd5ad57c30e1
+  data.tar.gz: ece59c6ebdd427edcf5696869253a28f9e0f9314b81acc6f30dfc5c03fc54ee2
 SHA512:
-  metadata.gz: 4e4e48deace1b6f3565de55f1da7ccc611198bfe1ed231161948c801a6d4b9b592ffa0163a523b473dcb10199b6f34fab74b022fe3898ffdad7c6b4c1a42da4f
-  data.tar.gz: eedf346d74132c50aa36b37caa40f82e140e6bcaa28e5dac980a07312d56f9c20d5fd937fb95db2ea8218a74702585bdeb30ce141e11d0f67e3ebbae8d106128
+  metadata.gz: ece71fc54296e11cb5fff3a25be24d279822aaebd4220fa88ab9e0fa15dc3c55eb53b9bc4dd786f783f59a9f280ef72553bafc74b111bb06b435c0cd8048e84d
+  data.tar.gz: 11ba983d2cc5d68098c6cadfda0ec45f9e94b8d8b956b4e5ee67f0a0cfb74c3be4cc1f597a11a8cb5e5b6c00a7cd39282e5518647789151754ee394ae5ff3e9e

data/.env.example

@@ -1,2 +1,2 @@
-export RATINGS_API_URL=http://ratings.fortressone.org/api/v1
-export RATINGS_APP_URL=http://ratings.fortressone.org
+export RESULTS_API_URL="https://fortressone.org/results/api/v1"
+export RESULTS_APP_URL="https://fortressone.org/results"

data/Gemfile

@@ -6,9 +6,11 @@ gem 'bundler'
 gem 'discordrb', '3.4.0'
 gem 'redis'
 gem 'thor'
+gem 'activesupport'
 
 group :development do
   gem 'pry'
+  gem 'dotenv'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (6.1.4)
+    qwtf_discord_bot (6.3.0)
+      activesupport (~> 6.1)
       discordrb (= 3.4.0)
       redis (~> 4.2)
       thor (~> 1.1)
@@ -28,6 +29,7 @@ GEM
       rest-client (>= 2.1.0.rc1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
     event_emitter (0.2.6)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
@@ -83,8 +85,10 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activesupport
   bundler
   discordrb (= 3.4.0)
+  dotenv
   factory_bot
   pry
   qwtf_discord_bot!

data/README.md

@@ -105,6 +105,7 @@ This responds to discord messages:
   - `!maps`
   - `!map [map_name]`
   - `!choose [n]`
+  - `!shuffle`
   - `!win <team_no>`
   - `!draw`
   - `!notify <@role>`

data/VERSION

@@ -1 +1 @@
-6.1.5
+6.3.0

data/docker-compose.yml

@@ -34,8 +34,8 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis
-      - RATINGS_API_URL
-      - RATINGS_APP_URL
+      - RESULTS_API_URL
+      - RESULTS_APP_URL
     volumes:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"
@@ -48,7 +48,7 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis
-      - RATINGS_API_URL
+      - RESULTS_API_URL
     volumes:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"

data/exe/qwtf_discord_bot

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'dotenv/load'
 require 'qwtf_discord_bot'
 require 'thor'
 require 'pry'

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -2,6 +2,7 @@
 
 require 'pug'
 require 'event_decorator'
+require 'active_support/core_ext/array/conversions'
 
 class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
@@ -11,6 +12,28 @@ class QwtfDiscordBotPug # :nodoc:
   TEN_MINUTES = 10 * 60
   VALID_MENTION = /<@!?\d+>/
 
+  COMMANDS = <<~MESSAGE
+    `!status` Shows who has joined
+    `!join [@player1] [@player2]` Join PUG. Can also join other players
+    `!leave` Leave PUG
+    `!kick <@player> [@player2]` Kick one or more other players
+    `!team <team_no> [@player1] [@player2]` Join team
+    `!unteam [@player1] [@player2]` Leave team and go to front of queue
+    `!choose [n]` Choose fair teams. Pass number for nth fairest team
+    `!shuffle` Choose random teams.
+    `!win <team_no>` Report winning team
+    `!draw` Report draw
+    `!end` End PUG. Kicks all players
+    `!teamsize <no_of_players>` Set number of players in a team
+    `!addmap <map_name>` Add map to map list
+    `!removemap <map_name>` Remove map from map list
+    `!maps` Show map list
+    `!map [map_name]` Show or set map
+    `!notify <@role>` Set @role for alerts
+  MESSAGE
+
+  HELP = { commands: COMMANDS, footer: "!command <required> [optional]" }
+
   def run
     bot = Discordrb::Commands::CommandBot.new(
       token: QwtfDiscordBot.config.token,
@@ -28,19 +51,79 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :help do |event, *args|
-      "Pug commands: `!status`, `!join`, `!team <team_no> [@player1] [@player2]`, `!unteam`, `!leave`, `!kick <@player>`, `!win <team_no>`, `!draw`, `!end`, `!teamsize <no_of_players>`, `!addmap <map_name>`, `!removemap <map_name>`, `!maps`, `!map [map_name]`, `!choose [n]`, `!notify <@role>`"
+      send_embedded_message(
+        description: HELP[:commands],
+        channel: event.channel
+      ) do |embed|
+        embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+          text: HELP[:footer]
+        )
+      end
     end
 
     bot.command :join do |event, *args|
       setup_pug(event) do |e, pug|
-        if pug.joined?(e.user_id)
-          return send_embedded_message(
-            description: "You've already joined",
+        if args.empty?
+          if pug.joined?(e.user_id)
+            return send_embedded_message(
+              description: "You've already joined",
+              channel: e.channel
+            )
+          end
+
+          join_pug(e, pug)
+        else
+          errors = []
+          joiners = []
+
+          args.each do |mention|
+            if !mention.match(VALID_MENTION)
+              errors << "#{mention} isn't a valid mention"
+              next
+            end
+
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || mention
+
+            if pug.joined?(user_id)
+              errors << "#{display_name} is already in this PUG"
+              next
+            end
+
+            pug.join(user_id)
+            joiners << display_name
+          end
+
+          message = ""
+          description = []
+
+          if pug.total_player_count == 0
+            message = "#{pug.notify_roles} PUG started"
+            description << "#{e.display_name} creates a PUG"
+          elsif pug.slots_left.between?(1, 3)
+            message = "#{pug.slots_left} more #{pug.notify_roles}"
+          end
+
+          if joiners.any?
+            description << [
+              joiners.to_sentence,
+              joiners.count == 1 ? "joins" : "join",
+              "the PUG"
+            ].join(" ")
+          end
+
+          description << [
+            pug.total_player_count,
+            pug.maxplayers
+          ].join("/")
+
+          send_embedded_message(
+            message: message,
+            description: [errors, description.join(MSG_SNIPPET_DELIMITER)].join("\n"),
             channel: e.channel
           )
         end
 
-        join_pug(e, pug)
         start_pug(pug, e) if pug.has_exactly_maxplayers?
       end
     end
@@ -67,7 +150,21 @@ class QwtfDiscordBotPug # :nodoc:
                       0
                     end
 
-        message_obj = choose_fair_teams(pug: pug, event: e, iteration: iteration)
+        message_obj = choose_teams(pug: pug, event: e, iteration: iteration)
+        status(pug: pug, event: e, message_obj: message_obj) if message_obj
+      end
+    end
+
+    bot.command :shuffle do |event|
+      setup_pug(event) do |e, pug|
+        if !pug.full?
+          return send_embedded_message(
+            description: "Not enough players, reduce !teamsize",
+            channel: event.channel
+          )
+        end
+
+        message_obj = choose_teams(pug: pug, event: e)
         status(pug: pug, event: e, message_obj: message_obj) if message_obj
       end
     end
@@ -171,12 +268,12 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        errors = []
+        kickees = []
+
         args.each do |mention|
-          unless mention.match(VALID_MENTION)
-            send_embedded_message(
-              description: "#{mention} isn't a valid mention",
-              channel: e.channel
-            )
+          if !mention.match(VALID_MENTION)
+            errors << "#{mention} isn't a valid mention"
             next
           end
 
@@ -184,43 +281,57 @@ class QwtfDiscordBotPug # :nodoc:
           display_name = e.display_name_for(user_id) || mention
 
           unless pug.joined?(user_id)
-            send_embedded_message(
-              description: "#{display_name} isn't in the PUG",
-              channel: e.channel
-            )
+            errors << "#{display_name} isn't in the PUG"
             next
           end
 
           pug.leave(user_id)
 
-          snippets = [
-            "#{display_name} is kicked from the PUG",
-            "#{pug.player_slots} remain"
-          ]
+          kickees << display_name
+        end
 
-          message = "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+        message = ""
+        description = []
 
-          send_embedded_message(
-            message: message,
-            description: snippets.join(MSG_SNIPPET_DELIMITER),
-            channel: e.channel
-          )
+        if pug.slots_left == 1
+          message = "#{pug.slots_left} more #{pug.notify_roles}"
+        end
 
-          break end_pug(pug, e.channel) if pug.empty?
+        if kickees.any?
+          description << [
+            kickees.to_sentence,
+            kickees.count == 1 ? "is" : "are",
+            "kicked from the PUG"
+          ].join(" ")
         end
+
+        description << [
+          [pug.total_player_count, pug.maxplayers].join("/"),
+          "remain"
+        ].join(" ")
+
+        description = [errors, description.join(MSG_SNIPPET_DELIMITER)].join("\n")
+
+        send_embedded_message(
+          message: message,
+          description: description,
+          channel: e.channel
+        )
+
+        end_pug(pug, e.channel) if pug.empty?
       end
     end
 
     bot.command :team do |event, *args|
       setup_pug(event) do |e, pug|
-        unless args.any?
+        if args.empty?
           return send_embedded_message(
             description: "Which team? E.G. `!team 1`",
             channel: e.channel
           )
         end
 
-        unless ["1", "2"].any?(args.first)
+        if ["1", "2"].none?(args.first)
           return send_embedded_message(
             description: "Choose `!team 1`, `!team 2`, or `!unteam` to leave team",
             channel: e.channel
@@ -250,12 +361,12 @@ class QwtfDiscordBotPug # :nodoc:
             channel: e.channel
           )
         else
+          errors = []
+          teamers = []
+
           args[1..-1].each do |mention|
-            unless mention.match(VALID_MENTION)
-              send_embedded_message(
-                description: "#{mention} isn't a valid mention",
-                channel: e.channel
-              )
+            if !mention.match(VALID_MENTION)
+              errors << "#{mention} isn't a valid mention"
               next
             end
 
@@ -263,14 +374,25 @@ class QwtfDiscordBotPug # :nodoc:
             display_name = e.display_name_for(user_id) || mention
             pug.join_team(team_no: team_no, player_id: user_id)
 
-            send_embedded_message(
-              description: [
-                "#{display_name} joins #{TEAM_NAMES[team_no]}",
-                "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
-              ].join(MSG_SNIPPET_DELIMITER),
-              channel: e.channel
-            )
+            teamers << display_name
           end
+
+          description = errors << [
+            [
+              teamers.to_sentence,
+              teamers.count == 1 ? "joins" : "join",
+              TEAM_NAMES[team_no]
+            ].join(" "),
+            [
+              pug.team_player_count(team_no),
+              pug.teamsize
+            ].join("/")
+          ].join(MSG_SNIPPET_DELIMITER)
+
+          send_embedded_message(
+            description: description.join("\n"),
+            channel: e.channel
+          )
         end
 
         start_pug(pug, e) if !pug_already_full && pug.has_exactly_maxplayers?
@@ -281,7 +403,7 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         user_id = e.user_id
 
-        unless pug.active?
+        if !pug.active?
           return send_embedded_message(
             description: 'No PUG has been started. `!join` to create',
             channel: e.channel
@@ -289,7 +411,7 @@ class QwtfDiscordBotPug # :nodoc:
         end
 
         if args.empty?
-          unless pug.joined?(user_id)
+          if !pug.joined?(user_id)
             return send_embedded_message(
               description: "You aren't in this PUG",
               channel: e.channel
@@ -310,32 +432,38 @@ class QwtfDiscordBotPug # :nodoc:
             channel: e.channel
           )
         else
+          errors = []
+          unteamers = []
+
           args.each do |mention|
-            unless mention.match(VALID_MENTION)
-              send_embedded_message(
-                description: "#{mention} isn't a valid mention",
-                channel: e.channel
-              )
+            if !mention.match(VALID_MENTION)
+              errors << "#{mention} isn't a valid mention"
               next
             end
 
             user_id = mention_to_user_id(mention)
             display_name = e.display_name_for(user_id) || mention
 
-            unless pug.joined?(user_id)
-              return send_embedded_message(
-                description: "#{display_name} isn't in this PUG",
-                channel: e.channel
-              )
+            if !pug.joined?(user_id)
+              errors << "#{display_name} isn't in this PUG"
+              next
             end
 
             pug.unteam(user_id)
 
-            send_embedded_message(
-              description: "#{display_name} leaves team",
-              channel: e.channel
-            )
+            unteamers << display_name
           end
+
+          description = errors << [
+            unteamers.to_sentence,
+            unteamers.count == 1 ? "goes" : "go",
+            "into the queue"
+          ].join(" ")
+
+          send_embedded_message(
+            description: description.join("\n"),
+            channel: e.channel
+          )
         end
       end
     end
@@ -417,7 +545,7 @@ class QwtfDiscordBotPug # :nodoc:
         ).body
 
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](#{discord_channel_leaderboard_url(e.channel.id)})",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Results](#{discord_channel_leaderboard_url(e.channel.id)})",
           channel: e.channel
         )
       end
@@ -485,7 +613,7 @@ class QwtfDiscordBotPug # :nodoc:
         ).body
 
         send_embedded_message(
-          description: "Match ##{id} drawn. `!choose` again. [Ratings](#{discord_channel_leaderboard_url(e.channel.id)})",
+          description: "Match ##{id} drawn. `!choose` again. [Results](#{discord_channel_leaderboard_url(e.channel.id)})",
           channel: e.channel
         )
       end
@@ -640,7 +768,7 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def mention_to_user_id(mention)
-    mention[3..-2].to_i
+    mention[/\d+/].to_i
   end
 
   def join_pug(e, pug)
@@ -648,7 +776,7 @@ class QwtfDiscordBotPug # :nodoc:
 
     if pug.total_player_count == 1
       snippets = ["#{e.display_name} creates a PUG", "#{pug.player_slots} joined"]
-      message = pug.notify_roles
+      message = "#{pug.notify_roles} PUG started"
     else
       snippets = ["#{e.display_name} joins the PUG", "#{pug.player_slots} joined"]
       message = "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
@@ -668,7 +796,7 @@ class QwtfDiscordBotPug # :nodoc:
     nil # stop discordrb printing return value
   end
 
-  def choose_fair_teams(pug:, event:, iteration: 0)
+  def choose_teams(pug:, event:, iteration: nil)
     if !pug.full?
       return send_embedded_message(
         description: "Not enough players, reduce !teamsize",
@@ -677,7 +805,7 @@ class QwtfDiscordBotPug # :nodoc:
     end
 
     message_obj = send_embedded_message(
-      description: "Choosing fair teams...",
+      description: "Choosing teams...",
       channel: event.channel
     )
 
@@ -685,14 +813,34 @@ class QwtfDiscordBotPug # :nodoc:
       channel_id: event.channel.id, players: pug.up_now_players
     )
 
-    teams = combinations[iteration]
+    if iteration
+      teams = combinations[iteration]
 
-    if !teams
-      return send_embedded_message(
-        description: "There are only #{combinations.count} possible combinations",
-        channel: event.channel,
-        message_obj: message_obj
-      ) && nil
+      if !teams
+        return send_embedded_message(
+          description: "There are only #{combinations.count} possible combinations",
+          channel: event.channel,
+          message_obj: message_obj
+        ) && nil
+      end
+    else
+      weighted_combinations = combinations.map.with_index do |combination, index|
+        { weight: 1/(index+1.0), combination: combination }
+      end
+
+      total = weighted_combinations.inject(0) do |sum, wt|
+        sum + wt[:weight]
+      end
+
+      chosen_weighted_team_index = rand(0..total)
+      counter = 0.0
+
+      weighted_combination = weighted_combinations.find do |wt|
+        counter += wt[:weight]
+        chosen_weighted_team_index <= counter
+      end
+
+      teams = weighted_combination[:combination]
     end
 
     pug.destroy_teams
@@ -748,51 +896,17 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
-    choose_fair_teams(pug: pug, event: event) unless pug.teams.any?
-
-    footer = [
-      pug.game_map,
-      "#{pug.player_slots} joined",
-    ].compact.join(MSG_SNIPPET_DELIMITER)
-
     mentions = pug.players.map do |player_id|
       event.mention_for(player_id)
     end
 
-    mention_line = "Time to play! #{mentions.join(" ")}"
+    mention_line = mentions.join(" ")
 
     send_embedded_message(
       message: mention_line,
-      channel: event.channel
-    ) do |embed|
-      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
-        text: footer
-      )
-
-      if pug.queued_players.any?
-        queue_display_names = pug.queued_players.map do |player_id|
-          event.display_name_for(player_id)
-        end
-
-        embed.add_field(
-          inline: true,
-          name: "Queue",
-          value: queue_display_names.join("\n")
-        )
-      end
-
-      pug.teams.each do |team_no, player_ids|
-        team_mentions = player_ids.map do |player_id|
-          event.display_name_for(player_id)
-        end
-
-        embed.add_field(
-          inline: true,
-          name: team_name(team_no),
-          value: team_mentions.join("\n")
-        )
-      end
-    end
+      channel: event.channel,
+      description: "Time to play. `!choose`, `!shuffle` or `!team` up."
+    )
   end
 
   def end_pug(pug, channel_id)
@@ -830,22 +944,26 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def post_results(json)
-    uri = URI([ENV['RATINGS_API_URL'], 'matches'].join('/'))
+    uri = URI([ENV['RESULTS_API_URL'], 'matches'].join('/'))
     req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
     req.body = json
 
-    Net::HTTP.start(uri.hostname, uri.port) do |http|
+    https? = uri.scheme == "https"
+
+    Net::HTTP.start(uri.hostname, uri.port, use_ssl: https?) do |http|
       http.request(req)
     end
   end
 
   def get_fair_teams(channel_id:, players:)
-    uri = URI([ENV['RATINGS_API_URL'], 'fair_teams', 'new'].join('/'))
+    uri = URI([ENV['RESULTS_API_URL'], 'fair_teams', 'new'].join('/'))
     params = { :channel_id => channel_id, '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|
+    https? = uri.scheme == "https"
+
+    res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: https?) do |http|
       http.request(req)
     end
 
@@ -857,6 +975,6 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def discord_channel_leaderboard_url(channel_id)
-    [ENV['RATINGS_APP_URL'], "discord_channels", channel_id].join('/')
+    [ENV['RESULTS_APP_URL'], "discord_channels", channel_id].join('/')
   end
 end

data/qwtf_discord_bot.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'discordrb', '3.4.0'
   spec.add_runtime_dependency 'redis', '~> 4.2'
   spec.add_runtime_dependency 'thor', '~>1.1'
+  spec.add_runtime_dependency 'activesupport', '~>6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.3.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email:
 - shayolden@hotmail.com