qwtf_discord_bot 5.1.6 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be9d7e86ba5a7b1a38b2ad8f12d34295a3882e871d535f01c1d8fb1ada700129
-  data.tar.gz: 1fad670f56fe547f42b5f6b4a14e0769a8195080125536c64b480d29f6bf4f48
+  metadata.gz: cfcb9cea490b3e0de6db8028dbe88bdc5989186b97225f92f9a87cf0e0eeb05a
+  data.tar.gz: 814fc6269bec9872b68fed72b96a78322735534cb8969f7e1d74618aa9fef5cc
 SHA512:
-  metadata.gz: 8e6e67d9588c6806545133f3d37c473445b594c515d9621fdd2c6b95bad20e21af356756c949cff72445533611a2205b67989f8b58ae6b61da40a2dac20a7454
-  data.tar.gz: c7a8dcbeadf3074650526f3c8849db414dd6690699412182e9970fbdc893f2fb13be9f1997487af5329b785d548d7e4e93f9175d31f24ed7092e2b27ab531e0b
+  metadata.gz: d853f68c400f0ec91e7da0185c77a98e96958168c6057143d646d0f007c3496b9cab2a8f20936c6d4d504a82e9bdd76234949358a5bf5c58b07d79dd7eab7fe6
+  data.tar.gz: 334b46c0db3144f305c19f0d24923c4a487460fdac0413ded541aafb80edde9fcbb8835499fc29f7723e5730771c411951383a764e6bb78418a236ccf09448c9

data/VERSION

@@ -1 +1 @@
-5.1.6
+5.1.8

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,49 +15,46 @@ 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.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)
-            )
+      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
+        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)
+
+        if pug.full?
+          message = start_pug_message(
+            player_slots: pug.player_slots,
+            mentions: e.mentions_for(pug.joined_players)
+          )
+
+          message(message, e.channel)
         end
       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.display_names_for(pug.joined_players).join(', ')} joined",
@@ -69,12 +64,12 @@ class QwtfDiscordBotPug # :nodoc:
                     '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|
+      setup_pug(event) do |e, pug|
         new_maxplayers = args[0]
 
         message = if new_maxplayers
@@ -84,81 +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) 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)
-
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, e.channel)
-          end
-        end
+      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|
-      set_pug(event) do |e, pug|
-        if !pug.active?
-          message = "There's no active PUG"
-          return send_and_log_message(message, e.channel)
-        end
+      setup_pug(event) do |e, pug|
+        return message(no_active_pug_message, e.channel) unless pug.active?
 
-        mention = args[0]
-        user_id = mention[3..-2].to_i
-        display_name = e.display_name_for(user_id)
+        args.each do |mention|
+          user_id = mention[3..-2].to_i
+          display_name = e.display_name_for(user_id)
 
-        if !pug.joined_players.include?(user_id)
-          message = "#{display_name} isn't in the PUG"
-          send_and_log_message(message, e.channel)
-        else
-          pug.leave(user_id)
-          message = "#{display_name} is kicked from the PUG | #{pug.player_slots} remain"
-          send_and_log_message(message, e.channel)
+          unless pug.joined?(user_id)
+            message(
+              "#{display_name} isn't in the PUG",
+              e.channel
+            )
 
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, 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
 
@@ -168,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
 
@@ -177,26 +167,26 @@ 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_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.6
+  version: 5.1.8
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb