qwtf_discord_bot 5.4.9 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3978acdc270b907c20e237c57690192b753aa96be251edcda59f80f60fa188a5
-  data.tar.gz: fbda19b74c0f215cbd2789743db1e303352dae5488fe4633e683c7982b7295f2
+  metadata.gz: 114b6c7c1ecc4b4cd957b359b58f42af35a29979830fbb397121ef37d26b2fdd
+  data.tar.gz: '0098c992179231b57e8b443b8f658354e5e05bc4e284de739c1e442c771d163f'
 SHA512:
-  metadata.gz: 0b343f7bbcf1435df653f9cc6a810db2a09472d2238134a8acc39446c1e54a828a5c6d1e5fbef318271bd0019d70304febe39aab107ceefe8ceada2ae7318a99
-  data.tar.gz: e627fca364cd5f51fa3514c4c8c66d9bf80486f6114778bf82086165706503d808d89fc2b717ea4e2bcfc70d8fe7de5376432f68436a836d49e92b833611add4
+  metadata.gz: c8da38ea19d0f3bd0ebcc0bf82468d8347ec7d343f0f67acafb1fa0bb567b50ad28ad2af268022cf4f1fd6e1f405203740318a6a9112ce9d4971a90d3fa66f68
+  data.tar.gz: c801b72f1614f818816a6ced4737d58cb4b59dfe2c5db779b22cf7d124ceb364bdc58d47307f842efe58992eee31c6c729e769f8b6a3f795b9ad462eb76b7e1c

data/VERSION

@@ -1 +1 @@
-5.4.9
+5.5.0

data/docker-compose.yml

@@ -39,3 +39,16 @@ services:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"
         target: /discord-bot/config.yaml
+  discord-dashboard-bot:
+    image: fortressone/discord-bot:latest
+    command: dashboard
+    restart: always
+    depends_on:
+      - redis
+    environment:
+      - REDIS_URL=redis://redis
+      - RATINGS_API_URL
+    volumes:
+      - type: bind
+        source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"
+        target: /discord-bot/config.yaml

data/exe/qwtf_discord_bot

@@ -26,6 +26,12 @@ class QwtfDiscordBotExe < Thor
     watcher_bot = QwtfDiscordBotWatcher.new
     watcher_bot.run
   end
+
+  desc 'dashboard', 'A live dashboard with active server information'
+  def dashboard
+    dashboard_bot = QwtfDiscordBotDashboard.new
+    dashboard_bot.run
+  end
 end
 
 QwtfDiscordBotExe.start

data/lib/dashboard.rb

@@ -0,0 +1,40 @@
+class Dashboard
+  def initialize(channel, bot)
+    @channel_id = channel["id"]
+    @endpoints = channel["endpoints"]
+    @bot = bot
+    @messages = {}
+  end
+
+  def update
+    @endpoints.each do |endpoint|
+      qstat_request = QstatRequest.new(endpoint)
+
+      if qstat_request.is_empty?
+        next unless @messages[endpoint]
+
+        @messages[endpoint].delete
+        @messages.delete(endpoint)
+      end
+
+      embed = qstat_request.to_full_embed
+
+      @messages[endpoint] = if @messages[endpoint]
+                              @messages[endpoint].edit(nil, embed)
+                            else
+                              channel.send_embed(nil, embed)
+                            end
+    end
+  end
+
+  private
+
+  def channel
+    data = Discordrb::API::Channel.resolve(
+      "Bot #{QwtfDiscordBot.config.token}",
+      @channel_id
+    )
+
+    Discordrb::Channel.new(JSON.parse(data), @bot)
+  end
+end

data/lib/qstat_request.rb

@@ -1,4 +1,6 @@
 class QstatRequest
+  MSG_SNIPPET_DELIMITER = ' · '
+
   attr_accessor :result
 
   def initialize(endpoint)
@@ -21,6 +23,19 @@ class QstatRequest
     embed
   end
 
+  def to_full_embed
+    Discordrb::Webhooks::Embed.new.tap do |embed|
+      embed.add_field(
+        name: name,
+        value: embed_summary,
+      )
+
+      teams.each do |team|
+        embed.add_field(team.to_embed_field)
+      end
+    end
+  end
+
   def to_message
     return server_summary if is_empty?
 
@@ -29,9 +44,40 @@ class QstatRequest
 
   def server_summary
     return "#{@endpoint} isn't responding" unless game_map
-    return "#{name} | #{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}" unless has_spectators?
 
-    "#{name} | #{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers} players | #{numspectators}/#{maxspectators} spectators"
+    if !has_spectators?
+      return [
+        name,
+        @endpoint,
+        game_map,
+        "#{numplayers}/#{maxplayers}"
+      ].join(MSG_SNIPPET_DELIMITER)
+    end
+
+    [
+      name,
+      @endpoint,
+      game_map,
+      "#{numplayers}/#{maxplayers} players",
+      "#{numspectators}/#{maxspectators} spectators"
+    ].join(MSG_SNIPPET_DELIMITER)
+  end
+
+  def embed_summary
+    if !has_spectators?
+      return [
+        @endpoint,
+        game_map,
+        "#{numplayers}/#{maxplayers}"
+      ].join(MSG_SNIPPET_DELIMITER)
+    end
+
+    [
+      @endpoint,
+      game_map,
+      "#{numplayers}/#{maxplayers} players",
+      "#{numspectators}/#{maxspectators} spectators"
+    ].join(MSG_SNIPPET_DELIMITER)
   end
 
   def is_empty?

data/lib/qwtf_discord_bot.rb

@@ -1,11 +1,12 @@
+require 'discordrb'
+require 'yaml'
+require 'redis'
 require 'qwtf_discord_bot/version'
 require 'qwtf_discord_bot/qwtf_discord_bot_server'
 require 'qwtf_discord_bot/qwtf_discord_bot_pug'
 require 'qwtf_discord_bot/qwtf_discord_bot_watcher'
+require 'qwtf_discord_bot/qwtf_discord_bot_dashboard'
 require 'qwtf_discord_bot/config'
-require 'discordrb'
-require 'yaml'
-require 'redis'
 
 require 'qstat_request'
 require 'player'

data/lib/qwtf_discord_bot/config.rb

@@ -1,4 +1,5 @@
 require 'endpoint'
+require 'dashboard'
 
 class Config
   def initialize(config)
@@ -19,6 +20,10 @@ class Config
     end
   end
 
+  def dashboards
+    @dashboards ||= @config['dashboards']
+  end
+
   def emojis
     @emojis ||= @config['emojis']
   end

data/lib/qwtf_discord_bot/qwtf_discord_bot_dashboard.rb

@@ -0,0 +1,41 @@
+class QwtfDiscordBotDashboard
+  THIRTY_SECONDS = 30
+
+  def run
+    bot = Discordrb::Commands::CommandBot.new(
+      token: QwtfDiscordBot.config.token,
+      client_id: QwtfDiscordBot.config.client_id,
+      help_command: false,
+      prefix: proc do |message|
+        match = /^\!(\w+)(.*)/.match(message.content)
+        if match
+          first = match[1]
+          rest = match[2]
+          # Return the modified string with the first word lowercase:
+          "#{first.downcase}#{rest}"
+        end
+      end
+    )
+
+    @dashboards ||= QwtfDiscordBot.config.dashboards.map do |channel|
+      Dashboard.new(channel, bot)
+    end
+
+    every(THIRTY_SECONDS) do
+      @dashboards.each do |dashboard|
+        dashboard.update
+      end
+    end
+  end
+
+  private
+
+  def every(n_seconds)
+    loop do
+      before = Time.now
+      yield
+      interval = n_seconds - (Time.now - before)
+      sleep(interval) if interval > 0
+    end
+  end
+end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -65,9 +65,9 @@ class QwtfDiscordBotPug # :nodoc:
                       0
                     end
 
-        if choose_fair_teams(pug: pug, event: e, iteration: iteration)
-          status(pug: pug, event: e)
-        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
     end
 
@@ -261,15 +261,6 @@ class QwtfDiscordBotPug # :nodoc:
 
             user_id = mention_to_user_id(mention)
             display_name = e.display_name_for(user_id) || arg
-
-            unless pug.joined?(user_id)
-              send_embedded_message(
-                description: "#{display_name} isn't in the PUG",
-                channel: e.channel
-              )
-              next
-            end
-
             pug.join_team(team_no: team_no, player_id: user_id)
 
             send_embedded_message(
@@ -297,26 +288,47 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        unless pug.joined?(user_id)
-          return send_embedded_message(
-            description: "You aren't in this PUG",
-            channel: e.channel
-          )
-        end
+        if args.empty?
+          unless pug.joined?(user_id)
+            return send_embedded_message(
+              description: "You aren't in this PUG",
+              channel: e.channel
+            )
+          end
 
-        if pug.team(0).include?(user_id)
-          return send_embedded_message(
-            description: "You aren't in a team",
+          if pug.team(0).include?(user_id)
+            return send_embedded_message(
+              description: "You aren't in a team",
+              channel: e.channel
+            )
+          end
+
+          pug.join_team(team_no: 0, player_id: user_id)
+
+          send_embedded_message(
+            description: "#{e.display_name} leaves team",
             channel: e.channel
           )
-        end
+        else
+          args.each do |mention|
+            unless mention.match(/<@!\d+>/)
+              send_embedded_message(
+                description: "#{arg} isn't a valid mention",
+                channel: e.channel
+              )
+              next
+            end
 
-        pug.join_team(team_no: 0, player_id: user_id)
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || arg
+            pug.join_team(team_no: 0, player_id: user_id)
 
-        send_embedded_message(
-          description: "#{e.display_name} leaves team",
-          channel: e.channel
-        )
+            send_embedded_message(
+              description: "#{display_name} leaves team",
+              channel: e.channel
+            )
+          end
+        end
       end
     end
 
@@ -329,6 +341,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.full?
+          return send_embedded_message(
+            description: "Can't report unless PUG is full",
+            channel: event.channel
+          )
+        end
+
         unless args.any?
           return send_embedded_message(
             description: "Specify winning team; e.g. `!win 1`",
@@ -361,7 +380,7 @@ class QwtfDiscordBotPug # :nodoc:
           teams.merge({ name => { players: players, result: result } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -372,10 +391,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins. [Ratings](http://ratings.fortressone.org)",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -390,6 +409,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if !pug.full?
+          return send_embedded_message(
+            description: "Can't report unless PUG is full",
+            channel: event.channel
+          )
+        end
+
         if pug.actual_teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",
@@ -405,7 +431,7 @@ class QwtfDiscordBotPug # :nodoc:
         teams.merge({ name => { players: players, result: 0 } })
         end
 
-        post_results(
+        id = post_results(
           {
             match: {
               map: pug.game_map,
@@ -416,10 +442,10 @@ class QwtfDiscordBotPug # :nodoc:
               }
             }
           }.to_json
-        )
+        ).body
 
         send_embedded_message(
-          description: "Match drawn. [Ratings](http://ratings.fortressone.org)",
+          description: "Match ##{id} drawn. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -610,7 +636,7 @@ class QwtfDiscordBotPug # :nodoc:
       ) && nil
     end
 
-    send_embedded_message(
+    message_obj = send_embedded_message(
       description: "Choosing fair teams...",
       channel: event.channel
     )
@@ -621,7 +647,8 @@ class QwtfDiscordBotPug # :nodoc:
     if !teams
       return send_embedded_message(
         description: "There are only #{combinations.count} possible combinations",
-        channel: event.channel
+        channel: event.channel,
+        message_obj: message_obj
       ) && nil
     end
 
@@ -630,17 +657,20 @@ class QwtfDiscordBotPug # :nodoc:
         pug.join_team(team_no: team_no, player_id: player_id)
       end
     end
+
+    message_obj
   end
 
-  def status(pug:, event:)
+  def status(pug:, event:, message_obj: nil)
     footer = [
-      pug.game_map,
-      "#{pug.player_slots} joined"
+      pug.game_map || "No map selected",
+      "#{pug.player_slots} joined",
     ].compact.join(MSG_SNIPPET_DELIMITER)
 
     send_embedded_message(
       description: nil,
-      channel: event.channel
+      channel: event.channel,
+      message_obj: message_obj
     ) do |embed|
       embed.footer = Discordrb::Webhooks::EmbedFooter.new(
         text: footer
@@ -717,11 +747,20 @@ class QwtfDiscordBotPug # :nodoc:
     "There's no active PUG"
   end
 
-  def send_embedded_message(message: nil, description: nil, channel:)
+  def send_embedded_message(message: nil, description: nil, channel:, message_obj: nil)
     embed = Discordrb::Webhooks::Embed.new
     embed.description = description
     yield(embed) if block_given?
-    channel.send_embed(message, embed) && puts(message)
+
+    if message_obj
+      message_obj.edit(message, embed).tap do
+        puts(message)
+      end
+    else
+      channel.send_embed(message, embed).tap do
+        puts(message)
+      end
+    end
   end
 
   def post_results(json)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.4.9
+  version: 5.5.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -102,6 +102,7 @@ files:
 - emoji/red_soldier.png
 - emoji/red_spy.png
 - exe/qwtf_discord_bot
+- lib/dashboard.rb
 - lib/emoji.rb
 - lib/endpoint.rb
 - lib/event_decorator.rb
@@ -110,6 +111,7 @@ files:
 - lib/qstat_request.rb
 - lib/qwtf_discord_bot.rb
 - lib/qwtf_discord_bot/config.rb
+- lib/qwtf_discord_bot/qwtf_discord_bot_dashboard.rb
 - lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb
 - lib/qwtf_discord_bot/qwtf_discord_bot_server.rb
 - lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb