qwtf_discord_bot 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15afdd84de10528d7020797cbf211448eefa0ae8b6b7e13e9cab2e9bccdbc957
-  data.tar.gz: 324e5b52860aec148206e4408b4dbc0dd56b4b7a3c1dbfc36e960ef469a6ea79
+  metadata.gz: 9a23eb8820860898165bbdf94e448a7141449fa3850a8e66f079e93ca8590f0f
+  data.tar.gz: 33ea995e466b5379746ee57b12e24f3337581dd0c58e4e526b30eb2a9377778d
 SHA512:
-  metadata.gz: 1952f502bbcc26942fe362749e2f6f3640fa7c5b0b87d80a4d4d7abe179ad629c7b6fa366ad4f878c9b9e5ae4e1833bbce1a7675b09796f94ab51463649771fd
-  data.tar.gz: 11dd44583e6a5cada8ceb31b89d9305016fc7ee12f8d3cf2aaba3781fa07f427de19014694c23c794faff6c8e589d8984a171d4b328abcf0828a68162c73592e
+  metadata.gz: 53393cfca043b1ff72cbc2a7f9e28d9a7f4c44381990ba23edf392f23afb84c66715e5ff274573d16587797fad5c9e76739edb67039eb72106f4767faf95e368
+  data.tar.gz: ae90377b7c6c4592e6811a91461ab13a3e8650d17c36a67f8c45717930e2956c738123c16db087c036508a0da1898fc0d0a1f5efac71a9149ce809da8d277067

data/VERSION

@@ -1 +1 @@
-5.1.1
+5.1.2

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'pug'
 require 'event_decorator'
 
-class QwtfDiscordBotPug
+class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
   FOUR_HOURS = 4 * 60 * 60
@@ -14,121 +16,128 @@ class QwtfDiscordBotPug
       prefix: '!'
     )
 
-    bot.command :join do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-
-      pug.join(e.user_id)
-
-      message = if pug.full?
-                  time_to_play_message(
-                    pug.player_slots,
-                    e.mentions_for(pug.joined_players)
-                  )
-                elsif pug.joined_player_count == 1
-                  [
-                    "#{e.username} creates a PUG",
-                    pug.player_slots,
-                    pug.notify_roles
-                  ].join(' | ')
-                elsif pug.slots_left <= 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)
-    end
+    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
 
-    bot.command :status do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
+        send_and_log_message(message, e.channel)
 
-      message = if pug.active?
-                  [
-                    "#{e.usernames_for(pug.joined_players).join(', ')} joined",
-                    pug.player_slots
-                  ].join(' | ')
-                else
-                  'No PUG has been started. `!join` to create'
-                end
+        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
 
-    bot.command :maxplayers do |event, *args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-      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
-
-      send_and_log_message(message, e.channel)
-
-      if pug.full?
-        message = time_to_play_message(
-          pug.player_slots,
-          e.mentions_for(pug.joined_players)
-        )
+    bot.command :status do |event, *args|
+      set_pug(event, args) do |e, pug|
+        message = if pug.active?
+                    [
+                      "#{e.usernames_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)
       end
     end
 
-    bot.command :leave do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-
-      pug.leave(e.user_id)
+    bot.command :maxplayers do |event, *args|
+      set_pug(event, args) do |e, pug|
+        new_maxplayers = args[0]
 
-      message = "#{e.username} leaves the PUG | #{pug.player_slots} remain"
+        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)
+        send_and_log_message(message, e.channel)
 
-      if pug.empty?
-        pug.end_pug
+        if pug.full?
+          message = start_pug(
+            pug.player_slots,
+            e.mentions_for(pug.joined_players)
+          )
 
-        message = 'PUG ended'
-        send_and_log_message(message, e.channel)
+          send_and_log_message(message, e.channel)
+        end
       end
     end
 
-    bot.command :end do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
+    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)
+          end
+        end
+      end
+    end
 
-      pug.end_pug
+    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
 
-      message = 'PUG ended'
-      send_and_log_message(message, e.channel)
+        send_and_log_message(message, e.channel)
+      end
     end
 
     bot.command :notify do |event, *args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-      roles = args.join(' ')
-      pug.notify_roles = roles
-
-      message = if roles.empty?
-                  'Notification removed'
-                else
-                  "Notification role set to #{roles}"
-                end
-
-      send_and_log_message(message, e.channel)
+      set_pug(event, args) do |e, pug|
+        roles = args.join(' ')
+        pug.notify_roles = roles
+
+        message = if roles.empty?
+                    'Notification removed'
+                  else
+                    "Notification role set to #{roles}"
+                  end
+
+        send_and_log_message(message, e.channel)
+      end
     end
 
     bot.run
@@ -136,12 +145,26 @@ class QwtfDiscordBotPug
 
   private
 
-  def time_to_play_message(player_slots, mentions)
-    ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
+  def set_pug(event, *args)
+    e = EventDecorator.new(event)
+    pug = Pug.for(e.channel_id)
+    yield(e, pug)
+  end
+
+  def start_pug(player_slots, mentions)
+    [
+      'Time to play!',
+      player_slots,
+      mentions.join(' ')
+    ].join(' | ')
+  end
+
+  def end_pug(pug)
+    pug.end_pug
+    'PUG ended'
   end
 
   def send_and_log_message(message, channel)
-    channel.send_message(message)
-    puts message
+    channel.send_message(message) && puts(message)
   end
 end

metadata

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