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

MessageHistory: Increase limits back to 100; remove "I have messages for them in ..."

Browse Source
This commit is contained in:
Pragmatic Software 2020-04-21 15:14:11 -07:00
parent 903d663d18
commit 2c2d547b51
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PBot/MessageHistory.pm
View File

@ -233,7 +233,7 @@ sub recall_message {
$recall_channel = "@opt_args" if @opt_args and not $channel_arg; $recall_channel = "@opt_args" if @opt_args and not $channel_arg;
$recall_count = 1 if (not defined $recall_count) || ($recall_count <= 0); $recall_count = 1 if (not defined $recall_count) || ($recall_count <= 0);
return "You may only select a count of up to 50 messages." if $recall_count > 50; return "You may only select a count of up to 100 messages." if $recall_count > 100;
$recall_before = 0 if not defined $recall_before; $recall_before = 0 if not defined $recall_before;
$recall_after = 0 if not defined $recall_after; $recall_after = 0 if not defined $recall_after;
@ -247,7 +247,7 @@ sub recall_message {
$recall_count = 0; $recall_count = 0;
} }
if ($recall_before + $recall_after > 20) { return "You may only select up to 20 lines of surrounding context."; } if ($recall_before + $recall_after > 100) { return "You may only select up to 100 lines of surrounding context."; }
if ($recall_count > 1 and ($recall_before > 0 or $recall_after > 0)) { return "The `count` and `before/after` options cannot be used together."; } if ($recall_count > 1 and ($recall_before > 0 or $recall_after > 0)) { return "The `count` and `before/after` options cannot be used together."; }
@ -302,18 +302,7 @@ sub recall_message {
my $max_messages = $self->{database}->get_max_messages($account, $recall_channel); my $max_messages = $self->{database}->get_max_messages($account, $recall_channel);
if ($recall_history < 1 || $recall_history > $max_messages) { if ($recall_history < 1 || $recall_history > $max_messages) {
if ($max_messages == 0) { if ($max_messages == 0) {
my @channels = $self->{database}->get_channels($account); return "No messages for $recall_nick in $recall_channel yet.";
my $result = "No messages for $recall_nick in $recall_channel; I have messages for them in ";
my $comma = '';
my $count = 0;
foreach my $channel (sort @channels) {
next if $channel !~ /^#/;
$result .= "$comma$channel";
$comma = ', ';
$count++;
}
if ($count == 0) { return "I have no messages for $recall_nick."; }
else { return "/say $result."; }
} else { } else {
return "Please choose a history between 1 and $max_messages"; return "Please choose a history between 1 and $max_messages";
} }