qwtf_discord_bot 5.1.8 → 5.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfcb9cea490b3e0de6db8028dbe88bdc5989186b97225f92f9a87cf0e0eeb05a
-  data.tar.gz: 814fc6269bec9872b68fed72b96a78322735534cb8969f7e1d74618aa9fef5cc
+  metadata.gz: 874aab5dba875e61f9dfd5500d91a25149a7b08a8a91854402080d4775cc1b24
+  data.tar.gz: e68aa880053d9bffbfb563fa6bcdaa060b89d91051e6955615f89543a30e1530
 SHA512:
-  metadata.gz: d853f68c400f0ec91e7da0185c77a98e96958168c6057143d646d0f007c3496b9cab2a8f20936c6d4d504a82e9bdd76234949358a5bf5c58b07d79dd7eab7fe6
-  data.tar.gz: 334b46c0db3144f305c19f0d24923c4a487460fdac0413ded541aafb80edde9fcbb8835499fc29f7723e5730771c411951383a764e6bb78418a236ccf09448c9
+  metadata.gz: aae1ed1e4fa7e631a4903fb7fdfb933b51bf127ee3de0d3b8497f39d3d6d36c16dcd23db18664a724375bb454ac60bca7467ce0f34bfbcfe7c55b278ece01660
+  data.tar.gz: 7426320e57d72affc5170ed20a7cd4a0d0ff1711c2103cfe88c85d8c646e5900725860d4c8644653cc53ce610a8f0b18cd88e1db8550d96c80df05e271532f72

data/README.md

@@ -90,7 +90,7 @@ This responds to discord messages:
   - `!leave`
   - `!status`
   - `!kick <@player>`
-  - `!maxplayers <no_of_players>`
+  - `!teamsize <no_of_players>`
   - `!notify <@role @role2>`
   - `!end`
 

data/VERSION

@@ -1 +1 @@
-5.1.8
+5.1.9

data/lib/event_decorator.rb

@@ -24,7 +24,9 @@ class EventDecorator
   end
 
   def mentions_for(user_ids)
-    find_users(user_ids).map(&:mention)
+    find_users(user_ids).map do |user|
+      user&.mention
+    end
   end
 
   def display_names_for(user_ids)

data/lib/pug.rb

@@ -1,5 +1,6 @@
 class Pug
-  DEFAULT_MAXPLAYERS = 8
+  DEFAULT_teamsize = 4
+  NO_OF_TEAMS = 2
 
   def self.for(channel_id)
     new(channel_id)
@@ -18,6 +19,15 @@ class Pug
     redis.smembers(players_key).map(&:to_i)
   end
 
+  def team(no)
+    index = no - 1
+    joined_players.each_slice(teamsize).to_a[index]
+  end
+
+  def teamsize=(teamsize)
+    redis.set(teamsize_key, teamsize)
+  end
+
   def full?
     joined_player_count >= maxplayers
   end
@@ -42,12 +52,12 @@ class Pug
     redis.get(notify_roles_key) || "@here"
   end
 
-  def maxplayers=(maxplayers)
-    redis.set(maxplayers_key, maxplayers)
+  def teamsize=(teamsize)
+    redis.set(teamsize_key, teamsize)
   end
 
-  def maxplayers
-    (redis.get(maxplayers_key) || DEFAULT_MAXPLAYERS).to_i
+  def teamsize
+    (redis.get(teamsize_key) || DEFAULT_teamsize).to_i
   end
 
   def active?
@@ -68,14 +78,18 @@ class Pug
     joined_players.include?(player_id)
   end
 
+  def maxplayers
+    teamsize * NO_OF_TEAMS
+  end
+
   private
 
   def empty?
     joined_player_count.zero?
   end
 
-  def maxplayers_key
-    [pug_key, "maxplayers"].join(":")
+  def teamsize_key
+    [pug_key, "teamsize"].join(":")
   end
 
   def players_key
@@ -90,6 +104,10 @@ class Pug
     [pug_key, "role"].join(":")
   end
 
+  def teamsize_key
+    [pug_key, "teamsize"].join(":")
+  end
+
   def redis
     Redis.current
   end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -42,14 +42,7 @@ class QwtfDiscordBotPug # :nodoc:
 
         message(message, e.channel)
 
-        if pug.full?
-          message = start_pug_message(
-            player_slots: pug.player_slots,
-            mentions: e.mentions_for(pug.joined_players)
-          )
-
-          message(message, e.channel)
-        end
+        start_pug(pug, e) if pug.full?
       end
     end
 
@@ -68,26 +61,22 @@ class QwtfDiscordBotPug # :nodoc:
       end
     end
 
-    bot.command :maxplayers do |event, *args|
+    bot.command :teamsize do |event, *args|
       setup_pug(event) do |e, pug|
-        new_maxplayers = args[0]
+        new_teamsize = args[0]
 
-        message = if new_maxplayers
-                    pug.maxplayers = new_maxplayers
-                    "Max number of players set to #{pug.maxplayers} | #{pug.player_slots} joined"
-                  else
-                    "Current max number of players is #{pug.maxplayers} | #{pug.player_slots} joined"
-                  end
-
-        message(message, e.channel)
-
-        if pug.full?
-          message = start_pug_message(
-            player_slots: pug.player_slots,
-            mentions: e.mentions_for(pug.joined_players)
+        if new_teamsize
+          pug.teamsize = new_teamsize
+          message(
+            "Team size set to #{pug.teamsize} | #{pug.player_slots} joined",
+            e.channel
+          )
+          start_pug(pug, e) if pug.full?
+        else
+          message(
+            "Current team size is #{pug.teamsize} | #{pug.player_slots} joined",
+            e.channel
           )
-
-          message(message, e.channel)
         end
       end
     end
@@ -174,6 +163,17 @@ class QwtfDiscordBotPug # :nodoc:
     nil # stop discordrb printing return value
   end
 
+  def start_pug(pug, event)
+    message(
+      [
+        'Time to play!',
+        ['Team 1:', event.mentions_for(pug.team(1)).join(' ')].join(' '),
+        ['Team 2:', event.mentions_for(pug.team(2)).join(' ')].join(' ')
+      ].join("\n"),
+      event.channel
+    )
+  end
+
   def start_pug_message(player_slots:, mentions:)
     ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
   end

metadata

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