qwtf_discord_bot 5.5.5 → 5.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f51fa8d63ad6a2e6e0e08e3e83c851930694ba6208a70469d95f3322f3a5215
-  data.tar.gz: f0d9139fab06e85aae6fe4d563cff3a13acd7ae88e0ba680c2add202a7c541e7
+  metadata.gz: ebe547dbec4ffa7cf1974c4c7286249329dec4a0947569281c811cef8bf170c8
+  data.tar.gz: fcefedfbb7f73aff24ed6765dbd4e0da18cfb296ac1978d97ddbf054db4c5b47
 SHA512:
-  metadata.gz: 0ac22beba9007bc30f809e3ab82ad382e078ba8036c71f91474ccad8b301b0b850a0b04dfa0529bfc4755aaa84bf82769846c72706dca4dcd7ca1c301f271457
-  data.tar.gz: 341a554d68f4680b09d22dcdc08f16c711c6d86271811e66810d61f6660d628a1cac7a656ba23724e593d1ec638dd7512484cc5af2007ce6d1897b58cba30e64
+  metadata.gz: c805e76c390c327d8b6ed53c6a757fa2d844561fe8a65d074874420800e9dedddaac1a70aafcc00f84d8cbda4587913d34342554bd70bd8de3c3a8dd6d5adf6b
+  data.tar.gz: 66165f24f18f1e910a35420767a0f86db1d5fcf9d404091e93775490287daff90999e2fcc6efd5e06c8ca3197591d0b0f90964a127bcd60c66765b7820552b73

data/README.md

@@ -56,6 +56,13 @@ A Discord bot for checking the status of QuakeWorld Team Fortress servers
       hwguy: "<:hwguy_blue:456062063190736926>"
       spy: "<:spy_blue:456062062032846849>"
       engineer: "<:engineer_blue:456062031125020683>"
+  dashboards:
+    - server_id: 744911007859736616
+      name: "active-servers"
+      endpoints:
+        - "sydney.fortressone.org"
+        - "sydney.fortressone.org:27510"
+        - "dallas.fortressone.org"
   ```
 
 - Use  the `QWTF_DISCORD_BOT_CONFIG_FILE` environment variable to specify an

data/VERSION

@@ -1 +1 @@
-5.5.5
+5.5.10

data/lib/dashboard.rb

@@ -1,9 +1,31 @@
 class Dashboard
-  def initialize(channel, bot)
-    @channel_id = channel["id"]
-    @endpoints = channel["endpoints"]
-    @bot = bot
+  def initialize(dashboard_config, bot)
+    @server = bot.server(dashboard_config["server_id"])
+    @endpoints = dashboard_config["endpoints"]
     @messages = {}
+
+    channel_name = dashboard_config["name"]
+
+    old_dashboard_channel = @server.channels.find do |chan|
+      chan.name == channel_name
+    end
+
+    @channel = if old_dashboard_channel
+      position = old_dashboard_channel.position
+      topic = old_dashboard_channel.topic
+      category = old_dashboard_channel.category
+      old_dashboard_channel.delete
+
+      @server.create_channel(channel_name).tap do |channel|
+        channel.position = position
+        channel.topic = topic if topic
+        channel.category = category if category
+      end
+    else
+      @server.create_channel(channel_name).tap do |channel|
+        channel.topic = "QWTF Bot Dashboard"
+      end
+    end
   end
 
   def update
@@ -24,21 +46,8 @@ class Dashboard
       @messages[endpoint] = if @messages[endpoint]
                               @messages[endpoint].edit(nil, embed)
                             else
-                              channel.send_embed(nil, embed)
+                              @channel.send_embed(nil, embed)
                             end
     end
   end
-
-  private
-
-  def channel
-    @channel ||= begin
-                   data = Discordrb::API::Channel.resolve(
-                     "Bot #{QwtfDiscordBot.config.token}",
-                     @channel_id
-                   )
-
-                   Discordrb::Channel.new(JSON.parse(data), @bot)
-                 end
-  end
 end

data/lib/qwtf_discord_bot/qwtf_discord_bot_dashboard.rb

@@ -17,8 +17,10 @@ class QwtfDiscordBotDashboard
       end
     )
 
-    @dashboards ||= QwtfDiscordBot.config.dashboards.map do |channel|
-      Dashboard.new(channel, bot)
+    bot.run(true)
+
+    @dashboards ||= QwtfDiscordBot.config.dashboards.map do |dashboard_config|
+      Dashboard.new(dashboard_config, bot)
     end
 
     every(THIRTY_SECONDS) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.5
+  version: 5.5.10
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb