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

Truncate module launcher piped result

Browse Source
This commit is contained in:
Pragmatic Software 2014-03-15 01:53:33 +00:00
parent 36b7e1fa6f
commit f998f974c0
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/FactoidModuleLauncher.pm
View File

@ -177,6 +177,8 @@ sub execute_module {
sub module_pipe_reader { sub module_pipe_reader {
my ($self, $buf) = @_; my ($self, $buf) = @_;
my ($channel, $text) = split / /, $buf, 2; my ($channel, $text) = split / /, $buf, 2;
return if not defined $text or not length $text;
$text = $self->{pbot}->interpreter->truncate_result($channel, $self->{pbot}->{botnick}, 'undef', $text, $text, 0);
$self->{pbot}->antiflood->check_flood($channel, $self->{pbot}->{botnick}, $self->{pbot}->{username}, 'localhost', $text, 0, 0, 0); $self->{pbot}->antiflood->check_flood($channel, $self->{pbot}->{botnick}, $self->{pbot}->{username}, 'localhost', $text, 0, 0, 0);
} }

36
PBot/Interpreter.pm
View File

@ -142,6 +142,28 @@ sub process_line {
} }
} }
sub truncate_result {
my ($self, $from, $nick, $text, $original_result, $result, $paste) = @_;
if(length $result > $self->{pbot}->max_msg_len) {
my $link;
if($paste) {
$link = paste_sprunge("[" . (defined $from ? $from : "stdin") . "] <$nick> $text\n\n$original_result");
} else {
$link = 'undef';
}
my $trunc = "... [truncated; see $link for full text.]";
$self->{pbot}->logger->log("Message truncated -- pasted to $link\n") if $paste;
my $trunc_len = length $result < $self->{pbot}->max_msg_len ? length $result : $self->{pbot}->max_msg_len;
$result = substr($result, 0, $trunc_len);
substr($result, $trunc_len - length $trunc) = $trunc;
}
return $result;
}
sub handle_result { sub handle_result {
my ($self, $from, $nick, $user, $host, $text, $command, $result, $checkflood, $preserve_whitespace) = @_; my ($self, $from, $nick, $user, $host, $text, $command, $result, $checkflood, $preserve_whitespace) = @_;
my ($pbot, $mynick) = ($self->{pbot}, $self->{pbot}->{botnick}); my ($pbot, $mynick) = ($self->{pbot}, $self->{pbot}->{botnick});
@ -151,7 +173,7 @@ sub handle_result {
} }
my $original_result = $result; my $original_result = $result;
$result =~ s/[\n\r]+/ /g; $result =~ s/[\n\r]/ /g;
if($preserve_whitespace == 0 && defined $command) { if($preserve_whitespace == 0 && defined $command) {
my ($cmd, $args) = split / /, $command, 2; my ($cmd, $args) = split / /, $command, 2;
@ -164,17 +186,7 @@ sub handle_result {
} }
$result =~ s/\s+/ /g unless $preserve_whitespace; $result =~ s/\s+/ /g unless $preserve_whitespace;
$result = $self->truncate_result($from, $nick, $text, $original_result, $result, 1);
if(length $result > $pbot->max_msg_len) {
my $link = paste_sprunge("[" . (defined $from ? $from : "stdin") . "] <$nick> $text\n\n$original_result");
my $trunc = "... [truncated; see $link for full text.]";
$pbot->logger->log("Message truncated -- pasted to $link\n");
my $trunc_len = length $result < $pbot->max_msg_len ? length $result : $pbot->max_msg_len;
$result = substr($result, 0, $trunc_len);
substr($result, $trunc_len - length $trunc) = $trunc;
}
$pbot->logger->log("Final result: [$result]\n"); $pbot->logger->log("Final result: [$result]\n");
if($result =~ s/^\/say\s+//i) { if($result =~ s/^\/say\s+//i) {

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 525, BUILD_REVISION => 526,
BUILD_DATE => "2014-03-14", BUILD_DATE => "2014-03-14",
}; };