From 44bdf26ebc39769babd1cec93850678467e25a77 Mon Sep 17 00:00:00 2001
From: Pragmatic Software <pragma78@gmail.com>
Date: Mon, 23 Mar 2015 04:27:41 -0700
Subject: [PATCH] Add support for per-channel bot trigger characters

---
 PBot/Interpreter.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/PBot/Interpreter.pm b/PBot/Interpreter.pm
index 67188b36..03b5215d 100644
--- a/PBot/Interpreter.pm
+++ b/PBot/Interpreter.pm
@@ -69,12 +69,17 @@ sub process_line {
   my $cmd_text = $text;
   $cmd_text =~ s/^\/me\s+//;
 
-  my $bot_trigger = $pbot->{registry}->get_value('general', 'trigger');
+  # get channel-specific trigger if available
+  my $bot_trigger = $pbot->{registry}->get_value($from, 'trigger');
+
+  if (not defined $bot_trigger) {
+    $bot_trigger = $pbot->{registry}->get_value('general', 'trigger');
+  }
 
   if($cmd_text =~ /^$bot_trigger?\s*{\s*(.*)\s*}\s*$/) {
     $has_code = $1 if length $1;
     $preserve_whitespace = 1;
-  } elsif($cmd_text =~ /^\Q$bot_trigger\E(.*)$/) {
+  } elsif($cmd_text =~ /^$bot_trigger(.*)$/) {
     $command = $1;
   } elsif($cmd_text =~ /^.?$mynick.?\s+(.*?)$/i) {
     $command = $1;