qwtf_discord_bot 5.1.2 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a23eb8820860898165bbdf94e448a7141449fa3850a8e66f079e93ca8590f0f
-  data.tar.gz: 33ea995e466b5379746ee57b12e24f3337581dd0c58e4e526b30eb2a9377778d
+  metadata.gz: cfcb9cea490b3e0de6db8028dbe88bdc5989186b97225f92f9a87cf0e0eeb05a
+  data.tar.gz: 814fc6269bec9872b68fed72b96a78322735534cb8969f7e1d74618aa9fef5cc
 SHA512:
-  metadata.gz: 53393cfca043b1ff72cbc2a7f9e28d9a7f4c44381990ba23edf392f23afb84c66715e5ff274573d16587797fad5c9e76739edb67039eb72106f4767faf95e368
-  data.tar.gz: ae90377b7c6c4592e6811a91461ab13a3e8650d17c36a67f8c45717930e2956c738123c16db087c036508a0da1898fc0d0a1f5efac71a9149ce809da8d277067
+  metadata.gz: d853f68c400f0ec91e7da0185c77a98e96958168c6057143d646d0f007c3496b9cab2a8f20936c6d4d504a82e9bdd76234949358a5bf5c58b07d79dd7eab7fe6
+  data.tar.gz: 334b46c0db3144f305c19f0d24923c4a487460fdac0413ded541aafb80edde9fcbb8835499fc29f7723e5730771c411951383a764e6bb78418a236ccf09448c9

data/README.md

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

data/VERSION

@@ -1 +1 @@
-5.1.2
+5.1.8

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
@@ -27,8 +27,12 @@ class EventDecorator
     find_users(user_ids).map(&:mention)
   end
 
-  def usernames_for(user_ids)
-    find_users(user_ids).map(&:username)
+  def display_names_for(user_ids)
+    find_users(user_ids).map(&:display_name)
+  end
+
+  def display_name_for(user_id)
+    find_user(user_id).display_name
   end
 
   private

data/lib/pug.rb

@@ -56,10 +56,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,8 +64,16 @@ class Pug
     redis.del(players_key)
   end
 
+  def joined?(player_id)
+    joined_players.include?(player_id)
+  end
+
   private
 
+  def empty?
+    joined_player_count.zero?
+  end
+
   def maxplayers_key
     [pug_key, "maxplayers"].join(":")
   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,59 +15,61 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :join do |event, *args|
-      set_pug(event, args) do |e, pug|
+      setup_pug(event) do |e, pug|
+        return message("You've already joined", e.channel) if pug.joined?(e.user_id)
+
         pug.join(e.user_id)
 
         message = if pug.joined_player_count == 1
                     [
-                      "#{e.username} creates a PUG",
+                      "#{e.display_name} creates a PUG",
                       pug.player_slots,
                       pug.notify_roles
                     ].join(' | ')
-                  elsif pug.slots_left.between?(1,3)
+                  elsif pug.slots_left.between?(1, 3)
                     [
-                      "#{e.username} joins the PUG",
+                      "#{e.display_name} joins the PUG",
                       pug.player_slots,
                       "#{pug.slots_left} more",
                       pug.notify_roles
                     ].join(' | ')
                   else
                     [
-                      "#{e.username} joins the PUG",
+                      "#{e.display_name} joins the PUG",
                       pug.player_slots
                     ].join(' | ')
                   end
 
-        send_and_log_message(message, e.channel)
+        message(message, e.channel)
 
         if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            e.mentions_for(pug.joined_players)
+          message = start_pug_message(
+            player_slots: pug.player_slots,
+            mentions: e.mentions_for(pug.joined_players)
           )
 
-          send_and_log_message(message, e.channel)
+          message(message, e.channel)
         end
       end
     end
 
     bot.command :status do |event, *args|
-      set_pug(event, args) 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, args) do |e, pug|
+      setup_pug(event) do |e, pug|
         new_maxplayers = args[0]
 
         message = if new_maxplayers
@@ -79,54 +79,76 @@ class QwtfDiscordBotPug # :nodoc:
                     "Current max number of players is #{pug.maxplayers} | #{pug.player_slots} joined"
                   end
 
-        send_and_log_message(message, e.channel)
+        message(message, e.channel)
 
         if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            e.mentions_for(pug.joined_players)
+          message = start_pug_message(
+            player_slots: pug.player_slots,
+            mentions: e.mentions_for(pug.joined_players)
           )
 
-          send_and_log_message(message, e.channel)
+          message(message, e.channel)
         end
       end
     end
 
     bot.command :leave do |event, *args|
-      set_pug(event, args) 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)
-
-          if pug.empty?
-            message = end_pug(pug)
-            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)
+
+          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, args) 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, args) do |e, pug|
+      setup_pug(event) do |e, pug|
         roles = args.join(' ')
         pug.notify_roles = roles
 
@@ -136,7 +158,7 @@ class QwtfDiscordBotPug # :nodoc:
                     "Notification role set to #{roles}"
                   end
 
-        send_and_log_message(message, e.channel)
+        message(message, e.channel)
       end
     end
 
@@ -145,26 +167,26 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
-  def set_pug(event, *args)
+  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_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.2
+  version: 5.1.8
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb