qwtf_discord_bot 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661856af97a44fb0c64acbc7c1bc0f031fe5281c5ed820d5d90e1c0b2e00c4ac
-  data.tar.gz: 774aaabd9a66a7a1c230eacd42d9aa6269e373c6f6cc065d42c30cb71ee216b5
+  metadata.gz: bdf030f78e4914930fa35ba81799674c650bad803bd0584af577403cf29c2261
+  data.tar.gz: 5a438d661bf43ff93d930c91404034c2428714d8737addc1f7f1af94c7f7a40b
 SHA512:
-  metadata.gz: aed7958152064cb290c25a5afbcfb287a679a7751a572719b7862e766957cdc21e67274efc551d98cf690a6563a8244c3945855e243660b4427b74d9c96610ff
-  data.tar.gz: 545506b13c8b35825e5bc9a882fdb178a7d4ed3ff4856d03059dab292efe4a512143c328226e6629c91e8303094f95d95ee86208b7aceb36901a772c2660dfac
+  metadata.gz: 4b46ae60ca254852e8ead219ad24984caf61851c3326d68a70282cd01d0a16bc122c1592c6f72a7bd9d43e114caf56272aae0bebb430304f774e3e2f6e329868
+  data.tar.gz: 9487202134ac84b146381fbd8b07e29ed014b45badd3fe6faeefa079d58e4073195b08ab3067344b4c8d81451f97d9899ec37162e680eb5469b0a90b5c167d3c

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (4.1.0)
+    qwtf_discord_bot (4.2.4)
       discordrb (~> 3.3)
-      redis
+      redis (~> 4.1)
       thor (~> 0.20)
 
 GEM
@@ -90,6 +90,7 @@ DEPENDENCIES
   factory_bot
   pry
   qwtf_discord_bot!
+  redis
   rspec
   thor
 

data/README.md

@@ -92,19 +92,20 @@ they haven't been connected for more than ten minutes.
 ![screenshot of bot reporting player joining server](watcher_screenshot.png)
 
 
-## Docker
+## Gem
 
 Build:
 
-    docker build --tag=discord-bot .
+    gem build qwtf_discrd_bot.gemspec
 
 
 Push:
 
-    docker tag discord-bot fortressone/discord-bot:latest
-    docker push fortressone/discord-bot:latest
+    gem push qwtf_discord_bot-$(cat VERSION).gem
 
 
+## Docker
+
 Run:
 
 Assuming a `./config.yaml` file exists:
@@ -128,6 +129,17 @@ Only discord-bot watcher:
       discord-bot watcher
 
 
+Build:
+
+    docker build --tag=discord-bot .
+
+
+Push:
+
+    docker tag discord-bot fortressone/discord-bot:latest
+    docker push fortressone/discord-bot:latest
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/VERSION

@@ -1 +1 @@
-4.2.4
+4.2.5

data/docker-compose.yml

@@ -5,17 +5,17 @@ services:
     image: redis:alpine
     restart: always
   discord-command-bot:
-    image: fortressone/discord-bot:latest
+    image: discord-bot:latest
     command: server
     restart: always
     depends_on:
       - redis
     volumes:
       - type: bind
-        source: ./config.yaml
+        source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"
         target: /discord-bot/config.yaml
   discord-watcher-bot:
-    image: fortressone/discord-bot:latest
+    image: discord-bot:latest
     command: watcher
     restart: always
     depends_on:
@@ -24,5 +24,5 @@ services:
       - REDIS_URL=redis://redis
     volumes:
       - type: bind
-        source: ./config.yaml
+        source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"
         target: /discord-bot/config.yaml

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -8,10 +8,10 @@ class QwtfDiscordBotServer
 
     bot.command :server do |event, *args|
       if args.empty?
-        event.channel.send_message(
-          'Provide a server address e.g. `!server sydney.fortressone.org` ' \
-          'or use `!active` or `!all`'
-        )
+        message = 'Provide a server address e.g. `!server ' \
+          'sydney.fortressone.org` or use `!active` or `!all`'
+        event.channel.send_message(message)
+        puts message
       else
         endpoint = args.first
         qstat_response = QstatRequest.new(endpoint)
@@ -20,10 +20,13 @@ class QwtfDiscordBotServer
 
         if embed
           event.channel.send_embed(message, embed)
+          puts message
         else
           event.channel.send_message(message)
+          puts message
         end
       end
+
     end
 
     bot.command :all do |event|
@@ -34,9 +37,9 @@ class QwtfDiscordBotServer
       end
 
       if endpoints_for_this_channel.empty?
-        event.channel.send_message(
-          'There are no servers associated with this channel'
-        )
+        message = 'There are no servers associated with this channel'
+        event.channel.send_message(message)
+        puts message
       else
         endpoints_for_this_channel.each do |endpoint|
           qstat_request = QstatRequest.new(endpoint.address)
@@ -45,8 +48,10 @@ class QwtfDiscordBotServer
 
           if embed
             event.channel.send_embed(message, embed)
+            puts message
           else
             event.channel.send_message(message)
+            puts message
           end
         end
       end
@@ -62,9 +67,9 @@ class QwtfDiscordBotServer
       end
 
       if endpoints_for_this_channel.empty?
-        event.channel.send_message(
-          'There are no servers associated with this channel'
-        )
+        message = 'There are no servers associated with this channel'
+        event.channel.send_message(message)
+        puts message
       else
         qstat_requests = endpoints_for_this_channel.map do |endpoint|
           QstatRequest.new(endpoint.address)
@@ -75,7 +80,9 @@ class QwtfDiscordBotServer
         end
 
         if servers_with_players.empty?
-          event.channel.send_message("All ##{event.channel.name} servers are empty")
+          message = "All ##{event.channel.name} servers are empty"
+          event.channel.send_message(message)
+          puts message
         else
           servers_with_players.each do |server|
             message = server.server_summary
@@ -83,13 +90,14 @@ class QwtfDiscordBotServer
 
             if embed
               event.channel.send_embed(message, embed)
+              puts message
             else
               event.channel.send_message(message)
+              puts message
             end
           end
         end
       end
-
       return nil
     end
 

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -51,11 +51,15 @@ class QwtfDiscordBotWatcher
   end
 
   def report_joined(name:, channel_id:, server_summary:)
+    message = "#{name} has joined #{server_summary}"
+
     Discordrb::API::Channel.create_message(
       "Bot #{QwtfDiscordBot.config.token}",
       channel_id,
-      "#{name} has joined #{server_summary}"
+      message
     )
+
+    puts message
   end
 
   private

metadata

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