qwtf_discord_bot 5.5.21 → 5.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dbfe17b94ffb666f95b441f62ec327c1a1d14314868ce5fd8c4c1ef245eabd4
-  data.tar.gz: c35a33f5698b68456af313fe11011f3da4403f792bbe211d283de108ded8fd3f
+  metadata.gz: 9c6d6a935efeff277da0a093cc9cbbca7dd76e33a8d4d8f0bf73664d32f7b766
+  data.tar.gz: c0ab537abc9fbe1c3f133e0eedf076348cbd5d1bad622bcc6e2cbc7a233421f2
 SHA512:
-  metadata.gz: aa90484972ea80a47ef662e527a723b79bbc7210fc138714412a4102cca05299d71477b4307449790a523d1a2b4508c7a54cc1f243767d73361aa0ff8575e820
-  data.tar.gz: 55511370e2de264b7516d4e0bd14ec5e2e49f808d9d763e0bcbf4cd132aebfb0dce7e265428419990444210a0c4df61eb637bea3451665bb62aed7dd5379048b
+  metadata.gz: ba9d17f6b5b3f5a69e97594135cf1b87463cabcaf55e18dbf1e72e89d6f01d2594f9281042f4fdd0d3f43e3c58c822167094d74c2dfbea87c11f08df67d20702
+  data.tar.gz: a12523817d0bb96dbffbcc2e038a862615412117b53dee96486085836be04ea70a1a3f42fe28e8d1f4a451bd60633d3f416670ab52b43ab0927c5328411cd919

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bundler'
-gem 'discordrb'
+gem 'discordrb', '3.4.0'
 gem 'redis'
 gem 'thor'
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.5.19)
-      discordrb (~> 3.3)
+    qwtf_discord_bot (5.5.25)
+      discordrb (= 3.4.0)
       redis (~> 4.2)
       thor (~> 1.1)
 
@@ -18,14 +18,14 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    discordrb (3.4.2)
-      discordrb-webhooks (~> 3.4.2)
+    discordrb (3.4.0)
+      discordrb-webhooks (~> 3.3.0)
       ffi (>= 1.9.24)
       opus-ruby
       rest-client (>= 2.0.0)
       websocket-client-simple (>= 0.3.0)
-    discordrb-webhooks (3.4.2)
-      rest-client (>= 2.0.0)
+    discordrb-webhooks (3.3.0)
+      rest-client (>= 2.1.0.rc1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     event_emitter (0.2.6)
@@ -84,7 +84,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  discordrb
+  discordrb (= 3.4.0)
   factory_bot
   pry
   qwtf_discord_bot!

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.21
+5.5.26

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/qwtf_discord_bot.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'discordrb', '~> 3.3'
+  spec.add_runtime_dependency 'discordrb', '3.4.0'
   spec.add_runtime_dependency 'redis', '~> 4.2'
   spec.add_runtime_dependency 'thor', '~>1.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.21
+  version: 5.5.26
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement