qwtf_discord_bot 5.4.12 → 5.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b277234b785000212e913859cac63c94fc2c125bf6c2723ed5b7df6ba7419a7
-  data.tar.gz: b55f4861185865fb3b7bb8ceb19ddad26ebaef334aa02cc7e7504e0b6bf74a20
+  metadata.gz: 256bc5dd2a321a2e9495764c946142a36bdc4cec6f4871a70c3d8b2b6e0d1357
+  data.tar.gz: 16d3964888b04bdb1580ef62b1541375876dfdd2a24847ff60bc2927871f8ab3
 SHA512:
-  metadata.gz: db1415cd7144dbf88b0343cabf2d05daed1fc8da377a25c2d32117d7d84be9f7cb4fdbd96d16c5084a2abf00d78d7318baaff8accd96a6723657867fdcfb7422
-  data.tar.gz: 5af029b8abd9cf20438ae815ca4e6234b23c0d2279c3884bc0d267d31e06f7a91de523b0276719a7a37e6c373d14795b39e2e5b6774d84956828490834d5fc47
+  metadata.gz: c153a53da144bd6af78ea5013dd080d1f7da909ec532da2fa3787aa872ef03d778aaf30857d63ed204934cdfe5be3ff23aab166f6a747291ccb67f94ea23f10e
+  data.tar.gz: 986cc092056e071b8dcd877a4869d98911e9366253842f48e75df0f333445bfab71da2a6bab20e8242127a38a4fa187c930279497a3b632bc81ad63327972b65

data/VERSION

@@ -1 +1 @@
-5.4.12
+5.4.13

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -288,26 +288,47 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        unless pug.joined?(user_id)
-          return send_embedded_message(
-            description: "You aren't in this PUG",
-            channel: e.channel
-          )
-        end
+        if args.empty?
+          unless pug.joined?(user_id)
+            return send_embedded_message(
+              description: "You aren't in this PUG",
+              channel: e.channel
+            )
+          end
 
-        if pug.team(0).include?(user_id)
-          return send_embedded_message(
-            description: "You aren't in a team",
+          if pug.team(0).include?(user_id)
+            return send_embedded_message(
+              description: "You aren't in a team",
+              channel: e.channel
+            )
+          end
+
+          pug.join_team(team_no: 0, player_id: user_id)
+
+          send_embedded_message(
+            description: "#{e.display_name} leaves team",
             channel: e.channel
           )
-        end
+        else
+          args.each do |mention|
+            unless mention.match(/<@!\d+>/)
+              send_embedded_message(
+                description: "#{arg} isn't a valid mention",
+                channel: e.channel
+              )
+              next
+            end
 
-        pug.join_team(team_no: 0, player_id: user_id)
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || arg
+            pug.join_team(team_no: 0, player_id: user_id)
 
-        send_embedded_message(
-          description: "#{e.display_name} leaves team",
-          channel: e.channel
-        )
+            send_embedded_message(
+              description: "#{display_name} leaves team",
+              channel: e.channel
+            )
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.4.12
+  version: 5.4.13
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb