GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-27 06:19:25 +01:00
Code Issues Projects Releases Wiki Activity

Improve parsing of embedded factoids

Browse Source
This commit is contained in:
Pragmatic Software 2017-10-05 14:31:00 -07:00
parent b46dfe31fc
commit 8ba0664b85
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
PBot/Interpreter.pm
View File

@ -113,6 +113,19 @@ sub process_line {
$preserve_whitespace = 1; $preserve_whitespace = 1;
my $nick_override = $self->{pbot}->{nicklist}->is_present($from, $nick_override); my $nick_override = $self->{pbot}->{nicklist}->is_present($from, $nick_override);
$processed += 100; $processed += 100;
} elsif($cmd_text =~ s/^$bot_trigger(.*)$//) {
$command = $1;
$processed += 100;
} elsif ($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);
if ($nick) {
$command = "tell $nick about $cmd";
} else {
$command = $cmd;
}
$referenced = 1;
} elsif($cmd_text =~ s/^\s*([^,:\(\)\+\*\/ ]+)[,:]?\s+$bot_trigger(.*)$//) { } elsif($cmd_text =~ s/^\s*([^,:\(\)\+\*\/ ]+)[,:]?\s+$bot_trigger(.*)$//) {
$nick_override = $1; $nick_override = $1;
$command = $2; $command = $2;
@ -135,16 +148,6 @@ sub process_line {
} elsif($cmd_text =~ s/^(.*?),?\s*$botnick[?!.]*$//i) { } elsif($cmd_text =~ s/^(.*?),?\s*$botnick[?!.]*$//i) {
$command = $1; $command = $1;
$processed += 100; $processed += 100;
} elsif ($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);
if ($nick) {
$command = "tell $nick about $cmd";
} else {
$command = $cmd;
}
$referenced = 1;
} }
last if not defined $command and not defined $has_code; last if not defined $command and not defined $has_code;