qwtf_discord_bot 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef8bda609c0735d9ba3ba074c3f53a963c2d2cc7f933af4965ba9fb797b7d151
-  data.tar.gz: de760869c4380aa7d14ec16b7828655b1534c41aa3808a6c26d8f36a5694e7dd
+  metadata.gz: 402ebf8fe6c235b94f6e1db48b228f13d0bdece3628873edf943f66f26c9d05c
+  data.tar.gz: 69c5fdad3c21f133a315a1f87ac9b92dc068efd13750e33f144bfdf64bf9ea8f
 SHA512:
-  metadata.gz: ec8f53ff7b12188bab9059db811c478b7010a105e7d37e626816da5d03003502030515e7ab918b521ec0d6dd7998c1a776be332d8a1fdc1fa2a8935df4fb272b
-  data.tar.gz: 4812904a6c1dd2824f08bd376239760c8506329438c26dae718ac809a123e6201547ad40f77de1bd3cab91781234022f6f914ba4f1abc21eba9c19c6f0e7999b
+  metadata.gz: fd4aa01e8a86d1e0e82b658c26e9f6bbfce16786e00c61bd6069c4be1a03a3a63ab8a05a497bb287cf861d8d0f37f210cf8f52510be5e812a47eba34f728d1a2
+  data.tar.gz: c2c25e668f9de93662ee2ddac5ac43d058c50d49be42647c1c1ec33046b10220cfcb1b3f5678b7d4a52899e99bad8092098f2159478b7435217de86263cea1c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (6.1.3)
+    qwtf_discord_bot (6.1.4)
       discordrb (= 3.4.0)
       redis (~> 4.2)
       thor (~> 1.1)
@@ -93,4 +93,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   2.2.8
+   2.2.21

data/VERSION

@@ -1 +1 @@
-6.1.3
+6.1.4

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -9,6 +9,7 @@ class QwtfDiscordBotPug # :nodoc:
   MSG_SNIPPET_DELIMITER = ' · '
   TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
   TEN_MINUTES = 10 * 60
+  VALID_MENTION = /<@!?\d+>/
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -170,17 +171,17 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        args.each do |arg|
-          unless arg.match(/<@!\d+>/)
+        args.each do |mention|
+          unless mention.match(VALID_MENTION)
             send_embedded_message(
-              description: "#{arg} isn't a valid mention",
+              description: "#{mention} isn't a valid mention",
               channel: e.channel
             )
             next
           end
 
-          user_id = mention_to_user_id(arg)
-          display_name = e.display_name_for(user_id) || arg
+          user_id = mention_to_user_id(mention)
+          display_name = e.display_name_for(user_id) || mention
 
           unless pug.joined?(user_id)
             send_embedded_message(
@@ -250,16 +251,16 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args[1..-1].each do |mention|
-            unless mention.match(/<@!\d+>/)
+            unless mention.match(VALID_MENTION)
               send_embedded_message(
-                description: "#{arg} isn't a valid mention",
+                description: "#{mention} isn't a valid mention",
                 channel: e.channel
               )
               next
             end
 
             user_id = mention_to_user_id(mention)
-            display_name = e.display_name_for(user_id) || arg
+            display_name = e.display_name_for(user_id) || mention
             pug.join_team(team_no: team_no, player_id: user_id)
 
             send_embedded_message(
@@ -310,16 +311,16 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args.each do |mention|
-            unless mention.match(/<@!\d+>/)
+            unless mention.match(VALID_MENTION)
               send_embedded_message(
-                description: "#{arg} isn't a valid mention",
+                description: "#{mention} isn't a valid mention",
                 channel: e.channel
               )
               next
             end
 
             user_id = mention_to_user_id(mention)
-            display_name = e.display_name_for(user_id) || arg
+            display_name = e.display_name_for(user_id) || mention
 
             unless pug.joined?(user_id)
               return send_embedded_message(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb