qwtf_discord_bot 5.5.9 → 5.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f422f497d757dbe1261a8dc201cf5888b289e00ca035e52fadc118a2d3712e2b
-  data.tar.gz: 2f13079b2d29f3e14cbfb6a0b77d366a056b25b4cafe39024d9ba257cc7f9f45
+  metadata.gz: 3106f91d2202ab45546b2b082f865db04dc8bf5e69c165101dd6e23f1fa4e9c7
+  data.tar.gz: 012b9c79d830fdcc7c2ff70a6dcdc7fe8e8e16039571723dce5ff23f71f6996e
 SHA512:
-  metadata.gz: 34215aa47c79a975411282e1c8bfdbc238696a52700994e3a7d0432169899df1d9c68419d16f20a3c2f302707fe9e55b8e5276433671d4200b2b45dac196dd09
-  data.tar.gz: 66dd099b4cf81b35d273dc49a40efacc9249163f9a4e715e43c5c2a708c40203af0d84a6d4c4aec648085f2fe3274417a2c82edf2ce79d450b1a8c57349c5525
+  metadata.gz: a8dfbdf3eac06edf1641e74984d43ddf210978f51d3879c1628ed38fab29b118a8b5fb3fc8938a841d2fc5884d270d05a17b25334870c84e3c7998557ffe17fa
+  data.tar.gz: '000608afc046e58aa735fefc2cb7c4a5d13709e1b1abc93cc9bae1791d7184e33956ed54ff798f56ce700f7827b8a272108c7b24c95438677eb89ff7ef494f3d'

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.9
+5.5.14

data/lib/dashboard.rb

@@ -12,14 +12,14 @@ class Dashboard
 
     @channel = if old_dashboard_channel
       position = old_dashboard_channel.position
-      category = old_dashboard_channel.category
       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.category = category
-        channel.topic = topic
+        channel.topic = topic if topic
+        channel.category = category if category
       end
     else
       @server.create_channel(channel_name).tap do |channel|

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.9
+  version: 5.5.14
 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