From e70e016112df7712022134accd637759efd99676 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Fri, 23 Mar 2018 13:34:28 -0700
Subject: [PATCH] Improve factoid variable expansion

---
 PBot/Factoids.pm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index e04e6a09..b596d890 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -413,9 +413,10 @@ sub expand_factoid_vars {
     my $matches = 0;
     $action =~ s/\$0/$root_keyword/g;
     my $const_action = $action;
-    while ($const_action =~ /(\ba\s*|\ban\s*)?(?<!\\)\$([a-zA-Z0-9_:#\[\]]+)/gi) {
+    my $offset = 0;
+    while ($const_action =~ /(\ba\s*|\ban\s*)?(?<!\\)\$([a-zA-Z0-9_:#]+)/gi) {
       my ($a, $v) = ($1, $2);
-      $v =~ s/(.):$/$1/;
+      $v =~ s/(.):$/$1/; # remove trailing : only if at least one character precedes it
       next if $v =~ m/^[\W_]/; # special character prefix skipped for shell/code-factoids/etc
       next if $v =~ m/^(nick|channel|randomnick|arglen|args|arg\[.+\]|[_0])$/i; # don't override special variables
       next if @exclude && grep { $v =~ m/^\Q$_\E$/i } @exclude;
@@ -480,14 +481,15 @@ sub expand_factoid_vars {
         if ($a) {
           my $fixed_a = select_indefinite_article $mylist[$line];
           $fixed_a = ucfirst $fixed_a if $a =~ m/^A/;
-          $action =~ s/$a\$$v$modifier/$fixed_a $mylist[$line]/;
-        } else {
-          if (not length $mylist[$line]) {
-            $action =~ s/\s+\$$v$modifier//;
-          } else {
-            $action =~ s/\$$v$modifier/$mylist[$line]/;
-          }
+          $mylist[$line] = "$fixed_a $mylist[$line]";
         }
+
+        if (not length $mylist[$line]) {
+          substr($action, $offset) =~ s/\s+\$$v$modifier//;
+        } else {
+          substr($action, $offset) =~ s/\$$v$modifier/$mylist[$line]/;
+        }
+        $offset = $+[0];
       }
     }
     last if $matches == 0;