GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix embedded command extraction

This commit is contained in:
Pragmatic Software 2017-12-18 03:51:09 -08:00
parent 8f0ae852bd
commit 8441869fac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/Interpreter.pm
View File

@ -96,6 +96,7 @@ sub process_line {
my $cmd_text = $text;
$cmd_text =~ s/^\/me\s+//;
=cut
# check for code compiler invocation
my $has_code;
if ($cmd_text =~ m/^(?:$botnick.?)?\s*{\s*(.+)\s*}\s*$/) {
@ -119,6 +120,7 @@ sub process_line {
}
}
}
=cut
# check for bot command invocation
my @commands;
@ -160,7 +162,7 @@ sub process_line {
}
for (my $count = 0; $count < 3; $count++) {
my ($extracted) = extract_codeblock $cmd_text, '{}', "(?s).*?$bot_trigger";
my ($extracted) = extract_codeblock $cmd_text, '{}', "(?s).*?$bot_trigger(?=\{)";
last if not defined $extracted;
$extracted =~ s/^\{\s*//;
$extracted =~ s/\s*\}$//;