qwtf_discord_bot 5.1.4 → 5.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2764268ae2786e3217f973d14b910bbed79dd4b1d4b822ebaee31b4f555c9945
-  data.tar.gz: ec2f3fd80b0eaaa222ca9cac071763ef3220190991f94e37a112025002b76cec
+  metadata.gz: 9f929cda85f6a53ffc63d04e3a85b6ca4bcbcadf72b2c0ab70eab8a1a549843a
+  data.tar.gz: 45b0e4b9bba67fdfb8139d3904176ce3443d43ea7cb74c750588f4eb6ea1fb8d
 SHA512:
-  metadata.gz: 7d86a1207ec73b9225c0a72d530000a6e7ce3297e490bbb914dd45f181be7b1a214c67242b35274545c1f92c4d11911c42e5b6434fc5ecc1dddae33303bfff72
-  data.tar.gz: b654a7a3c136c4847dd9aefc0f4e7e695b7f7dc4a8a8ad521535096d10385c17397f2324bb0a65393da99207934f719523b00a9a1754dd76a368d5bd0001ce75
+  metadata.gz: cca2b1392fbbdca102e22ea27e79774da07478e5cfa2a9a2ee14c4b6ae48ae1ea3c8e4c8906461d123a1f32f3e2e0cef519f107a3b7abf42d1853a5e870bf342
+  data.tar.gz: d29bd7a09c9ffed879429965497118d0f63332bac8084c83ea498601d924d11227adad67694de73f97658b73ed9c7c90236fc855bb8c82a809a522fe0ecb78f6

data/README.md

@@ -89,8 +89,9 @@ This responds to discord messages:
   - `!join`
   - `!leave`
   - `!status`
-  - `!maxplayers <no_of_players>`
-  - `!notify <roles>`
+  - `!kick <@player>`
+  - `!teamsize <no_of_players>`
+  - `!notify <@role @role2>`
   - `!end`
 
 

data/VERSION

@@ -1 +1 @@
-5.1.4
+5.1.11

data/lib/event_decorator.rb

@@ -24,13 +24,19 @@ 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)
     find_users(user_ids).map(&:display_name)
   end
 
+  def display_name_for(user_id)
+    find_user(user_id) && find_user(user_id).display_name
+  end
+
   private
 
   def find_users(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?
@@ -56,10 +66,7 @@ class Pug
 
   def leave(player_id)
     redis.srem(players_key, player_id)
-  end
-
-  def empty?
-    joined_player_count == 0
+    end_pug if empty?
   end
 
   def end_pug
@@ -67,10 +74,22 @@ class Pug
     redis.del(players_key)
   end
 
+  def joined?(player_id)
+    joined_players.include?(player_id)
+  end
+
+  def maxplayers
+    teamsize * NO_OF_TEAMS
+  end
+
   private
 
-  def maxplayers_key
-    [pug_key, "maxplayers"].join(":")
+  def empty?
+    joined_player_count.zero?
+  end
+
+  def teamsize_key
+    [pug_key, "teamsize"].join(":")
   end
 
   def players_key
@@ -85,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

@@ -6,8 +6,6 @@ require 'event_decorator'
 class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
-  FOUR_HOURS = 4 * 60 * 60
-
   def run
     bot = Discordrb::Commands::CommandBot.new(
       token: QwtfDiscordBot.config.token,
@@ -17,131 +15,143 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :join do |event, *args|
-      set_pug(event) do |e, pug|
-        if pug.joined_players.include?(e.user_id)
-          message = "You've already joined"
-          send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg("You've already joined", e.channel) if pug.joined?(e.user_id)
+
+        pug.join(e.user_id)
+
+        if pug.joined_player_count == 1
+          snippets = ["#{e.display_name} creates a PUG", pug.player_slots, pug.notify_roles]
         else
-          pug.join(e.user_id)
-
-          message = if pug.joined_player_count == 1
-                      [
-                        "#{e.display_name} creates a PUG",
-                        pug.player_slots,
-                        pug.notify_roles
-                      ].join(' | ')
-                    elsif pug.slots_left.between?(1,3)
-                      [
-                        "#{e.display_name} joins the PUG",
-                        pug.player_slots,
-                        "#{pug.slots_left} more",
-                        pug.notify_roles
-                      ].join(' | ')
-                    else
-                      [
-                        "#{e.display_name} joins the PUG",
-                        pug.player_slots
-                      ].join(' | ')
-                    end
-
-          send_and_log_message(message, e.channel)
-
-          if pug.full?
-            message = start_pug(
-              pug.player_slots,
-              e.mentions_for(pug.joined_players)
-            )
-
-            send_and_log_message(message, e.channel)
-          end
+          snippets = ["#{e.display_name} joins the PUG", pug.player_slots]
+          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
         end
+
+        send_msg(snippets.join(' | '), e.channel)
+
+        start_pug(pug, e) if pug.full?
       end
     end
 
     bot.command :status do |event, *args|
-      set_pug(event) do |e, pug|
-        message = if pug.active?
-                    [
-                      "#{e.display_names_for(pug.joined_players).join(', ')} joined",
-                      pug.player_slots
-                    ].join(' | ')
-                  else
-                    'No PUG has been started. `!join` to create'
-                  end
-
-        send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        msg = if pug.active?
+                [
+                  "#{e.display_names_for(pug.joined_players).join(', ')} joined",
+                  pug.player_slots
+                ].join(' | ')
+              else
+                'No PUG has been started. `!join` to create'
+              end
+
+        send_msg(msg, e.channel)
       end
     end
 
-    bot.command :maxplayers do |event, *args|
-      set_pug(event) do |e, pug|
-        new_maxplayers = 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
+    bot.command :teamsize do |event, *args|
+      setup_pug(event) do |e, pug|
+        new_teamsize = args[0]
 
-        send_and_log_message(message, e.channel)
+        if new_teamsize
+          pug.teamsize = new_teamsize
 
-        if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            e.mentions_for(pug.joined_players)
+          send_msg(
+            "Team size set to #{pug.teamsize} | #{pug.player_slots} joined",
+            e.channel
           )
 
-          send_and_log_message(message, e.channel)
+          start_pug(pug, e) if pug.full?
+        else
+          send_msg(
+            "Current team size is #{pug.teamsize} | #{pug.player_slots} joined",
+            e.channel
+          )
         end
       end
     end
 
     bot.command :leave do |event, *args|
-      set_pug(event) do |e, pug|
-        if !pug.active?
-          message = "There's no active PUG to leave"
-          send_and_log_message(message, e.channel)
-        elsif !pug.joined_players.include?(e.user_id)
-          message = "You're not in the PUG"
-          send_and_log_message(message, e.channel)
-        else
-          pug.leave(e.user_id)
-          message = "#{e.display_name} leaves the PUG | #{pug.player_slots} remain"
-          send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_msg("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
+
+        pug.leave(e.user_id)
+
+        snippets = [
+          "#{e.display_name} leaves the PUG",
+          "#{pug.player_slots} remain"
+        ]
+
+        snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+        send_msg(
+          snippets.join(' | '),
+          e.channel
+        )
+
+        send_msg(end_pug_message, e.channel) unless pug.active?
+      end
+    end
 
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, e.channel)
+    bot.command :kick do |event, *args|
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        args.each do |arg|
+          unless arg.match(/<@!\d+>/)
+            send_msg("#{arg} isn't a valid mention", e.channel)
+            next
           end
+
+          user_id = arg[3..-2].to_i
+          display_name = e.display_name_for(user_id) || arg
+
+          unless pug.joined?(user_id)
+            send_msg("#{display_name} isn't in the PUG", e.channel)
+            next
+          end
+
+          pug.leave(user_id)
+
+          snippets = [
+            "#{display_name} is kicked from the PUG",
+            "#{pug.player_slots} remain"
+          ]
+
+          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+          send_msg(
+            snippets.join(' | '),
+            e.channel
+          )
+
+          break send_msg(end_pug_message, e.channel) unless pug.active?
         end
       end
     end
 
     bot.command :end do |event, *args|
-      set_pug(event) do |e, pug|
-        message = if !pug.active?
-                    "There's no active PUG to end"
-                  else
-                    end_pug(pug)
-                  end
-
-        send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        pug.end_pug
+
+        send_msg(end_pug_message, e.channel)
       end
     end
 
     bot.command :notify do |event, *args|
-      set_pug(event) do |e, pug|
+      setup_pug(event) do |e, pug|
         roles = args.join(' ')
         pug.notify_roles = roles
 
-        message = if roles.empty?
-                    'Notification removed'
-                  else
-                    "Notification role set to #{roles}"
-                  end
+        msg = if roles.empty?
+                'Notification removed'
+              else
+                "Notification role set to #{roles}"
+              end
 
-        send_and_log_message(message, e.channel)
+        send_msg(msg, e.channel)
       end
     end
 
@@ -150,26 +160,36 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
-  def set_pug(event)
+  def setup_pug(event)
     e = EventDecorator.new(event)
     pug = Pug.for(e.channel_id)
     yield(e, pug)
+    nil # stop discordrb printing return value
   end
 
-  def start_pug(player_slots, mentions)
-    [
+  def start_pug(pug, event)
+    msg = [
       'Time to play!',
-      player_slots,
-      mentions.join(' ')
-    ].join(' | ')
+      ['Team 1:', event.mentions_for(pug.team(1)).join(' ')].join(' '),
+      ['Team 2:', event.mentions_for(pug.team(2)).join(' ')].join(' ')
+    ].join("\n")
+
+    send_msg(msg, event.channel)
   end
 
-  def end_pug(pug)
-    pug.end_pug
+  def start_pug_send_msg(player_slots:, mentions:)
+    ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
+  end
+
+  def end_pug_message
     'PUG ended'
   end
 
-  def send_and_log_message(message, channel)
+  def no_active_pug_message
+    "There's no active PUG"
+  end
+
+  def send_msg(message, channel)
     channel.send_message(message) && puts(message)
   end
 end

metadata

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