Fix random

Meoowww · Nov 29, 2017 · 0f6325a · 0f6325a
1 parent 45a2571
commit 0f6325a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/DashBot.cr b/src/DashBot.cr
@@ -27,7 +27,7 @@ end
 module DashBot
   def start
     Arguments.new.use
-    client = Crirc::Network::Client.new(ip: "irc.mozilla.org", port: 6667_u16, ssl: false, nick: "Dasshyxtest2", read_timeout: 300_u16)
+    client = Crirc::Network::Client.new(ip: "irc.mozilla.org", port: 6667_u16, ssl: false, nick: "Dasshyx#{rand(1..9)}", read_timeout: 300_u16)
     client.connect
     client.start do |bot|
       Plugins::BasicCommands.bind(bot)

diff --git a/src/DashBot/plugins/random.cr b/src/DashBot/plugins/random.cr
@@ -2,10 +2,10 @@ module DashBot::Plugins::Random
   extend self
 
   def bind(bot)
-    bot.on("PRIVMSG", message: /^!random +([[:alnum:]]+(, ?[[:alnum:]]+))+/, doc: {"!random", "!random word1,word2,word3"}) do |msg, match|
+    bot.on("PRIVMSG", message: /^!random +([^,]+(?:,[^,]+)+)/, doc: {"!random", "!random word1, word2, word3"}) do |msg, match|
       match = match.as(Regex::MatchData)
       list = match[1]
-      values = list.split(/(, )|([^,] )/)
+      values = list.split(',').map(&.strip)
       bot.reply msg, "Values: #{values}"
       bot.reply msg, values.sample
     end