GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-10-12 22:17:24 +02:00
Code Issues Projects Releases Wiki Activity

Pipes can now be escaped for easy factadding, etc

Browse Source
This commit is contained in:
Pragmatic Software 2017-11-25 20:01:34 -08:00
parent 78a12b3a46
commit 1222436616
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PBot/Interpreter.pm
View File

@ -252,8 +252,9 @@ sub interpret {
my $got_pipe = 0; my $got_pipe = 0;
if (defined $arguments && $arguments =~ m/\|\s*\{\s*[^}]+\}\s*$/) { # parse out a pipe unless escaped
$arguments =~ m/(.*?)\s*\|\s*\{\s*([^}]+)\}(.*)/; if (defined $arguments && $arguments =~ m/(?<!\\)\|\s*\{\s*[^}]+\}\s*$/) {
$arguments =~ m/(.*?)\s*(?<!\\)\|\s*\{\s*([^}]+)\}(.*)/;
my ($args, $pipe, $rest) = ($1, $2, $3); my ($args, $pipe, $rest) = ($1, $2, $3);
$pipe =~ s/\s+$//; $pipe =~ s/\s+$//;
@ -267,6 +268,9 @@ sub interpret {
$got_pipe = 1; $got_pipe = 1;
} }
# unescape any escaped pipes
$arguments =~ s/\\\|\s*\{/| {/g if defined $arguments;
$stuff->{nickoverride} = $stuff->{nick} if defined $stuff->{nickoverride} and lc $stuff->{nickoverride} eq 'me'; $stuff->{nickoverride} = $stuff->{nick} if defined $stuff->{nickoverride} and lc $stuff->{nickoverride} eq 'me';
if ((not exists $stuff->{pipe}) and $keyword !~ /^(?:factrem|forget|set|factdel|factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)$/) { if ((not exists $stuff->{pipe}) and $keyword !~ /^(?:factrem|forget|set|factdel|factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)$/) {