qwtf_discord_bot 6.0.4 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44abd3f52df5308b4ebf30f466541ea533746bd1445b0d0f4da1bcd65899589e
-  data.tar.gz: e343757d9e22e7b012a31ee64ffc5ecbb9a8553b90fa7e9d662203b9bea564e9
+  metadata.gz: a2cbd2052764c82fc832ccac617eb4a2c26e2861827c95b430ee0ad341274027
+  data.tar.gz: 4d67b365bda23d496afd20ea375a2486f52fe1b59cf29f6844435254cc7cacb6
 SHA512:
-  metadata.gz: 050ad69fb1fadd1620bc12874882579744e6e8dffbf249c22a255f7fd785faf02b3f95d1e3bad6fb612909744bf7ae22c5ca407696170cc567decaa869133da1
-  data.tar.gz: 40e6a6c3657a4c030d93002edc6138406a33980c1d7f37e8fc3465060ba49aecd216dca43b3a8de56bd0c333535dcc7785c564ae617e3584ad0aa60dedbc3181
+  metadata.gz: 1dbde41666f182f177cdc0a5d7e4329388769515e238918be21f7f5dd203f974c43034c95f7b02b0fa965d49885e06e435b5aec0a8a14bff9f87f33068b3ae4b
+  data.tar.gz: 2080539c53ec3a5225e000aa872860613b90aa50616fcf006c356835b78e2f2ccc9570a8f902d3bdcafe602ca48e83957e12703017ee71c11010b4585150f153

data/VERSION

@@ -1 +1 @@
-6.0.4
+6.1.0

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,20 @@ 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 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 +87,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 +119,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 +130,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 +149,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 +158,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 +230,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/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -46,16 +46,9 @@ class QwtfDiscordBotPug # :nodoc:
 
     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
@@ -302,14 +295,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",
@@ -327,7 +320,7 @@ class QwtfDiscordBotPug # :nodoc:
 
             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)
+            pug.unteam(user_id)
 
             send_embedded_message(
               description: "#{display_name} leaves team",
@@ -384,14 +377,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 +437,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 +453,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 +637,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 +662,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 +673,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 +686,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 +712,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 +739,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 +760,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)

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.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb