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

Spinach: `load` now accepts a filename argument

This commit is contained in:
Pragmatic Software 2018-02-26 16:54:34 -08:00
parent 6bf04038fa
commit f0a0fd6def
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/Plugins/Spinach.pm
View File

@ -87,17 +87,25 @@ sub on_departure {
}
sub load_questions {
my $self = shift;
my ($self, $filename) = @_;
if (not defined $filename) {
$filename = exists $self->{loaded_filename} ? $self->{loaded_filename} : $self->{questions_filename};
} else {
$filename = $self->{pbot}->{registry}->get_value('general', 'data_dir') . "/spinach/$filename";
}
my $contents = do {
open my $fh, '<', $self->{questions_filename} or do {
$self->{pbot}->{logger}->log("Spinach: Failed to open $self->{questions_filename}: $!\n");
return;
open my $fh, '<', $filename or do {
$self->{pbot}->{logger}->log("Spinach: Failed to open $filename: $!\n");
return "Failed to load $filename";
};
local $/;
<$fh>;
};
$self->{loaded_filename} = $filename;
$self->{questions} = decode_json $contents;
$self->{categories} = ();
@ -118,6 +126,7 @@ sub load_questions {
}
$self->{pbot}->{logger}->log("Spinach: Loaded $questions questions in $categories categories.\n");
return "Loaded $questions questions in $categories categories.";
}
sub load_stopwords {
@ -333,8 +342,9 @@ sub spinach_cmd {
$question->{$key} = $value;
my $json = encode_json $self->{questions};
open my $fh, '>', $self->{questions_filename} or do {
$self->{pbot}->{logger}->log("Failed to open Spinach file: $!\n");
my $filename = exists $self->{loaded_filename} ? $self->{loaded_filename} : $self->{questions_filename};
open my $fh, '>', $filename or do {
$self->{pbot}->{logger}->log("Failed to open Spinach file $filename: $!\n");
return;
};
print $fh "$json\n";
@ -352,7 +362,8 @@ sub spinach_cmd {
return "$nick: Sorry, only very powerful admins may reload the questions.";
}
$self->load_questions;
$arguments = undef if not length $arguments;
return $self->load_questions($arguments);
}
when ('leaderboard') {
@ -624,7 +635,7 @@ sub spinach_cmd {
return "/msg $self->{channel} $nick has chosen RANDOM CATEGORY! Randomly choosing category: $self->{state_data}->{current_category}!";
} elsif ($arguments == @{$self->{state_data}->{category_options}} - 1) {
if (++$self->{state_data}->{category_rerolls} >= 3) {
return "/msg $self->{channel} $nick has chosen REROLL CATEGORIES! But they have exceeded the number of times they may reroll!";
return "/msg $self->{channel} $nick has chosen REROLL CATEGORIES! But they have exceeded the number of times they may reroll this turn.";
} else {
$self->{state_data}->{reroll_category} = 1;
return "/msg $self->{channel} $nick has chosen REROLL CATEGORIES! Rerolling categories...";
@ -818,8 +829,9 @@ sub add_new_suggestions {
if ($modified) {
my $json = encode_json $self->{questions};
open my $fh, '>', $self->{questions_filename} or do {
$self->{pbot}->{logger}->log("Failed to open Spinach file: $!\n");
my $filename = exists $self->{loaded_filename} ? $self->{loaded_filename} : $self->{questions_filename};
open my $fh, '>', $filename or do {
$self->{pbot}->{logger}->log("Failed to open Spinach file $filename: $!\n");
return;
};
print $fh "$json\n";