qwtf_discord_bot 5.5.22 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8935dcbd9f811d2277081ce9d92ae0ae7818663212f5858a897e47d799d6765c
-  data.tar.gz: bc16097b879c0ab8ed026e1a42ce0ca981b333280ce96a62f320ac4f80250f1a
+  metadata.gz: 7873dfbc7828ca1970851e98c563be1adfc62cb0f451a4a3f76d5dbc551db8a4
+  data.tar.gz: b34b2f5138fff279ff9ed28f2034058cef15ba3cd95c4c4157d1588dd0664dc3
 SHA512:
-  metadata.gz: a04f4e900ed5011cd7abfab2a13f9c501600e0a6c6a4e6ee6623f6e32cd2c5aaba7452e01609b1dc3ac9441f22af0ace8035d47ca0bf2b7f0d3eb5f5711034e8
-  data.tar.gz: a932142714804658be6725f0f6f2e5f3236e740204e3c58cfd8bf971ee27cd95bd8d6342cacade9a3c42ef59490a852f20588c73ecd82e78fd41d073321b9a25
+  metadata.gz: 6bc88b6b480c2a53a8f79a17a1c7202d446d8a068aa1daf0bc9a685ca63c09705450466572ba3fb95a7b7e84360e7e29db41415a74f3e277ea08ae1e61c18b89
+  data.tar.gz: a75c8be77b08ffd148e79c374451e65d31f7b5131e6254f0fa2da434885db24a7ebb1df6e84509c3715a1f46cde7a53dae8d4a326fc367c996c791c81a3926ce

data/Gemfile.lock

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

data/README.md

@@ -180,8 +180,8 @@ Build:
 
 Push:
 
-    docker tag discord-bot fortressone/discord-bot:latest
-    docker push fortressone/discord-bot:latest
+    docker tag discord-bot fortressone/discord-bot:latest \
+      && docker push fortressone/discord-bot:latest
 
 
 Create AWS instance:

data/VERSION

@@ -1 +1 @@
-5.5.22
+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/dashboard.rb

@@ -2,6 +2,8 @@ class Dashboard
   def initialize(dashboard_config, bot)
     @server = bot.server(dashboard_config["server_id"])
     @endpoints = dashboard_config["endpoints"]
+    @messages = {}
+
 
     channel_name = dashboard_config["name"]
 
@@ -32,15 +34,13 @@ class Dashboard
   end
 
   def update
-    messages = {}
-
     @endpoints.each do |endpoint|
       qstat_request = QstatRequest.new(endpoint)
 
       if qstat_request.is_empty?
-        if messages[endpoint]
-          messages[endpoint].delete
-          messages.delete(endpoint)
+        if @messages[endpoint]
+          @messages[endpoint].delete
+          @messages.delete(endpoint)
         end
 
         next
@@ -48,8 +48,8 @@ class Dashboard
 
       embed = qstat_request.to_full_embed
 
-      messages[endpoint] = if messages[endpoint]
-                              messages[endpoint].edit(nil, embed)
+      @messages[endpoint] = if @messages[endpoint]
+                              @messages[endpoint].edit(nil, embed)
                             else
                               @channel.send_embed(nil, embed)
                             end

data/lib/qstat_request.rb

@@ -17,7 +17,7 @@ class QstatRequest
     embed = Discordrb::Webhooks::Embed.new
 
     teams.each do |team|
-      embed.add_field << team.to_embed_field
+      embed << team.to_embed_field
     end
 
     embed
@@ -45,39 +45,39 @@ class QstatRequest
   def server_summary
     return "#{@endpoint} isn't responding" unless game_map
 
-    if !has_spectators?
-      return [
-        name,
-        @endpoint,
-        game_map,
-        "#{numplayers}/#{maxplayers}"
-      ].join(MSG_SNIPPET_DELIMITER)
-    end
+    info = [name, @endpoint, game_map]
+
+    info += if !has_spectators?
+              ["#{numplayers}/#{maxplayers}"]
+            else
+              [
+                "#{numplayers}/#{maxplayers} players",
+                "#{numspectators}/#{maxspectators} spectators"
+              ]
+            end
+
+    info.join(MSG_SNIPPET_DELIMITER)
+  end
 
-    [
-      name,
-      @endpoint,
-      game_map,
-      "#{numplayers}/#{maxplayers} players",
-      "#{numspectators}/#{maxspectators} spectators"
-    ].join(MSG_SNIPPET_DELIMITER)
+  def join_link
+    "[Join](http://phobos.baseq.fr:9999/join?url=#{@endpoint})"
   end
 
   def embed_summary
-    if !has_spectators?
-      return [
-        @endpoint,
-        game_map,
-        "#{numplayers}/#{maxplayers}"
-      ].join(MSG_SNIPPET_DELIMITER)
-    end
+    info = [@endpoint, game_map]
+
+    info += if !has_spectators?
+              ["#{numplayers}/#{maxplayers}"]
+            else
+              [
+                "#{numplayers}/#{maxplayers} players",
+                "#{numspectators}/#{maxspectators} spectators"
+              ]
+            end
 
-    [
-      @endpoint,
-      game_map,
-      "#{numplayers}/#{maxplayers} players",
-      "#{numspectators}/#{maxspectators} spectators"
-    ].join(MSG_SNIPPET_DELIMITER)
+    info << join_link
+
+    info.join(MSG_SNIPPET_DELIMITER)
   end
 
   def is_empty?
@@ -115,7 +115,10 @@ class QstatRequest
   end
 
   def name
-    data['name']
+    name = data['name']
+    return address if name.empty?
+
+    name
   end
 
   def address

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.22
+  version: 6.0.1
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb