GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use export_site properly in Quotegrabs.pm

This commit is contained in:
Pragmatic Software 2014-03-03 10:33:34 +00:00
parent f6c75f2b4f
commit 9b2c374bbb
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/Factoids.pm
View File

@ -38,7 +38,7 @@ sub initialize {
my $export_path = delete $conf{export_path}; my $export_path = delete $conf{export_path};
my $export_site = delete $conf{export_site}; my $export_site = delete $conf{export_site};
my $pbot = delete $conf{pbot} || Carp::croak("Missing pbot reference to Factoids"); my $pbot = delete $conf{pbot} // Carp::croak("Missing pbot reference to Factoids");
$self->{factoids} = PBot::DualIndexHashObject->new(name => 'Factoids', filename => $filename); $self->{factoids} = PBot::DualIndexHashObject->new(name => 'Factoids', filename => $filename);
$self->{export_path} = $export_path; $self->{export_path} = $export_path;

27
PBot/Quotegrabs.pm
View File

@ -32,29 +32,22 @@ sub new {
sub initialize { sub initialize {
my ($self, %conf) = @_; my ($self, %conf) = @_;
my $pbot = delete $conf{pbot}; $self->{pbot} = delete $conf{pbot} // Carp::croak("Missing pbot reference in Quotegrabs");
if(not defined $pbot) { $self->{filename} = delete $conf{filename};
Carp::croak("Missing pbot reference to Quotegrabs"); $self->{export_path} = delete $conf{export_path};
} $self->{export_site} = delete $conf{export_site};
my $filename = delete $conf{filename};
my $export_path = delete $conf{export_path};
$self->{pbot} = $pbot;
$self->{filename} = $filename;
$self->{export_path} = $export_path;
$self->{quotegrabs} = []; $self->{quotegrabs} = [];
#------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------
# The following could be in QuotegrabsCommands.pm, or they could be kept in here? # The following could be in QuotegrabsCommands.pm, or they could be kept in here?
#------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------
$pbot->commands->register(sub { $self->grab_quotegrab(@_) }, "grab", 0); $self->{pbot}->commands->register(sub { $self->grab_quotegrab(@_) }, "grab", 0);
$pbot->commands->register(sub { $self->show_quotegrab(@_) }, "getq", 0); $self->{pbot}->commands->register(sub { $self->show_quotegrab(@_) }, "getq", 0);
$pbot->commands->register(sub { $self->delete_quotegrab(@_) }, "delq", 0); $self->{pbot}->commands->register(sub { $self->delete_quotegrab(@_) }, "delq", 0);
$pbot->commands->register(sub { $self->show_random_quotegrab(@_) }, "rq", 0); $self->{pbot}->commands->register(sub { $self->show_random_quotegrab(@_) }, "rq", 0);
# ought to be in MessageTracker.pm once we create that module # ought to be in MessageTracker.pm once we create that module
$pbot->commands->register(sub { $self->recall_message(@_) }, "recall", 0); $self->{pbot}->commands->register(sub { $self->recall_message(@_) }, "recall", 0);
} }
sub load_quotegrabs { sub load_quotegrabs {
@ -201,7 +194,7 @@ sub export_quotegrabs() {
print FILE "</script>\n"; print FILE "</script>\n";
print FILE "</body>\n</html>\n"; print FILE "</body>\n</html>\n";
close(FILE); close(FILE);
return "$i quotegrabs exported to http://blackshell.com/~msmud/candide/quotegrabs.html"; return "$i quotegrabs exported to " . $self->{export_site};
} }
# ---------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------

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 => 495, BUILD_REVISION => 496,
BUILD_DATE => "2014-03-03", BUILD_DATE => "2014-03-03",
}; };