qwtf_discord_bot 5.5.24 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e04268c13856cc790d4f097948b514d43a698e4baed69833cd1e9f60f958e5e0
-  data.tar.gz: b4355be1524b74224a2896d742b1be6e926b264b452d64a7c0f0bd1e093f5800
+  metadata.gz: 151d77adaf69b8f02ce8cba749eee97bdc6927956169d673d72917563bb07b91
+  data.tar.gz: 781ddacc6d1f792df33553581cdc9a00f583872de3ed6f4581f2024fab7a83bd
 SHA512:
-  metadata.gz: 824f14ebed995b4ce6cd55ee452ee0cfc9839d7f157acb62c313ac5f38a6d40373fff0ca4e41e29ab87a0f4dffa5cbe4ee26bbf2215de956f8a9d30a219a449b
-  data.tar.gz: cedf6ceca11a4d959799aac469653fa09ce32ab06de932a1a72c8d657f1bf8774dd5812a97d0e23ebcbfaaa583d9ae0a542ef58f34e480c330a7105755adc39f
+  metadata.gz: b034cd067bc60caaa168f175debfb55f607416a7b7a4efd37f9a0e00b49a693a9722d021989fd3518c8e56134ada4379c9273106fac0a0d8083d493f01d040ec
+  data.tar.gz: 74436d2a147f42297fa21f7e20429c8e902bda52535089a6dd8f97ac452686d19ff78702ee413efc69c4f2e1248691456de78c84ba779e79819a04bb077d1363

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.5.24)
+    qwtf_discord_bot (6.0.2)
       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.24
+6.0.3

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/qstat_request.rb

@@ -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

@@ -73,7 +73,6 @@ class QwtfDiscordBotPug # :nodoc:
                       0
                     end
 
-
         message_obj = choose_fair_teams(pug: pug, event: e, iteration: iteration)
         status(pug: pug, event: e, message_obj: message_obj) if message_obj
       end
@@ -247,13 +246,6 @@ class QwtfDiscordBotPug # :nodoc:
             )
           end
 
-          if pug.team(team_no).size >= pug.teamsize
-            return send_embedded_message(
-              description: "Team is full",
-              channel: e.channel
-            )
-          end
-
           pug.join_team(team_no: team_no, player_id: user_id)
 
           send_embedded_message(
@@ -430,7 +422,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 +490,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 +686,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 +809,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 +818,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 +834,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.24
+  version: 6.0.3
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
+- ".env.example"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"