qwtf_discord_bot 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9385b1c05a575a5b414505a79e877f827a9e9a4b48efdc02ed6ff533d335ca8f
-  data.tar.gz: 5de632e9bfc8963cfe44e3986afb43348a3f488b951a6ffdcf1ae983d5cfab8c
+  metadata.gz: de588095729dbddb3bc9c5c3be964541912ae614826f536f78f7c8470a20c1fb
+  data.tar.gz: 34ed997dd466fff69785b67f4327a1137d7f4259b5eab848686b9bf9065c45cb
 SHA512:
-  metadata.gz: 05d47446975e1464736c9be5487b794ea8a7573c2b68b2e7c4a7606099555b9a416ffe7b3978f77f3f3a1dc256c75cbe2be5a8aef014f0e1902e37b9a2a44c89
-  data.tar.gz: d45be8fee9d2ebb6403e24e12b0a7db5582a2df039304944ac5d7788ee76259abf6b7e517cafb94d3deadf1bcf4699fdd7a27a9341c6c0277b5f32b3e39b67a8
+  metadata.gz: 9931074620e008b8426dbfa34eda373fd87d3b081c35223ff73183ff51a4275db55159fcc2c407868e1d9e1ba78f4da94734f957044b0dc2ce790da146136c13
+  data.tar.gz: 5daeca1b9d9c2cead08b9c3d4eda89ec719928feae4d17cb13827151718e2fd00ac9977003c253c9f51941baad41c48e18fcd879789a19009cc9a421a66f15d6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (2.1.3)
+    qwtf_discord_bot (2.2.0)
       discordrb (~> 3.3)
       thor (~> 0.20)
 

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -11,13 +11,13 @@ class QwtfDiscordBotServer < QwtfDiscordBot
 
       if args.empty?
         event.channel.send_message(
-          "Provide a server address e.g. `!server location.fortressone.org` or use `!servers`"
+          "Provide a server address e.g. `!server sydney.fortressone.org` or use `!active` or `!all`"
         )
       else
         endpoint = args.first
-        qstat_request = QstatRequest.new(endpoint)
-        message = qstat_request.server_summary
-        embed = qstat_request.to_embed
+        qstat_response = QstatRequest.new(endpoint)
+        message = qstat_response.server_summary
+        embed = qstat_response.to_embed
 
         if embed
           event.channel.send_embed(message, embed)
@@ -27,35 +27,52 @@ class QwtfDiscordBotServer < QwtfDiscordBot
       end
     end
 
-    bot.command :servers do |event|
+    bot.command :all do |event|
       return unless event.channel.id.to_s == CHANNEL_ID
 
-      qstat_requests = @endpoints.map do |endpoint|
+      qstat_responses = @endpoints.map do |endpoint|
         QstatRequest.new(endpoint)
       end
 
-      message = qstat_requests.map(&:server_summary).join("\n")
-      event.channel.send_message(message)
+      qstat_responses.each do |server|
+        message = server.server_summary
+        embed = server.to_embed
+
+        if embed
+          event.channel.send_embed(message, embed)
+        else
+          event.channel.send_message(message)
+        end
+      end
     end
 
     bot.command :active do |event|
       return unless event.channel.id.to_s == CHANNEL_ID
 
-      qstat_requests = @endpoints.map do |endpoint|
+      qstat_responses = @endpoints.map do |endpoint|
         QstatRequest.new(endpoint)
       end
 
-      servers_with_players = qstat_requests.select(&:has_players?)
+      servers_with_players = qstat_responses.select(&:has_players?)
 
-      message = begin
-                  if servers_with_players.empty?
-                    "All ##{event.channel.name} servers are empty."
-                  else
-                    servers_with_players.map(&:server_summary).join("\n")
-                  end
-                end
+      if servers_with_players.empty?
+        event.channel.send_message(
+          "All ##{event.channel.name} servers are empty"
+        )
+      else
+        servers_with_players.each do |server|
+          message = server.server_summary
+          embed = server.to_embed
+
+          if embed
+            event.channel.send_embed(message, embed)
+          else
+            event.channel.send_message(message)
+          end
+        end
+      end
 
-      event.channel.send_message(message)
+      return nil
     end
 
     bot.run

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Sheldon Johnson