botqui.rb

@@ -68,7 +68,7 @@ bot = Cinch::Bot.new do
     c.server = "irc.libera.chat"
     c.user = "Monqui"
     c.password = "tbmsn"
-    c.nick = "botqu0001"
+    c.nick = "botqu9001"
     c.delay_joins = 15
     c.channels = ["#sconesandcream fatjoints", "#sconetv", "#bakedbeans"]
     c.timeouts.connect = 30
@@ -179,7 +179,7 @@ bot = Cinch::Bot.new do
     m.reply "https://33.media.tumblr.com/fe1446dc5f065b3685fe63c51121fc4f/tumblr_mhhadl964P1rgfo8qo1_r2_400.gif"
   end
 
-  on :message, /^!trinity$/ do |m|
+  on :message, /.*trinity.*/i do |m|
     m.reply "https://tenor.com/view/trinity-taylor-drag-race-sip-cocktail-drama-gif-9086550"
   end
 
@@ -188,7 +188,7 @@ bot = Cinch::Bot.new do
   end
 
   on :channel, /^!pounce (\S*) (.*)$/ do |m, t, message|
-    save_msg = {"source" => m.user.nick, "target" => t.downcase, "message" => '', 'time' => ''}
+    save_msg = {"source" => m.user.nick, "target" => t, "message" => '', 'time' => ''}
 
     if message.index("|") != nil then
       msg_parts = message.split(' | ')
@@ -196,7 +196,8 @@ bot = Cinch::Bot.new do
       save_msg["message"] = msg_parts[1]
 
       triggerTime = Chronic.parse(msg_parts[0])
-      if triggerTime == nil or triggerTime == "" then
+
+      if triggerTime == nil then
         save_msg["time"] = Time.now
       else
         save_msg["time"] = triggerTime
@@ -208,11 +209,8 @@ bot = Cinch::Bot.new do
 
 #    m.reply save_msg.inspect
 
-    if save_msg["message"] == nil then
-      m.reply "the heck is this bro???"
-    else
     pounces.push save_msg
-    end
+
 #    if !pounces[t.downcase].key?(m.user.nick) then
 #      pounces[t.downcase][m.user.nick] = save_msg
 #    else
@@ -232,8 +230,8 @@ bot = Cinch::Bot.new do
     out_msgs = {}
 
     pounces.each do |p|
-      if nick.downcase == p["target"] and now > p["time"] then
-        out_msgs[m.user.nick] = p["source"] + " says " + p["message"] + " | " + out_msgs[nick].to_s
+      if nick == p["target"] and now > p["time"] then
+        out_msgs[nick] = p["source"] + " says " + p["message"] + "| " + out_msgs[nick].to_s
       else
         remaining_pounces.push p
       end