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

factundo and factlog now handle deleted factoids

Browse Source
This commit is contained in:
Pragmatic Software 2017-09-02 01:05:11 -07:00
parent 12a92ea7d3
commit a2cd25facd
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PBot/FactoidCommands.pm
View File

@ -269,7 +269,18 @@ sub factundo {
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factundo', undef, 1); my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factundo', undef, 1);
return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message my $deleted;
if (not defined $trigger) {
# factoid not found or some error, try to continue and load undo file if it exists
$deleted = 1;
($channel, $trigger) = split /\s+/, $arguments, 2;
if (not defined $trigger) {
$trigger = $channel;
$channel = $from;
}
$channel = '.*' if $channel !~ m/^#/;
}
my $channel_path = $channel; my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*'; $channel_path = 'global' if $channel_path eq '.*';
@ -285,8 +296,10 @@ sub factundo {
return "There are no more undos remaining for [$channel] $trigger."; return "There are no more undos remaining for [$channel] $trigger.";
} }
$undos->{idx}--; unless ($deleted) {
store $undos, "$path/$trigger.$channel_path.undo"; $undos->{idx}--;
store $undos, "$path/$trigger.$channel_path.undo";
}
$self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}]; $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}];
@ -839,7 +852,16 @@ sub factlog {
return "Missing argument -- $usage" if not @$args; return "Missing argument -- $usage" if not @$args;
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, "@$args", 'factlog', $usage); my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, "@$args", 'factlog', $usage);
return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message
if (not defined $trigger) {
# factoid not found or some error, try to continue and load factlog file if it exists
($channel, $trigger) = split /\s+/, "@$args", 2;
if (not defined $trigger) {
$trigger = $channel;
$channel = $from;
}
$channel = '.*' if $channel !~ m/^#/;
}
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';