From 98a061b232722fc81fdc6279b844e5d55d6b48d2 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Wed, 23 Aug 2017 19:14:46 -0700
Subject: [PATCH] Fix $nick and $arg being overridden by factoids

---
 PBot/Factoids.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index 471edb93..586d2c7c 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -372,9 +372,9 @@ sub expand_factoid_vars {
     last if ++$depth >= 10;
     my $matches = 0;
     my $const_action = $action;
-    while ($const_action =~ /(?<!\\)\$([a-zA-Z0-9_:\-#]+)/g) {
+    while ($const_action =~ /(?<!\\)\$([a-zA-Z0-9_:\-#\[\]]+)/g) {
       my $v = $1;
-      next if $v =~ m/^(nick|channel|randomnick|args|arg\[.+\])$/; # don't override special variables
+      next if $v =~ m/^(nick|channel|randomnick|args|arg\[.+\]):?$/i; # don't override special variables
 
       $matches++;