qwtf_discord_bot 5.1.3 → 5.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea5f5046690139982d6f1d8324c4b4d312d6d21f5c5d6f3734211038454db8b7
-  data.tar.gz: 9ce6466357c99b25415f55b0eed27edd3acd8bc4e741045bfcb3cc85cbb34509
+  metadata.gz: 874aab5dba875e61f9dfd5500d91a25149a7b08a8a91854402080d4775cc1b24
+  data.tar.gz: e68aa880053d9bffbfb563fa6bcdaa060b89d91051e6955615f89543a30e1530
 SHA512:
-  metadata.gz: 19428a1ac12bb6da56fbebaf8e47420f49514aa579b208c8063832d41d5a8948a3dc112358a8e4c8f5ab2fa4693c6521cc89ecddf4087a02e60bcc8862c47fc9
-  data.tar.gz: 22d259fa928093d9eec63eb1896b1e9ec7edf32e4ef8fe5e198d3b4a882c670641e9690755ed15fea49fcee9328b2999406d8a4cc9f7d8fb719c7c34ced5bfcd
+  metadata.gz: aae1ed1e4fa7e631a4903fb7fdfb933b51bf127ee3de0d3b8497f39d3d6d36c16dcd23db18664a724375bb454ac60bca7467ce0f34bfbcfe7c55b278ece01660
+  data.tar.gz: 7426320e57d72affc5170ed20a7cd4a0d0ff1711c2103cfe88c85d8c646e5900725860d4c8644653cc53ce610a8f0b18cd88e1db8550d96c80df05e271532f72

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.3
+5.1.9

data/lib/event_decorator.rb

@@ -11,8 +11,8 @@ class EventDecorator
     @event.channel.id
   end
 
-  def username
-    user.username
+  def display_name
+    user.display_name
   end
 
   def user_id
@@ -24,11 +24,17 @@ 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 usernames_for(user_ids)
-    find_users(user_ids).map(&:username)
+  def display_name_for(user_id)
+    find_user(user_id).display_name
   end
 
   private

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,121 +15,129 @@ 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)
-        else
-          pug.join(e.user_id)
-
-          message = if pug.joined_player_count == 1
-                      [
-                        "#{e.username} creates a PUG",
-                        pug.player_slots,
-                        pug.notify_roles
-                      ].join(' | ')
-                    elsif pug.slots_left.between?(1,3)
-                      [
-                        "#{e.username} joins the PUG",
-                        pug.player_slots,
-                        "#{pug.slots_left} more",
-                        pug.notify_roles
-                      ].join(' | ')
-                    else
-                      [
-                        "#{e.username} 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)
-            )
+      setup_pug(event) do |e, pug|
+        return message("You've already joined", e.channel) if pug.joined?(e.user_id)
 
-            send_and_log_message(message, e.channel)
-          end
-        end
+        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
+
+        message(message, e.channel)
+
+        start_pug(pug, e) if pug.full?
       end
     end
 
     bot.command :status do |event, *args|
-      set_pug(event) do |e, pug|
+      setup_pug(event) do |e, pug|
         message = if pug.active?
                     [
-                      "#{e.usernames_for(pug.joined_players).join(', ')} joined",
+                      "#{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)
+        message(message, e.channel)
       end
     end
 
-    bot.command :maxplayers do |event, *args|
-      set_pug(event) do |e, pug|
-        new_maxplayers = args[0]
+    bot.command :teamsize do |event, *args|
+      setup_pug(event) do |e, pug|
+        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
-
-        send_and_log_message(message, e.channel)
-
-        if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            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
           )
-
-          send_and_log_message(message, 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.username} leaves the PUG | #{pug.player_slots} remain"
-          send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return message(no_active_pug_message, e.channel) unless pug.active?
+        return message("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
+
+        pug.leave(e.user_id)
+
+        message(
+          "#{e.display_name} leaves the PUG | #{pug.player_slots} remain",
+          e.channel
+        )
+
+        message(end_pug_message, e.channel) unless pug.active?
+      end
+    end
+
+    bot.command :kick do |event, *args|
+      setup_pug(event) do |e, pug|
+        return message(no_active_pug_message, e.channel) unless pug.active?
+
+        args.each do |mention|
+          user_id = mention[3..-2].to_i
+          display_name = e.display_name_for(user_id)
 
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, e.channel)
+          unless pug.joined?(user_id)
+            message(
+              "#{display_name} isn't in the PUG",
+              e.channel
+            )
+
+            next
           end
+
+          pug.leave(user_id)
+
+          message(
+            "#{display_name} is kicked from the PUG | #{pug.player_slots} remain",
+            e.channel
+          )
+
+          break message(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
+      setup_pug(event) do |e, pug|
+        return message(no_active_pug_message, e.channel) unless pug.active?
+
+        pug.end_pug
 
-        send_and_log_message(message, e.channel)
+        message(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
 
@@ -141,7 +147,7 @@ class QwtfDiscordBotPug # :nodoc:
                     "Notification role set to #{roles}"
                   end
 
-        send_and_log_message(message, e.channel)
+        message(message, e.channel)
       end
     end
 
@@ -150,26 +156,37 @@ 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)
-    [
-      'Time to play!',
-      player_slots,
-      mentions.join(' ')
-    ].join(' | ')
+  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
 
-  def end_pug(pug)
-    pug.end_pug
+  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 message(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.3
+  version: 5.1.9
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb