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

Restored load, unload, count and histogram commands. 

Removed enable/disable commands; use factset instead.

Add default_rate_limit registry entry.

Add newlines to output of DualIndexHashable set() subroutine.
This commit is contained in:
Pragmatic Software 2014-05-24 12:01:59 +00:00
parent 02c0143634
commit a81ba775fc
4 changed files with 44 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/DualIndexHashObject.pm
View File

@ -237,11 +237,11 @@ sub set {
} }
if(not defined $key) { if(not defined $key) {
my $result = "[" . ($primary eq '.*' ? 'global' : $primary) . "] $secondary keys: "; my $result = "[" . ($primary eq '.*' ? 'global' : $primary) . "] $secondary keys:\n";
my $comma = ''; my $comma = '';
foreach my $key (sort keys %{ $self->hash->{$primary}->{$secondary} }) { foreach my $key (sort keys %{ $self->hash->{$primary}->{$secondary} }) {
$result .= $comma . "$key => " . $self->hash->{$primary}->{$secondary}->{$key}; $result .= $comma . "$key => " . $self->hash->{$primary}->{$secondary}->{$key};
$comma = "; "; $comma = ";\n";
} }
$result .= "none" if($comma eq ''); $result .= "none" if($comma eq '');
return $result; return $result;

109
PBot/FactoidCommands.pm
View File

@ -67,16 +67,14 @@ sub initialize {
$pbot->{commands}->register(sub { return $self->factfind(@_) }, "factfind", 0); $pbot->{commands}->register(sub { return $self->factfind(@_) }, "factfind", 0);
$pbot->{commands}->register(sub { return $self->list(@_) }, "list", 0); $pbot->{commands}->register(sub { return $self->list(@_) }, "list", 0);
$pbot->{commands}->register(sub { return $self->top20(@_) }, "top20", 0); $pbot->{commands}->register(sub { return $self->top20(@_) }, "top20", 0);
$pbot->{commands}->register(sub { return $self->load_module(@_) }, "load", 60);
$pbot->{commands}->register(sub { return $self->unload_module(@_) }, "unload", 60);
$pbot->{commands}->register(sub { return $self->histogram(@_) }, "histogram", 0);
$pbot->{commands}->register(sub { return $self->count(@_) }, "count", 0);
# the following commands have not yet been updated to use the new factoid structure # the following commands have not yet been updated to use the new factoid structure
# DO NOT USE!! Factoid corruption may occur. # DO NOT USE!! Factoid corruption may occur.
$pbot->{commands}->register(sub { return $self->add_regex(@_) }, "regex", 999); $pbot->{commands}->register(sub { return $self->add_regex(@_) }, "regex", 999);
$pbot->{commands}->register(sub { return $self->histogram(@_) }, "histogram", 999);
$pbot->{commands}->register(sub { return $self->count(@_) }, "count", 999);
$pbot->{commands}->register(sub { return $self->load_module(@_) }, "load", 999);
$pbot->{commands}->register(sub { return $self->unload_module(@_) }, "unload", 999);
$pbot->{commands}->register(sub { return $self->enable_command(@_) }, "enable", 999);
$pbot->{commands}->register(sub { return $self->disable_command(@_) }, "disable", 999);
} }
sub call_factoid { sub call_factoid {
@ -502,14 +500,16 @@ sub factrem {
sub histogram { sub histogram {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;
my %hash; my %hash;
my $factoid_count = 0; my $factoid_count = 0;
foreach my $command (keys %{ $factoids }) { foreach my $channel (keys %$factoids) {
if(exists $factoids->{$command}{text}) { foreach my $command (keys %{ $factoids->{$channel} }) {
$hash{$factoids->{$command}{owner}}++; if($factoids->{$channel}->{$command}->{type} eq 'text') {
$factoid_count++; $hash{$factoids->{$channel}->{$command}->{owner}}++;
$factoid_count++;
}
} }
} }
@ -518,12 +518,11 @@ sub histogram {
foreach my $owner (sort {$hash{$b} <=> $hash{$a}} keys %hash) { foreach my $owner (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
my $percent = int($hash{$owner} / $factoid_count * 100); my $percent = int($hash{$owner} / $factoid_count * 100);
$percent = 1 if $percent == 0; $text .= "$owner: $hash{$owner} ($percent". "%)\n";
$text .= "$owner: $hash{$owner} ($percent". "%) ";
$i++; $i++;
last if $i >= 10; last if $i >= 10;
} }
return "$factoid_count factoids, top 10 submitters: $text"; return "$factoid_count factoids, top 10 submitters:\n$text";
} }
sub factshow { sub factshow {
@ -661,7 +660,7 @@ sub top20 {
sub count { sub count {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;
my $i = 0; my $i = 0;
my $total = 0; my $total = 0;
@ -672,17 +671,19 @@ sub count {
$arguments = ".*" if($arguments =~ /^factoids$/); $arguments = ".*" if($arguments =~ /^factoids$/);
eval { eval {
foreach my $command (keys %{ $factoids }) { foreach my $channel (keys %{ $factoids }) {
$total++ if exists $factoids->{$command}{text}; foreach my $command (keys %{ $factoids->{$channel} }) {
my $regex = qr/^\Q$arguments\E$/; next if $factoids->{$channel}->{$command}->{type} ne 'text';
if($factoids->{$command}{owner} =~ /$regex/i && exists $factoids->{$command}{text}) { $total++;
$i++; if($factoids->{$channel}->{$command}->{owner} =~ /\Q$arguments\E/i) {
$i++;
}
} }
} }
}; };
return "/msg $nick $arguments: $@" if $@; return "/msg $nick $arguments: $@" if $@;
return "I have $i factoids" if($arguments eq ".*"); return "I have $i factoids." if $arguments eq ".*";
if($i > 0) { if($i > 0) {
my $percent = int($i / $total * 100); my $percent = int($i / $total * 100);
@ -773,9 +774,9 @@ sub factfind {
if($i == 1) { if($i == 1) {
chop $text; chop $text;
return "found one factoid submitted for " . ($last_chan eq '.*' ? 'global channel' : $last_chan) . " " . $argtype . ": $last_trigger is $factoids->{$last_chan}->{$last_trigger}->{action}"; return "Found one factoid submitted for " . ($last_chan eq '.*' ? 'global channel' : $last_chan) . " " . $argtype . ": $last_trigger is $factoids->{$last_chan}->{$last_trigger}->{action}";
} else { } else {
return "found $i factoids " . $argtype . ": $text" unless $i == 0; return "Found $i factoids " . $argtype . ": $text" unless $i == 0;
my $chans = (defined $channel ? ($channel eq '.*' ? 'global channel' : $channel) : 'any channels'); my $chans = (defined $channel ? ($channel eq '.*' ? 'global channel' : $channel) : 'any channels');
return "No factoids " . $argtype . " submitted for $chans"; return "No factoids " . $argtype . " submitted for $chans";
@ -836,77 +837,41 @@ sub factchange {
sub load_module { sub load_module {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;
my ($keyword, $module) = $arguments =~ /^(.*?)\s+(.*)$/ if defined $arguments; my ($keyword, $module) = $arguments =~ /^(.*?)\s+(.*)$/ if defined $arguments;
if(not defined $module) { if(not defined $module) {
return "/msg $nick Usage: load <command> <module>"; return "/msg $nick Usage: load <keyword> <module>";
} }
if(not exists($factoids->{$keyword})) { if(not exists($factoids->{'.*'}->{$keyword})) {
$factoids->{$keyword}{module} = $module; $self->{pbot}->{factoids}->add_factoid('module', '.*', "$nick!$user\@$host", $keyword, $module);
$factoids->{$keyword}{enabled} = 1; $factoids->{'.*'}->{$keyword}->{add_nick} = 1;
$factoids->{$keyword}{owner} = $nick; $self->{pbot}->{logger}->log("$nick!$user\@$host loaded module $keyword => $module\n");
$factoids->{$keyword}{created_on} = time();
$self->{pbot}->{logger}->log("$nick!$user\@$host loaded $keyword => $module\n");
$self->{pbot}->{factoids}->save_factoids(); $self->{pbot}->{factoids}->save_factoids();
return "/msg $nick Loaded $keyword => $module"; return "/msg $nick Loaded module $keyword => $module";
} else { } else {
return "/msg $nick There is already a command named $keyword."; return "/msg $nick There is already a keyword named $keyword.";
} }
} }
sub unload_module { sub unload_module {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;
if(not defined $arguments) { if(not defined $arguments) {
return "/msg $nick Usage: unload <module>"; return "/msg $nick Usage: unload <keyword>";
} elsif(not exists $factoids->{$arguments}) { } elsif(not exists $factoids->{'.*'}->{$arguments}) {
return "/msg $nick $arguments not found."; return "/msg $nick $arguments not found.";
} elsif(not exists $factoids->{$arguments}{module}) { } elsif($factoids->{'.*'}->{$arguments}{type} ne 'module') {
return "/msg $nick $arguments is not a module."; return "/msg $nick $arguments is not a module.";
} else { } else {
delete $factoids->{$arguments}; delete $factoids->{'.*'}->{$arguments};
$self->{pbot}->{factoids}->save_factoids(); $self->{pbot}->{factoids}->save_factoids();
$self->{pbot}->{logger}->log("$nick!$user\@$host unloaded module $arguments\n"); $self->{pbot}->{logger}->log("$nick!$user\@$host unloaded module $arguments\n");
return "/msg $nick $arguments unloaded."; return "/msg $nick $arguments unloaded.";
} }
} }
sub enable_command {
my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids;
if(not defined $arguments) {
return "/msg $nick Usage: enable <command>";
} elsif(not exists $factoids->{$arguments}) {
return "/msg $nick $arguments not found.";
} else {
$factoids->{$arguments}{enabled} = 1;
$self->{pbot}->{factoids}->save_factoids();
$self->{pbot}->{logger}->log("$nick!$user\@$host enabled $arguments\n");
return "/msg $nick $arguments enabled.";
}
}
sub disable_command {
my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_;
my $factoids = $self->{pbot}->{factoids}->factoids;
if(not defined $arguments) {
return "/msg $nick Usage: disable <command>";
} elsif(not exists $factoids->{$arguments}) {
return "/msg $nick $arguments not found.";
} else {
$factoids->{$arguments}{enabled} = 0;
$self->{pbot}->{factoids}->save_factoids();
$self->{pbot}->{logger}->log("$nick!$user\@$host disabled $arguments\n");
return "/msg $nick $arguments disabled.";
}
}
1; 1;

4
PBot/Factoids.pm
View File

@ -47,6 +47,8 @@ sub initialize {
$self->{commands} = PBot::FactoidCommands->new(pbot => $pbot); $self->{commands} = PBot::FactoidCommands->new(pbot => $pbot);
$self->{factoidmodulelauncher} = PBot::FactoidModuleLauncher->new(pbot => $pbot); $self->{factoidmodulelauncher} = PBot::FactoidModuleLauncher->new(pbot => $pbot);
$self->{pbot}->{registry}->add_default('text', 'factoids', 'default_rate_limit', '15');
$self->{pbot}->{atexit}->register(sub { $self->save_factoids; return; }); $self->{pbot}->{atexit}->register(sub { $self->save_factoids; return; });
$self->load_factoids; $self->load_factoids;
@ -95,7 +97,7 @@ sub add_factoid {
$self->{factoids}->hash->{$channel}->{$trigger}->{created_on} = gettimeofday; $self->{factoids}->hash->{$channel}->{$trigger}->{created_on} = gettimeofday;
$self->{factoids}->hash->{$channel}->{$trigger}->{ref_count} = 0; $self->{factoids}->hash->{$channel}->{$trigger}->{ref_count} = 0;
$self->{factoids}->hash->{$channel}->{$trigger}->{ref_user} = "nobody"; $self->{factoids}->hash->{$channel}->{$trigger}->{ref_user} = "nobody";
$self->{factoids}->hash->{$channel}->{$trigger}->{rate_limit} = 15; $self->{factoids}->hash->{$channel}->{$trigger}->{rate_limit} = $self->{pbot}->{registry}->get_value('factoids', 'default_rate_limit');
$self->save_factoids unless $dont_save; $self->save_factoids unless $dont_save;
} }

4
PBot/VERSION.pm
View File

@ -13,8 +13,8 @@ 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 => 601, BUILD_REVISION => 602,
BUILD_DATE => "2014-05-23", BUILD_DATE => "2014-05-24",
}; };
1; 1;