qwtf_discord_bot 6.2.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bfa9a0b1f5ad3c3206d216e1e266d2749e081c6dc3c58e77994ec997f64fe2f
-  data.tar.gz: 215a86a21d79da634525e031ad7408ad0f1c2b3ee2eced49ec2dc9f7dfffd8f1
+  metadata.gz: 830dfa1fe17a37277449dc28e03d087e19549ac32ef73c89a3ac21ec1f9df8f0
+  data.tar.gz: e7ff2a206436df599927ceee87d5f6e6e25015d671325c2c7fb5ed943a36d9db
 SHA512:
-  metadata.gz: b206b70ee1b67653022619909db86705c05f08006cc712179d00ec30b556fb64ea901f164395c7f8ad35649bf5c67a082f858d46b50fae4c4ee690be5b194ae6
-  data.tar.gz: 8174cd63f0589c839a2a47509d8de220d7ef8b96c82fec9b38501a4bdac56000767c0425a8b55c10d858e8c5b0d919f8a7763a680775316ae1ef286818b6380a
+  metadata.gz: 8adc188312e8ffa68713eaa010d29774ddb10ec3a82f3f2bb81f5f8871cb8cf39ab8c35f2d45b4c581c7efacba4c749b40660b33ac5978c864bf6446e0b03cde
+  data.tar.gz: be5af4763b77e9f94f4fd27f9a40bbc36750ffe1f13883979fa150d6bdb65fd2539b4b6d095887b6d2a50dc83fa7f476b377290d7a87dfd3e44301a5525cc214

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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (6.2.0)
+    qwtf_discord_bot (6.3.1)
       activesupport (~> 6.1)
       discordrb (= 3.4.0)
       redis (~> 4.2)

data/VERSION

@@ -1 +1 @@
-6.2.0
+6.3.1

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/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -117,7 +117,6 @@ class QwtfDiscordBotPug # :nodoc:
             pug.maxplayers
           ].join("/")
 
-
           send_embedded_message(
             message: message,
             description: [errors, description.join(MSG_SNIPPET_DELIMITER)].join("\n"),
@@ -825,7 +824,23 @@ class QwtfDiscordBotPug # :nodoc:
         ) && nil
       end
     else
-      teams = combinations.sample
+      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
@@ -881,49 +896,17 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
-    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 = "`!choose`, `!shuffle` or `!team` up. #{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)
@@ -961,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|
+    is_https = uri.scheme == "https"
+
+    Net::HTTP.start(uri.hostname, uri.port, use_ssl: is_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|
+    is_https = uri.scheme == "https"
+
+    res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: is_https) do |http|
       http.request(req)
     end
 
@@ -988,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb