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

Add ability to get surrounding message context in recall command

Browse Source 
Add the -b/-before and -a/-after flags to the `recall` command to display
that many lines of surrounding context.

For example, `recall -c ##c -b 100` will show the last 100 messages in the ##c
channel.

Another example, `recall pragma- 50 -b 5 -a 5` will show the 5 messages before the 50th
most recent message spoken by pragma- and then show that 50th message and finally show
the 5 messages after it.
This commit is contained in:
Pragmatic Software 2015-01-23 07:36:39 -08:00
parent 8810605691
commit b806a473d2
2 changed files with 78 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PBot/MessageHistory.pm
View File

@ -123,7 +123,7 @@ sub recall_message {
return ""; return "";
} }
my $usage = 'Usage: recall [nick [history [channel]]] [-c,channel <channel>] [-t,text,h,history <history>] [+ ...]'; my $usage = 'Usage: recall [nick [history [channel]]] [-c,channel <channel>] [-t,text,h,history <history>] [-b,before <context before>] [-a,after <context after>] [+ ...]';
if(not defined $arguments or not length $arguments) { if(not defined $arguments or not length $arguments) {
return $usage; return $usage;
@ -142,11 +142,13 @@ sub recall_message {
my $recall_text; my $recall_text;
foreach my $recall (@recalls) { foreach my $recall (@recalls) {
my ($recall_nick, $recall_history, $recall_channel); my ($recall_nick, $recall_history, $recall_channel, $recall_before, $recall_after);
my ($ret, $args) = GetOptionsFromString($recall, my ($ret, $args) = GetOptionsFromString($recall,
'channel|c=s' => \$recall_channel, 'channel|c=s' => \$recall_channel,
'text|t|history|h=s' => \$recall_history); 'text|t|history|h=s' => \$recall_history,
'before|b=s' => \$recall_before,
'after|a=s' => \$recall_after);
return "$getopt_error -- $usage" if defined $getopt_error; return "$getopt_error -- $usage" if defined $getopt_error;
@ -156,6 +158,8 @@ sub recall_message {
$recall_nick = shift @$args; $recall_nick = shift @$args;
$recall_history = shift @$args if not defined $recall_history; $recall_history = shift @$args if not defined $recall_history;
$recall_channel = shift @$args if not defined $recall_channel; $recall_channel = shift @$args if not defined $recall_channel;
$recall_before = 0 if not defined $recall_before;
$recall_after = 0 if not defined $recall_after;
# swap nick and channel if recall nick looks like channel and channel wasn't specified # swap nick and channel if recall nick looks like channel and channel wasn't specified
if(not $channel_arg and $recall_nick =~ m/^#/) { if(not $channel_arg and $recall_nick =~ m/^#/) {
@ -220,28 +224,30 @@ sub recall_message {
} }
} }
if(defined $message->{id}) { if ($recall_before + $recall_after > 200) {
my $hostmask = $self->{database}->find_most_recent_hostmask($message->{id}); return "You may only select 200 lines of surrounding context.";
($found_nick) = $hostmask =~ m/^([^!]+)/;
$recall_nick = $found_nick;
} }
$self->{pbot}->{logger}->log("$nick ($from) recalled <$recall_nick/$recall_channel> $message->{msg}\n"); my $messages = $self->{database}->get_message_context($message, $recall_before, $recall_after);
my $text = $message->{msg}; foreach my $msg (@$messages) {
my $ago = ago(gettimeofday - $message->{timestamp}); $self->{pbot}->{logger}->log("$nick ($from) recalled <$msg->{nick}/$msg->{channel}> $msg->{msg}\n");
if(not defined $recall_text) { my $text = $msg->{msg};
if($text =~ s/^\/me\s+// or $text =~ m/^KICKED /) { my $ago = ago(gettimeofday - $msg->{timestamp});
$recall_text = "[$ago] * $found_nick $text";
if(not defined $recall_text) {
if($text =~ s/^\/me\s+// or $text =~ m/^KICKED /) {
$recall_text = "[$ago] * $msg->{nick} $text\n";
} else {
$recall_text = "[$ago] <$msg->{nick}> $text\n";
}
} else { } else {
$recall_text = "[$ago] <$found_nick> $text"; if($text =~ s/^\/me\s+// or $text =~ m/^KICKED /) {
} $recall_text .= "[$ago] * $msg->{nick} $text\n";
} else { } else {
if($text =~ s/^\/me\s+// or $text =~ m/^KICKED /) { $recall_text .= "[$ago] <$msg->{nick}> $text\n";
$recall_text .= " [$ago] * $found_nick $text"; }
} else {
$recall_text .= " [$ago] <$found_nick> $text";
} }
} }
} }

55
PBot/MessageHistory_SQLite.pm
View File

@ -441,6 +441,53 @@ SQL
return $messages; return $messages;
} }
sub get_message_context {
my ($self, $message, $before, $after) = @_;
my ($messages_before, $messages_after);
if (defined $before and $before > 0) {
$messages_before = eval {
my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE channel = ? AND timestamp < ? AND mode != 1 ORDER BY timestamp DESC LIMIT ?');
$sth->bind_param(1, $message->{channel});
$sth->bind_param(2, $message->{timestamp});
$sth->bind_param(3, $before);
$sth->execute();
return [reverse @{$sth->fetchall_arrayref({})}];
};
$self->{pbot}->{logger}->log($@) if $@;
}
if (defined $after and $after > 0) {
$messages_after = eval {
my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE channel = ? AND timestamp > ? AND mode != 1 LIMIT ?');
$sth->bind_param(1, $message->{channel});
$sth->bind_param(2, $message->{timestamp});
$sth->bind_param(3, $after);
$sth->execute();
return $sth->fetchall_arrayref({});
};
$self->{pbot}->{logger}->log($@) if $@;
}
my @messages;
push(@messages, @$messages_before) if defined $messages_before;
push(@messages, $message);
push(@messages, @$messages_after) if defined $messages_after;
my %nicks;
foreach my $msg (@messages) {
if (not exists $nicks{$msg->{id}}) {
my $hostmask = $self->find_most_recent_hostmask($msg->{id});
my ($nick) = $hostmask =~ m/^([^!]+)/;
$nicks{$msg->{id}} = $nick;
}
$msg->{nick} = $nicks{$msg->{id}};
}
return \@messages;
}
sub recall_message_by_count { sub recall_message_by_count {
my ($self, $id, $channel, $count, $ignore_command) = @_; my ($self, $id, $channel, $count, $ignore_command) = @_;
@ -448,7 +495,7 @@ sub recall_message_by_count {
if(defined $id) { if(defined $id) {
$messages = eval { $messages = eval {
my $sth = $self->{dbh}->prepare('SELECT msg, mode, timestamp FROM Messages WHERE id = ? AND channel = ? ORDER BY timestamp DESC LIMIT 10 OFFSET ?'); my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE id = ? AND channel = ? ORDER BY timestamp DESC LIMIT 10 OFFSET ?');
$sth->bind_param(1, $id); $sth->bind_param(1, $id);
$sth->bind_param(2, $channel); $sth->bind_param(2, $channel);
$sth->bind_param(3, $count); $sth->bind_param(3, $count);
@ -457,7 +504,7 @@ sub recall_message_by_count {
}; };
} else { } else {
$messages = eval { $messages = eval {
my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp FROM Messages WHERE channel = ? ORDER BY timestamp DESC LIMIT 10 OFFSET ?'); my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE channel = ? ORDER BY timestamp DESC LIMIT 10 OFFSET ?');
$sth->bind_param(1, $channel); $sth->bind_param(1, $channel);
$sth->bind_param(2, $count); $sth->bind_param(2, $count);
$sth->execute(); $sth->execute();
@ -489,7 +536,7 @@ sub recall_message_by_text {
if(defined $id) { if(defined $id) {
$messages = eval { $messages = eval {
my $sth = $self->{dbh}->prepare('SELECT msg,mode,timestamp FROM Messages WHERE id = ? AND channel = ? AND msg LIKE ? ORDER BY timestamp DESC LIMIT 10'); my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE id = ? AND channel = ? AND msg LIKE ? ORDER BY timestamp DESC LIMIT 10');
$sth->bind_param(1, $id); $sth->bind_param(1, $id);
$sth->bind_param(2, $channel); $sth->bind_param(2, $channel);
$sth->bind_param(3, "%$text%"); $sth->bind_param(3, "%$text%");
@ -498,7 +545,7 @@ sub recall_message_by_text {
}; };
} else { } else {
$messages = eval { $messages = eval {
my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp FROM Messages WHERE channel = ? AND msg LIKE ? ORDER BY timestamp DESC LIMIT 10'); my $sth = $self->{dbh}->prepare('SELECT id, msg, mode, timestamp, channel FROM Messages WHERE channel = ? AND msg LIKE ? ORDER BY timestamp DESC LIMIT 10');
$sth->bind_param(1, $channel); $sth->bind_param(1, $channel);
$sth->bind_param(2, "%$text%"); $sth->bind_param(2, "%$text%");
$sth->execute(); $sth->execute();