qwtf_discord_bot 6.0.4 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44abd3f52df5308b4ebf30f466541ea533746bd1445b0d0f4da1bcd65899589e
-  data.tar.gz: e343757d9e22e7b012a31ee64ffc5ecbb9a8553b90fa7e9d662203b9bea564e9
+  metadata.gz: 402ebf8fe6c235b94f6e1db48b228f13d0bdece3628873edf943f66f26c9d05c
+  data.tar.gz: 69c5fdad3c21f133a315a1f87ac9b92dc068efd13750e33f144bfdf64bf9ea8f
 SHA512:
-  metadata.gz: 050ad69fb1fadd1620bc12874882579744e6e8dffbf249c22a255f7fd785faf02b3f95d1e3bad6fb612909744bf7ae22c5ca407696170cc567decaa869133da1
-  data.tar.gz: 40e6a6c3657a4c030d93002edc6138406a33980c1d7f37e8fc3465060ba49aecd216dca43b3a8de56bd0c333535dcc7785c564ae617e3584ad0aa60dedbc3181
+  metadata.gz: fd4aa01e8a86d1e0e82b658c26e9f6bbfce16786e00c61bd6069c4be1a03a3a63ab8a05a497bb287cf861d8d0f37f210cf8f52510be5e812a47eba34f728d1a2
+  data.tar.gz: c2c25e668f9de93662ee2ddac5ac43d058c50d49be42647c1c1ec33046b10220cfcb1b3f5678b7d4a52899e99bad8092098f2159478b7435217de86263cea1c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (6.0.4)
+    qwtf_discord_bot (6.1.4)
       discordrb (= 3.4.0)
       redis (~> 4.2)
       thor (~> 1.1)
@@ -93,4 +93,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.2.8
+   2.2.21

data/VERSION

@@ -1 +1 @@
-6.0.4
+6.1.4

data/lib/dashboard.rb

@@ -4,7 +4,6 @@ class Dashboard
     @endpoints = dashboard_config["endpoints"]
     @messages = {}
 
-
     channel_name = dashboard_config["name"]
 
     old_dashboard_channel = @server.channels.find do |chan|

data/lib/pug.rb

@@ -11,17 +11,28 @@ class Pug
   end
 
   def join(player_id)
-    redis.setnx(pug_key, Time.now.to_i)
-    redis.sadd(team_key(0), player_id)
+    timestamp = Time.now.to_i
+    redis.setnx(pug_key, timestamp)
+    redis.zadd(queue_key, timestamp, player_id, nx: true)
   end
 
   def join_team(team_no:, player_id:)
-    redis.setnx(pug_key, Time.now.to_i)
-    leave_teams(player_id)
+    join(player_id)
+    unteam(player_id)
     redis.sadd(team_key(team_no), player_id)
   end
 
-  def joined_players
+  def up_now_players
+    players[0, maxplayers]
+  end
+
+  def destroy_teams
+    teamed_players.each do |player_id|
+      unteam(player_id)
+    end
+  end
+
+  def teamed_players
     teams_keys.inject([]) do |players, team|
       players + redis.smembers(team).map(&:to_i)
     end
@@ -55,16 +66,24 @@ class Pug
     redis.set(teamsize_key, teamsize)
   end
 
+  def total_player_count
+    players.count
+  end
+
   def full?
-    joined_player_count >= maxplayers
+    total_player_count >= maxplayers
+  end
+
+  def has_exactly_maxplayers?
+    total_player_count == maxplayers
   end
 
   def empty?
-    joined_player_count.zero?
+    total_player_count.zero?
   end
 
-  def joined_player_count
-    joined_players.count
+  def teamed_player_count
+    teamed_players.count
   end
 
   def team_player_count(team_no)
@@ -72,11 +91,11 @@ class Pug
   end
 
   def player_slots
-    "#{joined_player_count}/#{maxplayers}"
+    "#{total_player_count}/#{maxplayers}"
   end
 
   def slots_left
-    maxplayers - joined_player_count
+    maxplayers - total_player_count
   end
 
   def game_map=(map)
@@ -104,7 +123,8 @@ class Pug
   end
 
   def leave(player_id)
-    leave_teams(player_id)
+    leave_queue(player_id)
+    unteam(player_id)
   end
 
   def end_pug
@@ -114,13 +134,17 @@ class Pug
   end
 
   def joined?(player_id)
-    joined_players.include?(player_id)
+    redis.zrank(queue_key, player_id)
   end
 
   def maxplayers
     teamsize * no_of_teams
   end
 
+  def queued_players
+    players - teamed_players
+  end
+
   def teams
     all_teams = teams_keys.inject({}) do |teams, team|
       teams.merge({ team.split(':').last.to_i => redis.smembers(team).map(&:to_i) })
@@ -129,16 +153,6 @@ class Pug
     all_teams.sort.to_h
   end
 
-  def actual_teams
-    teams.tap { |team| team.delete(0) }
-  end
-
-  def unteam_all_players
-    joined_players.each do |player_id|
-      join_team(team_no: 0, player_id: player_id)
-    end
-  end
-
   def update_last_result_time
     redis.set(last_result_time_key, Time.now.to_i)
   end
@@ -148,25 +162,37 @@ class Pug
   end
 
   def equal_number_of_players_on_each_team?
-    team_player_counts = actual_teams.map do |_name, players|
+    team_player_counts = teams.map do |_name, players|
       players.size
     end
 
     team_player_counts.uniq.size == 1
   end
 
-  private
-
-  def leave_teams(player_id)
+  def unteam(player_id)
     teams_keys.each do |team|
       redis.srem(team, player_id)
     end
   end
 
+  def players
+    redis.zrange(queue_key, 0, -1).map(&:to_i)
+  end
+
+  private
+
+  def leave_queue(player_id)
+    redis.zrem(queue_key, player_id)
+  end
+
   def teams_keys
     redis.keys([pug_key, 'teams:*'].join(':'))
   end
 
+  def queue_key
+    [pug_key, 'queue'].join(':')
+  end
+
   def team_key(team_no)
     [pug_key, 'teams', team_no].join(':')
   end
@@ -208,6 +234,6 @@ class Pug
   end
 
   def no_of_teams
-    [actual_teams.count, MIN_NO_OF_TEAMS].max
+    [teams.count, MIN_NO_OF_TEAMS].max
   end
 end

data/lib/qstat_request.rb

@@ -11,28 +11,26 @@ class QstatRequest
     @result ||= execute
   end
 
-  def to_embed
-    return nil if is_empty?
-
-    embed = Discordrb::Webhooks::Embed.new
-
-    teams.each do |team|
-      embed << team.to_embed_field
-    end
-
-    embed
-  end
-
   def to_full_embed
     Discordrb::Webhooks::Embed.new.tap do |embed|
       embed.add_field(
         name: name,
-        value: embed_summary,
+        value: join_link,
       )
 
       teams.each do |team|
         embed << team.to_embed_field
       end
+
+      footer = [game_map, "#{numplayers}/#{maxplayers} players"]
+
+      if has_spectators?
+        footer << "#{numspectators}/#{maxspectators} spectators"
+      end
+
+      embed.footer = Discordrb::Webhooks::EmbedFooter.new(
+        text: footer.join(MSG_SNIPPET_DELIMITER)
+      )
     end
   end
 
@@ -43,9 +41,7 @@ class QstatRequest
   end
 
   def server_summary
-    return "#{@endpoint} isn't responding" unless game_map
-
-    info = [name, @endpoint, game_map]
+    info = [name, game_map]
 
     info += if !has_spectators?
               ["#{numplayers}/#{maxplayers}"]
@@ -56,28 +52,13 @@ class QstatRequest
               ]
             end
 
+    info << join_link
+
     info.join(MSG_SNIPPET_DELIMITER)
   end
 
   def join_link
-    "[Join](http://phobos.baseq.fr:9999/join?url=#{@endpoint})"
-  end
-
-  def embed_summary
-    info = [@endpoint, game_map]
-
-    info += if !has_spectators?
-              ["#{numplayers}/#{maxplayers}"]
-            else
-              [
-                "#{numplayers}/#{maxplayers} players",
-                "#{numspectators}/#{maxspectators} spectators"
-              ]
-            end
-
-    info << join_link
-
-    info.join(MSG_SNIPPET_DELIMITER)
+    "<qw://#{@endpoint}>"
   end
 
   def is_empty?
@@ -92,6 +73,10 @@ class QstatRequest
     numplayers && numplayers > 0
   end
 
+  def live_server?
+    !game_map.nil?
+  end
+
   private
 
   def has_spectators?

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -9,6 +9,7 @@ class QwtfDiscordBotPug # :nodoc:
   MSG_SNIPPET_DELIMITER = ' · '
   TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
   TEN_MINUTES = 10 * 60
+  VALID_MENTION = /<@!?\d+>/
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -40,22 +41,15 @@ class QwtfDiscordBotPug # :nodoc:
         end
 
         join_pug(e, pug)
-        start_pug(pug, e) if pug.full?
+        start_pug(pug, e) if pug.has_exactly_maxplayers?
       end
     end
 
     bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
-        if pug.joined_players.count > pug.maxplayers
-          return send_embedded_message(
-            description: "Too many players, increase `!teamsize` or `!kick` extras",
-            channel: event.channel
-          )
-        end
-
-        if pug.joined_players.count.odd?
+        if !pug.full?
           return send_embedded_message(
-            description: "Can't choose teams with odd number of players",
+            description: "Not enough players, reduce !teamsize",
             channel: event.channel
           )
         end
@@ -177,17 +171,17 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        args.each do |arg|
-          unless arg.match(/<@!\d+>/)
+        args.each do |mention|
+          unless mention.match(VALID_MENTION)
             send_embedded_message(
-              description: "#{arg} isn't a valid mention",
+              description: "#{mention} isn't a valid mention",
               channel: e.channel
             )
             next
           end
 
-          user_id = mention_to_user_id(arg)
-          display_name = e.display_name_for(user_id) || arg
+          user_id = mention_to_user_id(mention)
+          display_name = e.display_name_for(user_id) || mention
 
           unless pug.joined?(user_id)
             send_embedded_message(
@@ -257,16 +251,16 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args[1..-1].each do |mention|
-            unless mention.match(/<@!\d+>/)
+            unless mention.match(VALID_MENTION)
               send_embedded_message(
-                description: "#{arg} isn't a valid mention",
+                description: "#{mention} isn't a valid mention",
                 channel: e.channel
               )
               next
             end
 
             user_id = mention_to_user_id(mention)
-            display_name = e.display_name_for(user_id) || arg
+            display_name = e.display_name_for(user_id) || mention
             pug.join_team(team_no: team_no, player_id: user_id)
 
             send_embedded_message(
@@ -279,7 +273,7 @@ class QwtfDiscordBotPug # :nodoc:
           end
         end
 
-        start_pug(pug, e) if !pug_already_full && pug.full?
+        start_pug(pug, e) if !pug_already_full && pug.has_exactly_maxplayers?
       end
     end
 
@@ -302,14 +296,14 @@ class QwtfDiscordBotPug # :nodoc:
             )
           end
 
-          if pug.team(0).include?(user_id)
+          if !pug.teamed_players.include?(user_id)
             return send_embedded_message(
               description: "You aren't in a team",
               channel: e.channel
             )
           end
 
-          pug.join_team(team_no: 0, player_id: user_id)
+          pug.unteam(user_id)
 
           send_embedded_message(
             description: "#{e.display_name} leaves team",
@@ -317,17 +311,25 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args.each do |mention|
-            unless mention.match(/<@!\d+>/)
+            unless mention.match(VALID_MENTION)
               send_embedded_message(
-                description: "#{arg} isn't a valid mention",
+                description: "#{mention} isn't a valid mention",
                 channel: e.channel
               )
               next
             end
 
             user_id = mention_to_user_id(mention)
-            display_name = e.display_name_for(user_id) || arg
-            pug.join_team(team_no: 0, player_id: user_id)
+            display_name = e.display_name_for(user_id) || mention
+
+            unless pug.joined?(user_id)
+              return send_embedded_message(
+                description: "#{display_name} isn't in this PUG",
+                channel: e.channel
+              )
+            end
+
+            pug.unteam(user_id)
 
             send_embedded_message(
               description: "#{display_name} leaves team",
@@ -384,14 +386,14 @@ class QwtfDiscordBotPug # :nodoc:
 
         winning_team_no = args.first.to_i
 
-        if pug.actual_teams.count < 2
+        if pug.teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",
             channel: e.channel
           )
         end
 
-        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
+        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
           end
@@ -444,7 +446,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.actual_teams.count < 2
+        if pug.teams.count < 2
           return send_embedded_message(
             description: "There must be at least two teams with players to submit a result",
             channel: e.channel
@@ -460,7 +462,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
+        team_results = pug.teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
           end
@@ -644,7 +646,7 @@ class QwtfDiscordBotPug # :nodoc:
   def join_pug(e, pug)
     pug.join(e.user_id)
 
-    if pug.joined_player_count == 1
+    if pug.total_player_count == 1
       snippets = ["#{e.display_name} creates a PUG", "#{pug.player_slots} joined"]
       message = pug.notify_roles
     else
@@ -669,7 +671,7 @@ class QwtfDiscordBotPug # :nodoc:
   def choose_fair_teams(pug:, event:, iteration: 0)
     if !pug.full?
       return send_embedded_message(
-        description: "Can't choose teams until PUG is full",
+        description: "Not enough players, reduce !teamsize",
         channel: event.channel
       ) && nil
     end
@@ -680,7 +682,7 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     combinations = get_fair_teams(
-      channel_id: event.channel.id, players: pug.joined_players
+      channel_id: event.channel.id, players: pug.up_now_players
     )
 
     teams = combinations[iteration]
@@ -693,6 +695,8 @@ class QwtfDiscordBotPug # :nodoc:
       ) && nil
     end
 
+    pug.destroy_teams
+
     teams.each do |team_no, player_ids|
       player_ids.each do |player_id|
         pug.join_team(team_no: team_no, player_id: player_id)
@@ -717,6 +721,18 @@ class QwtfDiscordBotPug # :nodoc:
         text: footer
       )
 
+      if pug.queued_players.any?
+        queue_display_names = pug.queued_players.map do |player_id|
+          event.display_name_for(player_id)
+        end
+
+        embed.add_field(
+          inline: true,
+          name: "Queue",
+          value: queue_display_names.join("\n")
+        )
+      end
+
       pug.teams.each do |team_no, player_ids|
         team_display_names = player_ids.map do |player_id|
           event.display_name_for(player_id)
@@ -732,14 +748,14 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
-    choose_fair_teams(pug: pug, event: event) unless pug.actual_teams.any?
+    choose_fair_teams(pug: pug, event: event) unless pug.teams.any?
 
     footer = [
       pug.game_map,
       "#{pug.player_slots} joined",
     ].compact.join(MSG_SNIPPET_DELIMITER)
 
-    mentions = pug.joined_players.map do |player_id|
+    mentions = pug.players.map do |player_id|
       event.mention_for(player_id)
     end
 
@@ -753,6 +769,18 @@ class QwtfDiscordBotPug # :nodoc:
         text: footer
       )
 
+      if pug.queued_players.any?
+        queue_display_names = pug.queued_players.map do |player_id|
+          event.display_name_for(player_id)
+        end
+
+        embed.add_field(
+          inline: true,
+          name: "Queue",
+          value: queue_display_names.join("\n")
+        )
+      end
+
       pug.teams.each do |team_no, player_ids|
         team_mentions = player_ids.map do |player_id|
           event.display_name_for(player_id)

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -16,20 +16,17 @@ class QwtfDiscordBotServer
         message = 'Provide a server address e.g. `!server ' \
           'sydney.fortressone.org` or use `!active` or `!all`'
         event.channel.send_message(message)
-        puts message
+
+        return puts message
+      end
+
+      endpoint = args.first
+      request = QstatRequest.new(endpoint)
+
+      if !request.live_server?
+        event.channel.send_message("#{endpoint} isn't responding")
       else
-        endpoint = args.first
-        qstat_response = QstatRequest.new(endpoint)
-        message = qstat_response.server_summary
-        embed = qstat_response.to_embed
-
-        if embed
-          event.channel.send_embed(message, embed)
-          puts message
-        else
-          event.channel.send_message(message)
-          puts message
-        end
+        event.channel.send_embed(nil, request.to_full_embed)
       end
     end
 
@@ -43,20 +40,16 @@ class QwtfDiscordBotServer
       if endpoints_for_this_channel.empty?
         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)
-          message = qstat_request.server_summary
-          embed = qstat_request.to_embed
-
-          if embed
-            event.channel.send_embed(message, embed)
-            puts message
-          else
-            event.channel.send_message(message)
-            puts message
-          end
+        return puts message
+      end
+
+      endpoints_for_this_channel.each do |endpoint|
+        request = QstatRequest.new(endpoint.address)
+
+        if !request.live_server?
+          event.channel.send_message("#{endpoint} isn't responding")
+        else
+          event.channel.send_embed(nil, request.to_full_embed)
         end
       end
 
@@ -73,35 +66,27 @@ class QwtfDiscordBotServer
       if endpoints_for_this_channel.empty?
         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)
-        end
+        return puts message
+      end
 
-        servers_with_players = qstat_requests.reject do |server|
-          server.is_empty?
-        end
+      qstat_requests = endpoints_for_this_channel.map do |endpoint|
+        QstatRequest.new(endpoint.address)
+      end
 
-        if servers_with_players.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
-            embed = server.to_embed
-
-            if embed
-              event.channel.send_embed(message, embed)
-              puts message
-            else
-              event.channel.send_message(message)
-              puts message
-            end
-          end
-        end
+      servers_with_players = qstat_requests.reject do |server|
+        server.is_empty?
       end
+
+      if servers_with_players.empty?
+        message = "All ##{event.channel.name} servers are empty"
+        event.channel.send_message(message)
+        return puts message
+      end
+
+      servers_with_players.each do |server|
+        event.channel.send_embed(nil, server.to_full_embed)
+      end
+
       return nil
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.1.4
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb