qwtf_discord_bot 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fbbce642ba972a8c0f329cead6f6b0c2eeaaa2d81f8ffc4a72d5efc9ec927e9
-  data.tar.gz: a9cbe36675e83caeb0d8cdbb9f0cd52cbe8a6847339bd699d09a1b4c37347daf
+  metadata.gz: 6ac5cd6d9034e9742121d3a1f73e2b7b4dcfdd88f6d38ac4092857b1c73a1cb2
+  data.tar.gz: af41c6aa3d43e94a8e9834d087716df7f7913dea4e5366c416673ed995a53571
 SHA512:
-  metadata.gz: 5487069a3f1eb9f4c22f0b6ad3397dbe8f7d18fa9416b2c3a65084d37c74903630d6c4d8a8eb96cc7683d138168338bb3980b29698a72dcd9ac7ab0a24297210
-  data.tar.gz: f85243fec5e5b0879bc08a3390b0e008b00e31b8f0c78e2b949c378d145a316ace08342c4f08a049641dffcecd930cef27f031fd073ef77955336fd8f9c0348a
+  metadata.gz: edc080da2401d91e932fe1a0afc338503e58773fafbaff1290827829e3c30006c529a9cc0f0d9ae0b460feb6d1ef440e12fd8cdebcda74fca941ffa6361c690d
+  data.tar.gz: 3864eddf20434aa1e22baf84848b76a871f51453eb95979b5738b275d9438252596eb3ab08c171caa2f2824d77dfcb5e26ef15cf5a9a4f83081b6b4c0f2031b6

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-6.1.1
+6.1.2

data/lib/dashboard.rb

@@ -4,7 +4,6 @@ class Dashboard
     @endpoints = dashboard_config["endpoints"]
     @messages = {}
 
-
     channel_name = dashboard_config["name"]
 
     old_dashboard_channel = @server.channels.find do |chan|

data/lib/qstat_request.rb

@@ -11,28 +11,26 @@ class QstatRequest
     @result ||= execute
   end
 
-  def to_embed
-    return nil if is_empty?
-
-    embed = Discordrb::Webhooks::Embed.new
-
-    teams.each do |team|
-      embed << team.to_embed_field
-    end
-
-    embed
-  end
-
   def to_full_embed
     Discordrb::Webhooks::Embed.new.tap do |embed|
       embed.add_field(
         name: name,
-        value: embed_summary,
+        value: join_link,
       )
 
       teams.each do |team|
         embed << team.to_embed_field
       end
+
+      footer = [game_map, "#{numplayers}/#{maxplayers} players"]
+
+      if has_spectators?
+        footer << "#{numspectators}/#{maxspectators} spectators"
+      end
+
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer.join(MSG_SNIPPET_DELIMITER)
+      )
     end
   end
 
@@ -43,9 +41,7 @@ class QstatRequest
   end
 
   def server_summary
-    return "#{@endpoint} isn't responding" unless game_map
-
-    info = [name, @endpoint, game_map]
+    info = [name, game_map]
 
     info += if !has_spectators?
               ["#{numplayers}/#{maxplayers}"]
@@ -56,28 +52,13 @@ class QstatRequest
               ]
             end
 
+    info << join_link
+
     info.join(MSG_SNIPPET_DELIMITER)
   end
 
   def join_link
-    "[Join](http://phobos.baseq.fr:9999/join?url=#{@endpoint})"
-  end
-
-  def embed_summary
-    info = [@endpoint, game_map]
-
-    info += if !has_spectators?
-              ["#{numplayers}/#{maxplayers}"]
-            else
-              [
-                "#{numplayers}/#{maxplayers} players",
-                "#{numspectators}/#{maxspectators} spectators"
-              ]
-            end
-
-    info << join_link
-
-    info.join(MSG_SNIPPET_DELIMITER)
+    "<qw://#{@endpoint}>"
   end
 
   def is_empty?
@@ -92,6 +73,10 @@ class QstatRequest
     numplayers && numplayers > 0
   end
 
+  def live_server?
+    !game_map.nil?
+  end
+
   private
 
   def has_spectators?

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -16,20 +16,17 @@ class QwtfDiscordBotServer
         message = 'Provide a server address e.g. `!server ' \
           'sydney.fortressone.org` or use `!active` or `!all`'
         event.channel.send_message(message)
-        puts message
+
+        return puts message
+      end
+
+      endpoint = args.first
+      request = QstatRequest.new(endpoint)
+
+      if !request.live_server?
+        event.channel.send_message("#{endpoint} isn't responding")
       else
-        endpoint = args.first
-        qstat_response = QstatRequest.new(endpoint)
-        message = qstat_response.server_summary
-        embed = qstat_response.to_embed
-
-        if embed
-          event.channel.send_embed(message, embed)
-          puts message
-        else
-          event.channel.send_message(message)
-          puts message
-        end
+        event.channel.send_embed(nil, request.to_full_embed)
       end
     end
 
@@ -43,20 +40,16 @@ class QwtfDiscordBotServer
       if endpoints_for_this_channel.empty?
         message = 'There are no servers associated with this channel'
         event.channel.send_message(message)
-        puts message
-      else
-        endpoints_for_this_channel.each do |endpoint|
-          qstat_request = QstatRequest.new(endpoint.address)
-          message = qstat_request.server_summary
-          embed = qstat_request.to_embed
-
-          if embed
-            event.channel.send_embed(message, embed)
-            puts message
-          else
-            event.channel.send_message(message)
-            puts message
-          end
+        return puts message
+      end
+
+      endpoints_for_this_channel.each do |endpoint|
+        request = QstatRequest.new(endpoint.address)
+
+        if !request.live_server?
+          event.channel.send_message("#{endpoint} isn't responding")
+        else
+          event.channel.send_embed(nil, request.to_full_embed)
         end
       end
 
@@ -73,35 +66,27 @@ class QwtfDiscordBotServer
       if endpoints_for_this_channel.empty?
         message = 'There are no servers associated with this channel'
         event.channel.send_message(message)
-        puts message
-      else
-        qstat_requests = endpoints_for_this_channel.map do |endpoint|
-          QstatRequest.new(endpoint.address)
-        end
+        return puts message
+      end
 
-        servers_with_players = qstat_requests.reject do |server|
-          server.is_empty?
-        end
+      qstat_requests = endpoints_for_this_channel.map do |endpoint|
+        QstatRequest.new(endpoint.address)
+      end
 
-        if servers_with_players.empty?
-          message = "All ##{event.channel.name} servers are empty"
-          event.channel.send_message(message)
-          puts message
-        else
-          servers_with_players.each do |server|
-            message = server.server_summary
-            embed = server.to_embed
-
-            if embed
-              event.channel.send_embed(message, embed)
-              puts message
-            else
-              event.channel.send_message(message)
-              puts message
-            end
-          end
-        end
+      servers_with_players = qstat_requests.reject do |server|
+        server.is_empty?
       end
+
+      if servers_with_players.empty?
+        message = "All ##{event.channel.name} servers are empty"
+        event.channel.send_message(message)
+        return puts message
+      end
+
+      servers_with_players.each do |server|
+        event.channel.send_embed(nil, server.to_full_embed)
+      end
+
       return nil
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb