qwtf_discord_bot 5.5.26 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6d6a935efeff277da0a093cc9cbbca7dd76e33a8d4d8f0bf73664d32f7b766
-  data.tar.gz: c0ab537abc9fbe1c3f133e0eedf076348cbd5d1bad622bcc6e2cbc7a233421f2
+  metadata.gz: 7873dfbc7828ca1970851e98c563be1adfc62cb0f451a4a3f76d5dbc551db8a4
+  data.tar.gz: b34b2f5138fff279ff9ed28f2034058cef15ba3cd95c4c4157d1588dd0664dc3
 SHA512:
-  metadata.gz: ba9d17f6b5b3f5a69e97594135cf1b87463cabcaf55e18dbf1e72e89d6f01d2594f9281042f4fdd0d3f43e3c58c822167094d74c2dfbea87c11f08df67d20702
-  data.tar.gz: a12523817d0bb96dbffbcc2e038a862615412117b53dee96486085836be04ea70a1a3f42fe28e8d1f4a451bd60633d3f416670ab52b43ab0927c5328411cd919
+  metadata.gz: 6bc88b6b480c2a53a8f79a17a1c7202d446d8a068aa1daf0bc9a685ca63c09705450466572ba3fb95a7b7e84360e7e29db41415a74f3e277ea08ae1e61c18b89
+  data.tar.gz: a75c8be77b08ffd148e79c374451e65d31f7b5131e6254f0fa2da434885db24a7ebb1df6e84509c3715a1f46cde7a53dae8d4a326fc367c996c791c81a3926ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.5.25)
+    qwtf_discord_bot (6.0.0)
       discordrb (= 3.4.0)
       redis (~> 4.2)
       thor (~> 1.1)

data/VERSION

@@ -1 +1 @@
-5.5.26
+6.0.1

data/docker-compose.yml

@@ -35,6 +35,7 @@ services:
     environment:
       - REDIS_URL=redis://redis
       - RATINGS_API_URL
+      - RATINGS_APP_URL
     volumes:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -430,7 +430,7 @@ class QwtfDiscordBotPug # :nodoc:
         ).body
 
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](http://ratings.fortressone.org)",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](#{discord_channel_leaderboard_url(e.channel.id)})",
           channel: e.channel
         )
       end
@@ -498,7 +498,7 @@ class QwtfDiscordBotPug # :nodoc:
         ).body
 
         send_embedded_message(
-          description: "Match ##{id} drawn. `!choose` again. [Ratings](http://ratings.fortressone.org)",
+          description: "Match ##{id} drawn. `!choose` again. [Ratings](#{discord_channel_leaderboard_url(e.channel.id)})",
           channel: e.channel
         )
       end
@@ -694,7 +694,10 @@ class QwtfDiscordBotPug # :nodoc:
       channel: event.channel
     )
 
-    combinations = get_fair_teams(pug.joined_players)
+    combinations = get_fair_teams(
+      channel_id: event.channel.id, players: pug.joined_players
+    )
+
     teams = combinations[iteration]
 
     if !teams
@@ -814,7 +817,7 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def post_results(json)
-    uri = URI("#{ENV['RATINGS_API_URL']}matches/")
+    uri = URI([ENV['RATINGS_API_URL'], 'matches'].join('/'))
     req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
     req.body = json
 
@@ -823,9 +826,9 @@ class QwtfDiscordBotPug # :nodoc:
     end
   end
 
-  def get_fair_teams(players)
-    uri = URI("#{ENV['RATINGS_API_URL']}fair_teams/new")
-    params = { 'players[]' => players }
+  def get_fair_teams(channel_id:, players:)
+    uri = URI([ENV['RATINGS_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)
 
@@ -839,4 +842,8 @@ class QwtfDiscordBotPug # :nodoc:
   def ten_minutes_ago
     Time.now.to_i - TEN_MINUTES
   end
+
+  def discord_channel_leaderboard_url(channel_id)
+    [ENV['RATINGS_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: 5.5.26
+  version: 6.0.1
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb