qwtf_discord_bot 5.5.8 → 5.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06567aa4454662e96cbae7770c8a597ede04411a67aef13d2b0c33d302764245
-  data.tar.gz: edde03293e5e55dd1286211865963dc5207d99d66d229cfe8fb1c3ff1d50a6fa
+  metadata.gz: 43f3e7db0dcde510ced3d8854582e00e5cb38dc231495dc70d9b5b70f7f9627a
+  data.tar.gz: d159cfc3dae171fe78eaf7c0cece4d7ae38d6e1927a05bb67e2aa37eb2cc334d
 SHA512:
-  metadata.gz: e91adf93822c32750f90121bc73daa98bebd9557429efb06a38d743408c703d4d6666573e41c08469c13fe8bceaf6ec5f6b7540bb3a429b5bfa41ccfa64ca2d6
-  data.tar.gz: 40feb730c272acbd1957bb0a340d6869740c2e41fed8b24d1f541050b59f9af778fdbf127ef5a43ddc789541e7053133d158db75c054860d7fe5360714ba8917
+  metadata.gz: 949ad6ac34383e8b284705f80c79e59b4aed603755a901e47744de5c9dac0e9407cfe3fdfffef158631c4bb762ac693d4f2455a90fb7fda42af592635260f4bd
+  data.tar.gz: 8beb3374d086b15923a0d443c08b970a3a0e60fd2c63aa825cb66a0cde3261ae569e18d8d9792add082b365285becb2eaee898ad8651a59c4f70eb00e4d052bc

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.8
+5.5.13

data/lib/dashboard.rb

@@ -4,15 +4,28 @@ class Dashboard
     @endpoints = dashboard_config["endpoints"]
     @messages = {}
 
+    channel_name = dashboard_config["name"]
+
     old_dashboard_channel = @server.channels.find do |chan|
-      chan.name == dashboard_config["name"] && chan.topic = "QWTF Bot Dashboard"
+      chan.name == channel_name
     end
 
-    old_dashboard_channel && old_dashboard_channel.delete
+    @channel = if old_dashboard_channel
+      position = old_dashboard_channel.position
+      topic = old_dashboard_channel.topic
+      category = old_dashboard_channel.category
+      old_dashboard_channel.delete
 
-    @channel = @server.create_channel(dashboard_config["name"])
-    @channel.topic = "QWTF Bot Dashboard"
-    @channel.position = dashboard_config["position"]
+      @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

data/lib/pug.rb

@@ -16,6 +16,7 @@ class Pug
   end
 
   def join_team(team_no:, player_id:)
+    redis.setnx(pug_key, Time.now.to_i)
     leave_teams(player_id)
     redis.sadd(team_key(team_no), player_id)
   end
@@ -146,6 +147,14 @@ class Pug
     redis.get(last_result_time_key).to_i
   end
 
+  def equal_number_of_players_on_each_team?
+    team_player_counts = actual_teams.map do |_name, players|
+      players.size
+    end
+
+    team_player_counts.uniq.size == 1
+  end
+
   private
 
   def leave_teams(player_id)

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -356,6 +356,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if pug.equal_number_of_players_on_each_team?
+          return send_embedded_message(
+            description: "Can't report unless teams have same number of players",
+            channel: event.channel
+          )
+        end
+
         unless ["1", "2"].any?(args.first)
           return send_embedded_message(
             description: "Invalid team number",
@@ -429,6 +436,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if pug.equal_number_of_players_on_each_team?
+          return send_embedded_message(
+            description: "Can't report unless teams have same number of players",
+            channel: event.channel
+          )
+        end
+
         if pug.actual_teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",

metadata

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