qwtf_discord_bot 5.1.9 → 5.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874aab5dba875e61f9dfd5500d91a25149a7b08a8a91854402080d4775cc1b24
-  data.tar.gz: e68aa880053d9bffbfb563fa6bcdaa060b89d91051e6955615f89543a30e1530
+  metadata.gz: 9f929cda85f6a53ffc63d04e3a85b6ca4bcbcadf72b2c0ab70eab8a1a549843a
+  data.tar.gz: 45b0e4b9bba67fdfb8139d3904176ce3443d43ea7cb74c750588f4eb6ea1fb8d
 SHA512:
-  metadata.gz: aae1ed1e4fa7e631a4903fb7fdfb933b51bf127ee3de0d3b8497f39d3d6d36c16dcd23db18664a724375bb454ac60bca7467ce0f34bfbcfe7c55b278ece01660
-  data.tar.gz: 7426320e57d72affc5170ed20a7cd4a0d0ff1711c2103cfe88c85d8c646e5900725860d4c8644653cc53ce610a8f0b18cd88e1db8550d96c80df05e271532f72
+  metadata.gz: cca2b1392fbbdca102e22ea27e79774da07478e5cfa2a9a2ee14c4b6ae48ae1ea3c8e4c8906461d123a1f32f3e2e0cef519f107a3b7abf42d1853a5e870bf342
+  data.tar.gz: d29bd7a09c9ffed879429965497118d0f63332bac8084c83ea498601d924d11227adad67694de73f97658b73ed9c7c90236fc855bb8c82a809a522fe0ecb78f6

data/VERSION

@@ -1 +1 @@
-5.1.9
+5.1.11

data/lib/event_decorator.rb

@@ -34,7 +34,7 @@ class EventDecorator
   end
 
   def display_name_for(user_id)
-    find_user(user_id).display_name
+    find_user(user_id) && find_user(user_id).display_name
   end
 
   private

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -16,31 +16,18 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :join do |event, *args|
       setup_pug(event) do |e, pug|
-        return message("You've already joined", e.channel) if pug.joined?(e.user_id)
+        return send_msg("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.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.joined_player_count == 1
+          snippets = ["#{e.display_name} creates a PUG", pug.player_slots, pug.notify_roles]
+        else
+          snippets = ["#{e.display_name} joins the PUG", pug.player_slots]
+          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
+        end
+
+        send_msg(snippets.join(' | '), e.channel)
 
         start_pug(pug, e) if pug.full?
       end
@@ -48,16 +35,16 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :status do |event, *args|
       setup_pug(event) do |e, pug|
-        message = if pug.active?
-                    [
-                      "#{e.display_names_for(pug.joined_players).join(', ')} joined",
-                      pug.player_slots
-                    ].join(' | ')
-                  else
-                    'No PUG has been started. `!join` to create'
-                  end
-
-        message(message, e.channel)
+        msg = if pug.active?
+                [
+                  "#{e.display_names_for(pug.joined_players).join(', ')} joined",
+                  pug.player_slots
+                ].join(' | ')
+              else
+                'No PUG has been started. `!join` to create'
+              end
+
+        send_msg(msg, e.channel)
       end
     end
 
@@ -67,13 +54,15 @@ class QwtfDiscordBotPug # :nodoc:
 
         if new_teamsize
           pug.teamsize = new_teamsize
-          message(
+
+          send_msg(
             "Team size set to #{pug.teamsize} | #{pug.player_slots} joined",
             e.channel
           )
+
           start_pug(pug, e) if pug.full?
         else
-          message(
+          send_msg(
             "Current team size is #{pug.teamsize} | #{pug.player_slots} joined",
             e.channel
           )
@@ -83,56 +72,71 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :leave do |event, *args|
       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)
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_msg("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",
+        snippets = [
+          "#{e.display_name} leaves the PUG",
+          "#{pug.player_slots} remain"
+        ]
+
+        snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+        send_msg(
+          snippets.join(' | '),
           e.channel
         )
 
-        message(end_pug_message, e.channel) unless pug.active?
+        send_msg(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?
+        return send_msg(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)
+        args.each do |arg|
+          unless arg.match(/<@!\d+>/)
+            send_msg("#{arg} isn't a valid mention", e.channel)
+            next
+          end
 
-          unless pug.joined?(user_id)
-            message(
-              "#{display_name} isn't in the PUG",
-              e.channel
-            )
+          user_id = arg[3..-2].to_i
+          display_name = e.display_name_for(user_id) || arg
 
+          unless pug.joined?(user_id)
+            send_msg("#{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",
+          snippets = [
+            "#{display_name} is kicked from the PUG",
+            "#{pug.player_slots} remain"
+          ]
+
+          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+          send_msg(
+            snippets.join(' | '),
             e.channel
           )
 
-          break message(end_pug_message, e.channel) unless pug.active?
+          break send_msg(end_pug_message, e.channel) unless pug.active?
         end
       end
     end
 
     bot.command :end do |event, *args|
       setup_pug(event) do |e, pug|
-        return message(no_active_pug_message, e.channel) unless pug.active?
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
         pug.end_pug
 
-        message(end_pug_message, e.channel)
+        send_msg(end_pug_message, e.channel)
       end
     end
 
@@ -141,13 +145,13 @@ class QwtfDiscordBotPug # :nodoc:
         roles = args.join(' ')
         pug.notify_roles = roles
 
-        message = if roles.empty?
-                    'Notification removed'
-                  else
-                    "Notification role set to #{roles}"
-                  end
+        msg = if roles.empty?
+                'Notification removed'
+              else
+                "Notification role set to #{roles}"
+              end
 
-        message(message, e.channel)
+        send_msg(msg, e.channel)
       end
     end
 
@@ -164,17 +168,16 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   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
-    )
+    msg = [
+      '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")
+
+    send_msg(msg, event.channel)
   end
 
-  def start_pug_message(player_slots:, mentions:)
+  def start_pug_send_msg(player_slots:, mentions:)
     ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
   end
 
@@ -186,7 +189,7 @@ class QwtfDiscordBotPug # :nodoc:
     "There's no active PUG"
   end
 
-  def message(message, channel)
+  def send_msg(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.9
+  version: 5.1.11
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb