qwtf_discord_bot 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44df92126a1ed51c1c818e2ea9913839d4dff0df756600f1f2d18c1a5df5bc9d
-  data.tar.gz: f1d516e5dc30c374c88e9857a3deab27fedeef5e8132e4852a6a277c28db5271
+  metadata.gz: e7f38a56cd0deee24b921ec3d9c0c002da8936cf10681197c2663eba97fcb66d
+  data.tar.gz: 2827cd8f642c3339e0e3f2baed06fe6c722d6fcdbc1e691f933b930967679c98
 SHA512:
-  metadata.gz: ed3f3a38afe4b22d8ebbc9b9aa3704eaf89d8df9d8c8db979eeb45324952cfca033ee0c5ce7491e0a0158437a6c8ae7f0e55df6e2587c53c0afe1994a5b12e5d
-  data.tar.gz: 57741b5d3e68c25d842058eec80b81c5bbd7656f8f1a83b3c48ca50db396a4f8f8e52c0deb7d0d2cec932b339a8926b3e6b4f8ef6c0f85b5f156c10ab2815a02
+  metadata.gz: 69d996e55938128e7ce0504854425f9c5e2691de450ded94c786b12fdaf7621c7e502caf67031cc0a6f2694aee3aa1d819614dbf309f03f4e3ad84a72a293d8b
+  data.tar.gz: 751965e1f052fa0f443c1828de268d986342401f5075466d7760004f8bc6e2e9608dd09f1fd9cab35cb1b439d5bfb0e4fb872ea2b4a57ab8eff1a1b651c145c1

data/lib/qwtf_discord_bot.rb

@@ -1,6 +1,5 @@
 require "qwtf_discord_bot/version"
 require "discordrb"
-require 'active_support/core_ext/string'
 
 require "qstat_request"
 require "player"
@@ -43,12 +42,20 @@ class QwtfDiscordBot
       every(THIRTY_SECONDS) do
         request = QstatRequest.new(HOSTNAME)
         numplayers = request.numplayers
+        maxplayers = request.maxplayers
+        map = request.map
 
         if request.players
           player_names = request.players.map(&:name)
 
           player_names.each do |name|
-            report_joined(name, numplayers) unless seen_recently?(name)
+            unless seen_recently?(name)
+              report_joined(name: name,
+                            map: map,
+                            numplayers: numplayers,
+                            maxplayers: maxplayers)
+            end
+
             @history[name] = Time.now
           end
         end
@@ -57,14 +64,11 @@ class QwtfDiscordBot
 
     private
 
-      def report_joined(name, numplayers)
-        number_of_other_players = numplayers - 1
-
+      def report_joined(name:, map:, numplayers:, maxplayers:)
         Discordrb::API::Channel.create_message(
           "Bot #{TOKEN}",
           CHANNEL_ID,
-          "**#{name}** has joined **#{number_of_other_players}** " \
-          "#{"other player".pluralize(number_of_other_players)} on **#{HOSTNAME}**"
+          "**#{name}** has joined **#{HOSTNAME} | #{map} | #{numplayers}/#{maxplayers}**"
         )
       end
 

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/qwtf_discord_bot.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "discordrb"
-  spec.add_dependency "activesupport"
   spec.add_dependency "thor", '~> 0'
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sheldon Johnson
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement