X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FFactoids.pl;h=9a2a8592bbce4c4a59b9bb4713fcdf80d547e5ef;hb=a41f790cd30339179f7ae655a3009f22d61fc9e3;hp=ef80889ffff147141cddf412b24657e1004017fc;hpb=a67865e514e92be2239d5754d08f3ef4f2fc8796;p=infobot.git

diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl
index ef80889..9a2a859 100644
--- a/src/Modules/Factoids.pl
+++ b/src/Modules/Factoids.pl
@@ -14,7 +14,6 @@ use vars qw(%param);
 # Usage: &CmdFactInfo($faqtoid, $query);
 sub CmdFactInfo {
     my ($faqtoid, $query) = (lc $_[0], $_[1]);
-    $faqtoid =~ s/^cmd:/CMD:/;
     my @array;
     my $string = "";
 
@@ -129,7 +128,7 @@ sub CmdFactInfo {
 	return;
     }
 
-    &pSReply("$factinfo{'factoid_key'} -- ". join("; ", @array) .".");
+    &performStrictReply("$factinfo{'factoid_key'} -- ". join("; ", @array) .".");
     return;
 }
 
@@ -172,7 +171,7 @@ sub CmdFactStats {
 	return &formListReply(0, $prefix, @list);
 
     } elsif ($type =~ /^vandalism$/i) {
-        &status("factstats(vandalism): starting...");
+	&status("factstats(vandalism): starting...");
 	my $start_time	= &timeget();
 	my %data	= &sqlSelectColHash("factoids",
 		"factoid_key,factoid_value", undef,
@@ -181,7 +180,7 @@ sub CmdFactStats {
 	my @list;
 
 	my $delta_time	= &timedelta($start_time);
-        &status(sprintf("factstats(vandalism): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
+	&status(sprintf("factstats(vandalism): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
 	$start_time	= &timeget();
 
 	# parse the factoids.
@@ -193,7 +192,7 @@ sub CmdFactStats {
 	}
 
 	$delta_time	= &timedelta($start_time);
-        &status(sprintf("factstats(vandalism): %.02f sec to complete.", $delta_time)) if ($delta_time > 0);
+	&status(sprintf("factstats(vandalism): %.02f sec to complete.", $delta_time)) if ($delta_time > 0);
 
 	# bail out on no results.
 	if (scalar @list == 0) {
@@ -205,7 +204,7 @@ sub CmdFactStats {
 	return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^total$/i) {
-        &status("factstats(total): starting...");
+	&status("factstats(total): starting...");
 	my $start_time	= &timeget();
 	my @list;
 	my $str;
@@ -236,7 +235,7 @@ sub CmdFactStats {
 	push(@list, "total prepared for deletion - $str");
 
 	# total unique authors.
-	# todo: convert to sqlSelectColHash ? (or ColArray?)
+	# TODO: convert to sqlSelectColHash ? (or ColArray?)
 	foreach ( &sqlRawReturn("SELECT created_by FROM factoids WHERE created_by IS NOT NULL") ) {
 	    /^(\S+)!/;
 	    my $nick = lc $1;
@@ -257,7 +256,7 @@ sub CmdFactStats {
 	### end of "job".
 
 	my $delta_time	= &timedelta($start_time);
-        &status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
+	&status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0);
 	$start_time	= &timeget();
 
 	# bail out on no results.
@@ -303,9 +302,9 @@ sub CmdFactStats {
 	return &formListReply(1, $prefix, @newlist);
 
     } elsif ($type =~ /^dup(licate|e)$/i) {
-        &status("factstats(dupe): starting...");
+	&status("factstats(dupe): starting...");
 	my $start_time	= &timeget();
-	my %hash	= &sqlSelectColHash("factoids", 
+	my %hash	= &sqlSelectColHash("factoids",
 		"factoid_key,factoid_value", undef,
 		"WHERE factoid_value IS NOT NULL", 1
 	);
@@ -339,7 +338,7 @@ sub CmdFactStats {
 
 	&status("factstats(dupe): (good) dupe refs: $refs.");
 	my $delta_time	= &timedelta($start_time);
-        &status(sprintf("factstats(dupe): %.02f sec to complete", $delta_time)) if ($delta_time > 0);
+	&status(sprintf("factstats(dupe): %.02f sec to complete", $delta_time)) if ($delta_time > 0);
 
 	# bail out on no results.
 	if (scalar @list == 0) {
@@ -424,7 +423,7 @@ sub CmdFactStats {
 	return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^locked$/i) {
-	my %hash = &sqlSelectColhash("factoids", 
+	my %hash = &sqlSelectColhash("factoids",
 		"factoid_key,locked_by", undef,
 		"WHERE locked_by IS NOT NULL"
 	);
@@ -507,7 +506,7 @@ sub CmdFactStats {
 	}
 
 	my $delta_time = sprintf("%.02fs", &timedelta($start_time) );
-        &status("factstats(partdupe): $delta_time sec to complete.") if ($delta_time > 0);
+	&status("factstats(partdupe): $delta_time sec to complete.") if ($delta_time > 0);
 
 	# bail out on no results.
 	if (scalar @list == 0) {
@@ -728,7 +727,7 @@ sub CmdFactStats {
 	return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^unrequest(ed)?$/i) {
-	# todo: use sqlSelect()
+	# TODO: use sqlSelect()
 	my ($count) = &sqlRawReturn("SELECT COUNT(*) FROM factoids WHERE requested_count = '0'");
 
 	return "Unrequested factoids: $count";
@@ -739,7 +738,9 @@ sub CmdFactStats {
 
 sub CmdListAuth {
     my ($query) = @_;
+    my $maxshow = &::getChanConfDefault('maxListReplyCount', 15, $chan);
     my @list = &searchTable("factoids","factoid_key", "created_by", "^$query!");
+    @list=grep(!/\#DEL\#$/,@list) if (scalar(@list) > $maxshow);
 
     my $prefix = "factoid author list by '$query' ";
     &performStrictReply( &formListReply(1, $prefix, @list) );