qwtf_discord_bot 5.1.0 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acbc8b37f3b73372cb4417b810a76a960ee5fd640330587ef97e0b889338be04
-  data.tar.gz: 47cc64ca3ca8cdf90e63a2197ac0b93e703427a26a0e5cf00ee6716938f73d9f
+  metadata.gz: d0adf9bb170277ec37dddc27d86049f6d678ddbb3b69530b114a177f11719d21
+  data.tar.gz: ff6c28db3deb0fad59b2ca45d4d53b3c45c622848cc15d6234d14b245c865413
 SHA512:
-  metadata.gz: 99276bcc5e6a1e53364176301f09da6089f72bdd266cfbb0e1e72e551e2421bd11116504c907db6649b14f3ba8b6bdcc4534b550ee749761e2d1b99df596dbb7
-  data.tar.gz: b1970a9a1465c72d1cdd3ab68f38d967eb8f9ea1d7072ef7da9c660d4b3ee15d5b3943498958e9f564d61e3a59d82455af1a6cd0e713d4a3240eb51b79b6e504
+  metadata.gz: 5dfb62990d27a5f250ea4ddbbe5f62583618e947c2c26d8df85308e2b99bb204a35a2b25347080a2352d4d1a7508e45e690fd7a636cd7e7baf1fc2305d8c9a60
+  data.tar.gz: 52590b32e2c4727c7ccd9b526bdc9f8abccb46b8d4e815d78cd7eb3cfd7dea669e57890b171dfdeb41c5a9de092d38147ae0b3469a97bb1450f96e713fe9b27a

data/VERSION

@@ -1 +1 @@
-5.1.0
+5.1.5

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,8 @@ 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
 
   private

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,159 @@ 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)
+    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)
+            )
+
+            send_and_log_message(message, e.channel)
+          end
+        end
+      end
     end
 
-    bot.command :status do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-
-      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
+    bot.command :status do |event, *args|
+      set_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
 
-      send_and_log_message(message, e.channel)
+        send_and_log_message(message, e.channel)
+      end
     end
 
     bot.command :maxplayers do |event, *args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-      new_maxplayers = args[0]
+      set_pug(event) do |e, pug|
+        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
+        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.full?
-        message = time_to_play_message(
-          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
 
-    bot.command :leave do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-
-      pug.leave(e.user_id)
-
-      message = "#{e.username} leaves the PUG | #{pug.player_slots} remain"
+    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
+      end
+    end
 
-      send_and_log_message(message, e.channel)
+    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
+
+        mention = args[0]
+        user_id = mention[3..-2].to_i
+
+        if !pug.joined_players.include?(user_id)
+          message = "#{mention} isn't in the PUG"
+          send_and_log_message(message, e.channel)
+        else
+          pug.leave(user_id)
+          message = "#{e.display_name} is kicked from 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
 
-      if pug.empty?
-        pug.end_pug
+    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
 
-        message = 'PUG ended'
         send_and_log_message(message, e.channel)
       end
     end
 
-    bot.command :end do |event, *_args|
-      e = EventDecorator.new(event)
-      pug = Pug.for(e.channel_id)
-
-      pug.end_pug
+    bot.command :notify do |event, *args|
+      set_pug(event) do |e, pug|
+        roles = args.join(' ')
+        pug.notify_roles = roles
 
-      message = 'PUG ended'
-      send_and_log_message(message, e.channel)
-    end
+        message = if roles.empty?
+                    'Notification removed'
+                  else
+                    "Notification role set to #{roles}"
+                  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)
+        send_and_log_message(message, e.channel)
+      end
     end
 
     bot.run
@@ -136,12 +176,26 @@ class QwtfDiscordBotPug
 
   private
 
-  def time_to_play_message(player_slots, mentions)
-    ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
+  def set_pug(event)
+    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.5
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb