qwtf_discord_bot 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a23eb8820860898165bbdf94e448a7141449fa3850a8e66f079e93ca8590f0f
-  data.tar.gz: 33ea995e466b5379746ee57b12e24f3337581dd0c58e4e526b30eb2a9377778d
+  metadata.gz: ea5f5046690139982d6f1d8324c4b4d312d6d21f5c5d6f3734211038454db8b7
+  data.tar.gz: 9ce6466357c99b25415f55b0eed27edd3acd8bc4e741045bfcb3cc85cbb34509
 SHA512:
-  metadata.gz: 53393cfca043b1ff72cbc2a7f9e28d9a7f4c44381990ba23edf392f23afb84c66715e5ff274573d16587797fad5c9e76739edb67039eb72106f4767faf95e368
-  data.tar.gz: ae90377b7c6c4592e6811a91461ab13a3e8650d17c36a67f8c45717930e2956c738123c16db087c036508a0da1898fc0d0a1f5efac71a9149ce809da8d277067
+  metadata.gz: 19428a1ac12bb6da56fbebaf8e47420f49514aa579b208c8063832d41d5a8948a3dc112358a8e4c8f5ab2fa4693c6521cc89ecddf4087a02e60bcc8862c47fc9
+  data.tar.gz: 22d259fa928093d9eec63eb1896b1e9ec7edf32e4ef8fe5e198d3b4a882c670641e9690755ed15fea49fcee9328b2999406d8a4cc9f7d8fb719c7c34ced5bfcd

data/VERSION

@@ -1 +1 @@
-5.1.2
+5.1.3

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -17,44 +17,49 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :join do |event, *args|
-      set_pug(event, args) do |e, pug|
-        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
+      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)
+          send_and_log_message(message, e.channel)
 
-        if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            e.mentions_for(pug.joined_players)
-          )
+          if pug.full?
+            message = start_pug(
+              pug.player_slots,
+              e.mentions_for(pug.joined_players)
+            )
 
-          send_and_log_message(message, e.channel)
+            send_and_log_message(message, e.channel)
+          end
         end
       end
     end
 
     bot.command :status do |event, *args|
-      set_pug(event, args) do |e, pug|
+      set_pug(event) do |e, pug|
         message = if pug.active?
                     [
                       "#{e.usernames_for(pug.joined_players).join(', ')} joined",
@@ -69,7 +74,7 @@ class QwtfDiscordBotPug # :nodoc:
     end
 
     bot.command :maxplayers do |event, *args|
-      set_pug(event, args) do |e, pug|
+      set_pug(event) do |e, pug|
         new_maxplayers = args[0]
 
         message = if new_maxplayers
@@ -93,7 +98,7 @@ class QwtfDiscordBotPug # :nodoc:
     end
 
     bot.command :leave do |event, *args|
-      set_pug(event, args) do |e, pug|
+      set_pug(event) do |e, pug|
         if !pug.active?
           message = "There's no active PUG to leave"
           send_and_log_message(message, e.channel)
@@ -114,7 +119,7 @@ class QwtfDiscordBotPug # :nodoc:
     end
 
     bot.command :end do |event, *args|
-      set_pug(event, args) do |e, pug|
+      set_pug(event) do |e, pug|
         message = if !pug.active?
                     "There's no active PUG to end"
                   else
@@ -126,7 +131,7 @@ class QwtfDiscordBotPug # :nodoc:
     end
 
     bot.command :notify do |event, *args|
-      set_pug(event, args) do |e, pug|
+      set_pug(event) do |e, pug|
         roles = args.join(' ')
         pug.notify_roles = roles
 
@@ -145,7 +150,7 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
-  def set_pug(event, *args)
+  def set_pug(event)
     e = EventDecorator.new(event)
     pug = Pug.for(e.channel_id)
     yield(e, pug)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Sheldon Johnson