qwtf_discord_bot 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba96254cc28ceadd0b9874632b15808034d798e57f5e737e1b4f5e32fe35075
-  data.tar.gz: cea4d4376e254c67fe280097e440e1991e9f08f627305ed8cd770355ca2bf67a
+  metadata.gz: d474c40842701016d9431def0c11f0802e1e9f760b8cd46906b6c1813165da69
+  data.tar.gz: bbee37ae5f25bbc63395ac866704994c1e6bdbfc7399ea12e7147f44c918c1f6
 SHA512:
-  metadata.gz: 06afd5a52438eba557524c6d747da5bd34c8f3a03d644e297796a6272408cbbea6f1ceda23d9d4c8894870af98757c28ce3407f6245d0a274d7d267851770c24
-  data.tar.gz: 83642076d836259ec4bd96538f5abc39bd308dd5ce915a9aa1b16e579cad9f3219eac16ac4f50adda2fbeaa0f72a3709c7bf5584c845acb20344b910e225c2b7
+  metadata.gz: 3130bb1aa93eac85706b2294f0bf607061bc3ae3f6ad17c76b83dc76fd302d69014aab4448b3f02878fdf878558b21e0a8415c6a79a9157b45b2ad55624a8184
+  data.tar.gz: 998f5873f02adafd23ad4bfded8728b0df7c0a7ca5507a348cf642c2291e1239fd1a61c887d7c025104bdb3f003ce6c1f658db3d85dc73b18541e55d6873d395

data/Gemfile.lock

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

data/config/endpoints.yaml

@@ -0,0 +1,5 @@
+---
+# Add each endpoint below the in format
+# "<hostname>:<port>":
+#   - CHANNEL_ID_1
+#   - CHANNEL_ID_2

data/exe/qwtf_discord_bot

@@ -8,17 +8,15 @@ class QwtfDiscordBotExe < Thor
     true
   end
 
-  desc 'server', 'Responds to `!server` with server information'
-  method_option :endpoints, type: :array, alias: '-e', default: ['localhost:27500']
+  desc 'server', 'Responds to user commands with server information'
   def server
-    server_bot = QwtfDiscordBotServer.new(options[:endpoints])
+    server_bot = QwtfDiscordBotServer.new
     server_bot.run
   end
 
-  desc 'watcher', 'Watches server and accounces when a player joins'
-  method_option :endpoints, type: :array, alias: '-e', default: ['localhost:27500']
+  desc 'watcher', 'Watches servers and accounces when a player joins'
   def watcher
-    watcher_bot = QwtfDiscordBotWatcher.new(options[:endpoints])
+    watcher_bot = QwtfDiscordBotWatcher.new
     watcher_bot.run
   end
 end

data/lib/qwtf_discord_bot.rb

@@ -2,29 +2,30 @@ require 'qwtf_discord_bot/version'
 require 'qwtf_discord_bot/qwtf_discord_bot_server'
 require 'qwtf_discord_bot/qwtf_discord_bot_watcher'
 require 'discordrb'
+require 'yaml'
 
 require 'qstat_request'
 require 'player'
 require 'team'
 require 'emoji'
 require 'roster'
+require 'endpoint'
+
+class QwtfDiscordBot # :nodoc:
+  ENV_VARS = %w[
+    QWTF_DISCORD_BOT_TOKEN
+    QWTF_DISCORD_BOT_CLIENT_ID
+  ].freeze
 
-class QwtfDiscordBot
-  ENV_VARS = [
-    'QWTF_DISCORD_BOT_TOKEN',
-    'QWTF_DISCORD_BOT_CLIENT_ID',
-    'QWTF_DISCORD_BOT_CHANNEL_ID'
-  ]
 
   if ENV_VARS.any? { |var| !ENV.key?(var) }
-    raise "Environment variables not configured"
+    raise 'Environment variables not configured'
   end
 
   TOKEN = ENV['QWTF_DISCORD_BOT_TOKEN'].strip
   CLIENT_ID = ENV['QWTF_DISCORD_BOT_CLIENT_ID'].strip
-  CHANNEL_ID = ENV['QWTF_DISCORD_BOT_CHANNEL_ID'].strip
 
-  def initialize(endpoints)
-    @endpoints = endpoints
+  def initialize
+    @endpoints = YAML.load_file('config/endpoints.yaml')
   end
 end

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -1,4 +1,4 @@
-class QwtfDiscordBotServer < QwtfDiscordBot
+class QwtfDiscordBotServer < QwtfDiscordBot # :nodoc:
   def run
     bot = Discordrb::Commands::CommandBot.new(
       token: TOKEN,
@@ -7,11 +7,10 @@ class QwtfDiscordBotServer < QwtfDiscordBot
     )
 
     bot.command :server do |event, *args|
-      return unless event.channel.id.to_s == CHANNEL_ID
-
       if args.empty?
         event.channel.send_message(
-          "Provide a server address e.g. `!server sydney.fortressone.org` or use `!active` or `!all`"
+          'Provide a server address e.g. `!server sydney.fortressone.org` ' \
+          'or use `!active` or `!all`'
         )
       else
         endpoint = args.first
@@ -28,20 +27,20 @@ class QwtfDiscordBotServer < QwtfDiscordBot
     end
 
     bot.command :all do |event|
-      return unless event.channel.id.to_s == CHANNEL_ID
+      @endpoints.each do |endpoint, channel_ids|
+        channel_ids.each do |channel_id|
+          next if event.channel.id != channel_id
 
-      qstat_responses = @endpoints.map do |endpoint|
-        QstatRequest.new(endpoint)
-      end
+          qstat_request = QstatRequest.new(endpoint)
+          message = qstat_request.server_summary
+          embed = qstat_request.to_embed
 
-      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)
+          if embed
+            event.channel.send_embed(message, embed)
+          else
+            event.channel.send_message(message)
+          end
         end
       end
 
@@ -49,22 +48,16 @@ class QwtfDiscordBotServer < QwtfDiscordBot
     end
 
     bot.command :active do |event|
-      return unless event.channel.id.to_s == CHANNEL_ID
+      @endpoints.each do |endpoint, channel_ids|
+        channel_ids.each do |channel_id|
+          next if event.channel.id != channel_id
 
-      qstat_responses = @endpoints.map do |endpoint|
-        QstatRequest.new(endpoint)
-      end
+          qstat_request = QstatRequest.new(endpoint)
+          next if qstat_request.is_empty?
 
-      servers_with_players = qstat_responses.select(&:has_players?)
+          message = qstat_request.server_summary
+          embed = qstat_request.to_embed
 
-      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)

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -4,18 +4,23 @@ class QwtfDiscordBotWatcher < QwtfDiscordBot
 
   def run
     every(THIRTY_SECONDS) do
-      @endpoints.each do |endpoint|
+      @endpoints.each do |endpoint, channel_ids|
         request = QstatRequest.new(endpoint)
+        next if request.is_empty?
 
-        unless request.is_empty?
-          request.player_names.each do |name|
-            unless seen_recently?(endpoint: endpoint, name: name)
-              report_joined(name: name, server_summary: request.server_summary)
+        request.player_names.each do |name|
+          unless seen_recently?(endpoint: endpoint, name: name)
+            channel_ids.each do |channel_id|
+              report_joined(
+                name: name,
+                channel_id: channel_id,
+                server_summary: request.server_summary
+              )
             end
-
-            history[endpoint] ||= {}
-            history[endpoint][name] = Time.now
           end
+
+          history[endpoint] ||= {}
+          history[endpoint][name] = Time.now
         end
       end
     end
@@ -35,10 +40,10 @@ class QwtfDiscordBotWatcher < QwtfDiscordBot
     last_seen && (Time.now - last_seen < TEN_MINUTES)
   end
 
-  def report_joined(name:, server_summary:)
+  def report_joined(name:, channel_id:, server_summary:)
     Discordrb::API::Channel.create_message(
       "Bot #{TOKEN}",
-      CHANNEL_ID,
+      channel_id,
       "#{name} has joined #{server_summary}"
     )
   end

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '2.2.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -66,6 +66,7 @@ files:
 - bin/rspec
 - bin/setup
 - bin/thor
+- config/endpoints.yaml
 - emoji/blue_demoman.png
 - emoji/blue_engineer.png
 - emoji/blue_hwguy.png