GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-24 11:42:35 +01:00
Code Issues Projects Releases Wiki Activity

Completely botched undo/redo for global factoids -- fixed now

Browse Source
This commit is contained in:
Pragmatic Software 2017-08-26 21:35:46 -07:00
parent b50f9f95ce
commit a723bc3f65
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PBot/FactoidCommands.pm
View File

@ -114,10 +114,11 @@ sub log_factoid {
my $self = shift; my $self = shift;
my ($channel, $trigger, $hostmask, $msg, $dont_save_undo) = @_; my ($channel, $trigger, $hostmask, $msg, $dont_save_undo) = @_;
$channel = 'global' if $channel eq '.*'; my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*';
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
open my $fh, ">> $path/$trigger.$channel" or do { open my $fh, ">> $path/$trigger.$channel_path" or do {
$self->{pbot}->{logger}->log("Failed to open factlog for $channel/$trigger: $!\n"); $self->{pbot}->{logger}->log("Failed to open factlog for $channel/$trigger: $!\n");
return; return;
}; };
@ -128,7 +129,7 @@ sub log_factoid {
return if $dont_save_undo; return if $dont_save_undo;
my $undos = eval { retrieve("$path/$trigger.$channel.undo"); }; my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); };
if (not $undos) { if (not $undos) {
$undos = { $undos = {
@ -150,7 +151,9 @@ sub log_factoid {
push @{$undos->{list}}, $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger}; push @{$undos->{list}}, $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger};
$undos->{idx}++; $undos->{idx}++;
store $undos, "$path/$trigger.$channel.undo"; print "storing undo [$channel][$trigger]\n";
store $undos, "$path/$trigger.$channel_path.undo";
} }
sub find_factoid_with_optional_channel { sub find_factoid_with_optional_channel {
@ -218,8 +221,13 @@ sub factundo {
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factundo'); my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factundo');
return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message
my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*';
print "channel: [$channel][$channel_path]\n";
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
my $undos = eval { retrieve("$path/$trigger.$channel.undo"); }; my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); };
if (not $undos) { if (not $undos) {
return "There are no undos available for [$channel] $trigger."; return "There are no undos available for [$channel] $trigger.";
@ -229,11 +237,12 @@ sub factundo {
return "There are no more undos remaining for [$channel] $trigger."; return "There are no more undos remaining for [$channel] $trigger.";
} }
$self->log_factoid($channel, $trigger, "$nick!$user\@$host", "reverted (undo) to revision ". ($undos->{idx} + 1), 1);
$undos->{idx}--; $undos->{idx}--;
store $undos, "$path/$trigger.$channel.undo"; 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}];
$self->log_factoid($channel, $trigger, "$nick!$user\@$host", "reverted (undo) to revision ". ($undos->{idx} + 1), 1);
return "[$channel] $trigger reverted to revision " . ($undos->{idx} + 1); return "[$channel] $trigger reverted to revision " . ($undos->{idx} + 1);
} }
@ -244,8 +253,11 @@ sub factredo {
my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factredo'); my ($channel, $trigger) = $self->find_factoid_with_optional_channel($from, $arguments, 'factredo');
return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message return $channel if not defined $trigger; # if $trigger is not defined, $channel is an error message
my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*';
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
my $undos = eval { retrieve("$path/$trigger.$channel.undo"); }; my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); };
if (not $undos) { if (not $undos) {
return "There are no redos available for [$channel] $trigger."; return "There are no redos available for [$channel] $trigger.";
@ -258,7 +270,7 @@ sub factredo {
$self->log_factoid($channel, $trigger, "$nick!$user\@$host", "reverted (redo) to revision ". ($undos->{idx} + 1), 1); $self->log_factoid($channel, $trigger, "$nick!$user\@$host", "reverted (redo) to revision ". ($undos->{idx} + 1), 1);
$undos->{idx}++; $undos->{idx}++;
store $undos, "$path/$trigger.$channel.undo"; 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}];
return "[$channel] $trigger reverted to revision " . ($undos->{idx} + 1); return "[$channel] $trigger reverted to revision " . ($undos->{idx} + 1);
} }