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

Don't remove trailing punctuation from arguments 

Rename $count to $depth to reflect recursion
This commit is contained in:
Pragmatic Software 2015-04-03 12:32:35 -07:00
parent f3bf1f5e5b
commit 383c194966
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PBot/Interpreter.pm
View File

@ -128,14 +128,14 @@ sub process_line {
sub interpret { sub interpret {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $count, $command, $tonick) = @_; my ($from, $nick, $user, $host, $depth, $command, $tonick) = @_;
my ($keyword, $arguments) = ("", ""); my ($keyword, $arguments) = ("", "");
my $text; my $text;
my $pbot = $self->{pbot}; my $pbot = $self->{pbot};
$pbot->{logger}->log("=== Enter interpret_command: [" . (defined $from ? $from : "(undef)") . "][$nick!$user\@$host][$count][$command]\n"); $pbot->{logger}->log("=== Enter interpret_command: [" . (defined $from ? $from : "(undef)") . "][$nick!$user\@$host][$depth][$command]\n");
return "Too many levels of recursion, aborted." if(++$count > $self->{pbot}->{registry}->get_value('interpreter', 'max_recursion')); return "Too many levels of recursion, aborted." if(++$depth > $self->{pbot}->{registry}->get_value('interpreter', 'max_recursion'));
if(not defined $nick || not defined $user || not defined $host || if(not defined $nick || not defined $user || not defined $host ||
not defined $command) { not defined $command) {
@ -165,7 +165,6 @@ sub interpret {
and $keyword ne "change" and $keyword ne "change"
and $keyword ne "msg") { and $keyword ne "msg") {
$keyword =~ s/(\w+)([?!.]+)$/$1/; $keyword =~ s/(\w+)([?!.]+)$/$1/;
$arguments =~ s/(\w+)([?!.]+)$/$1/;
$arguments =~ s/(?<![\w\/\-])me\b/$nick/gi if defined $arguments; $arguments =~ s/(?<![\w\/\-])me\b/$nick/gi if defined $arguments;
} }
@ -184,7 +183,7 @@ sub interpret {
return undef; return undef;
} }
return $self->SUPER::execute_all($from, $nick, $user, $host, $count, $keyword, $arguments, $tonick); return $self->SUPER::execute_all($from, $nick, $user, $host, $depth, $keyword, $arguments, $tonick);
} }
sub truncate_result { sub truncate_result {