From 14124da3ac20cbf66347e4bbc867eb5771e114f1 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Tue, 19 Jan 2016 06:51:40 -0800
Subject: [PATCH] Embedded triggers now work at beginning of message

---
 PBot/Interpreter.pm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/PBot/Interpreter.pm b/PBot/Interpreter.pm
index 2a37d645..10331424 100644
--- a/PBot/Interpreter.pm
+++ b/PBot/Interpreter.pm
@@ -94,25 +94,7 @@ sub process_line {
     $command = undef;
     $has_code = undef;
 
-    if($cmd_text =~ s/^(?:$bot_trigger|$botnick.?)?\s*{\s*(.*)\s*}\s*$//) {
-      $has_code = $1 if length $1;
-      $preserve_whitespace = 1;
-      $processed += 100;
-    } elsif($cmd_text =~ s/^\s*([^,:\(\)\+\*\/ ]+)[,:]*\s*{\s*(.*)\s*}\s*$//) {
-      $nick_override = $1;
-      $has_code = $2 if length $2 and $nick_override !~ /^(?:enum|struct|union)$/;
-      $preserve_whitespace = 1;
-      $processed += 100;
-    } elsif($cmd_text =~ s/^$bot_trigger(.*)$//) {
-      $command = $1;
-      $processed += 100;
-    } elsif($cmd_text =~ s/^.?$botnick.?\s*(.*?)$//i) {
-      $command = $1;
-      $processed += 100;
-    } elsif($cmd_text =~ s/^(.*?),?\s*$botnick[?!.]*$//i) {
-      $command = $1;
-      $processed += 100;
-    } elsif ($cmd_text =~ s/\B$bot_trigger`([^`]+)// || $cmd_text =~ s/\B$bot_trigger\{([^}]+)//) {
+    if ($cmd_text =~ s/\B$bot_trigger`([^`]+)// || $cmd_text =~ s/\B$bot_trigger\{([^}]+)//) {
       my $cmd = $1;
       my ($nick) = $cmd_text =~ m/^([^ ,:;]+)/;
       $nick = $self->{pbot}->{nicklist}->is_present($from, $nick);
@@ -122,6 +104,24 @@ sub process_line {
         $command = $cmd;
       }
       $referenced = 1;
+    } elsif($cmd_text =~ s/^(?:$bot_trigger|$botnick.?)?\s*{\s*(.*)\s*}\s*$//) {
+      $has_code = $1 if length $1;
+      $preserve_whitespace = 1;
+      $processed += 100;
+    } elsif($cmd_text =~ s/^\s*([^,:\(\)\+\*\/ ]+)[,:]*\s*{\s*(.*)\s*}\s*$//) {
+      $nick_override = $1;
+      $has_code = $2 if length $2 and $nick_override !~ /^(?:enum|struct|union)$/;
+      $preserve_whitespace = 1;
+      $processed += 100;
+    } elsif($cmd_text =~ s/^.?$botnick.?\s*(.*?)$//i) {
+      $command = $1;
+      $processed += 100;
+    } elsif($cmd_text =~ s/^(.*?),?\s*$botnick[?!.]*$//i) {
+      $command = $1;
+      $processed += 100;
+    } elsif($cmd_text =~ s/^$bot_trigger(.*)$//) {
+      $command = $1;
+      $processed += 100;
     }
 
     last if not defined $command and not defined $has_code;