qwtf_discord_bot 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70ca5bf16d72a2a0ccfc6127011016b1c1e18c3a4212d202dcf5a071b69e194
-  data.tar.gz: 055defe76720adc62871dd2c43d342a1161f6698a429c8b6f4ebdd47e9dfc42e
+  metadata.gz: 47aed33bbb5b34afc2ee892c69e263dd2f7b285093296182550247b5a69e93cd
+  data.tar.gz: c61ef338d9ee0a7cbf5152b844e68ec7499027967ffb8068c183124b8755113b
 SHA512:
-  metadata.gz: 754aedabdd94d65c98a224201aff9794cffcd68fb2ad4f8f22346475a09e68e371ee957c338bbbf6a775af744ce73d1fd0b7cd7bcf06e46178dcde3a3c6b8e9c
-  data.tar.gz: a414d546bdf7523df42ce3bd3d7a184050a2c2d80143743d23aed52f17298d54acad363d1791a63818df5d696879ad8ec2c691dec0ee400a07d58156ffbe81b7
+  metadata.gz: 00c74002efbd6841940510200baf240c78e616302b200309e83eb05b6ca09c2731fce8758936276227f86e5840563f409e044ea84baf92535ce9d3d62fad6d3d
+  data.tar.gz: bf3d7685d3e77607900fe9d63f9a50079d53e4a21b365931e8bdef6fe4c90c080e1781fbe44796e4e84ab2d7414e213999d5a261bbfec21b1e02844276446291

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     qwtf_discord_bot (4.1.0)
       discordrb (~> 3.3)
+      redis
       thor (~> 0.20)
 
 GEM
@@ -49,6 +50,7 @@ GEM
       method_source (~> 0.9.0)
     rbnacl (3.4.0)
       ffi
+    redis (4.1.3)
     rest-client (2.1.0.rc1)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)

data/docker-compose.yml

@@ -1,10 +1,14 @@
 ---
 version: "3.7"
 services:
+  redis:
+    image: redis:alpine
+    restart: always
   discord-command-bot:
     image: fortressone/discord-bot:latest
     command: "server"
     restart: always
+    depends_on: redis
     volumes:
       - type: bind
         source: /home/ubuntu/.config/qwtf_discord_bot/config.yaml
@@ -13,6 +17,9 @@ services:
     image: fortressone/discord-bot:latest
     command: "watcher"
     restart: always
+    depends_on: redis
+    environment:
+      - REDIS_URL=redis
     volumes:
       - type: bind
         source: /home/ubuntu/.config/qwtf_discord_bot/config.yaml

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -1,3 +1,5 @@
+require "redis"
+
 class QwtfDiscordBotWatcher
   include QwtfDiscordBot
 
@@ -22,8 +24,7 @@ class QwtfDiscordBotWatcher
             end
           end
 
-          history[address] ||= {}
-          history[address][name] = Time.now
+          redis.set("#{address}:#{name}", Time.now)
         end
       end
     end
@@ -39,8 +40,8 @@ class QwtfDiscordBotWatcher
   end
 
   def seen_recently?(endpoint:, name:)
-    last_seen = history[endpoint] && history[endpoint][name]
-    last_seen && (Time.now - last_seen < TEN_MINUTES)
+    last_seen = redis.get("#{endpoint}:#{name}")
+    last_seen && (Time.now - Time.parse(last_seen) < TEN_MINUTES)
   end
 
   def report_joined(name:, channel_id:, server_summary:)
@@ -51,7 +52,9 @@ class QwtfDiscordBotWatcher
     )
   end
 
-  def history
-    @history ||= {}
+  private
+
+  def redis
+    @redis ||= Redis.new
   end
 end

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 module QwtfDiscordBot
-  VERSION = '4.1.0'.freeze
+  VERSION = '4.2.0'.freeze
 end

data/qwtf_discord_bot.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'discordrb', '~> 3.3'
   spec.add_runtime_dependency 'thor', '~> 0.20'
+  spec.add_runtime_dependency 'redis'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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'
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email:
 - shayolden@hotmail.com
@@ -120,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Works by wrapping the excellent CLI server query tool qstat. Accepts !server,