X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FFactoids%2FCore.pl;h=e33685c91f712214a267652cb45f453f00a8f1a0;hb=1d1a175a96a95664e644ca0253b9bbc9a8d3932b;hp=979db4b035e25b366690ad0f4fe92c7f9f1750d9;hpb=a41f790cd30339179f7ae655a3009f22d61fc9e3;p=infobot.git

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index 979db4b..e33685c 100644
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -168,7 +168,7 @@ sub FactoidStuff {
 	$limitage	= $limitage*($count+1)/$limit if ($count < $limit);
 	# isauthor and isop.
 	my $isau	= (defined $author and &IsHostMatch($author) == 2) ? 1 : 0;
-	my $isop 	= (&IsFlag("o") eq "o") ? 1 : 0;
+	my $isop	= (&IsFlag("o") eq "o") ? 1 : 0;
 
 	if (IsFlag("r") ne "r" && !$isop) {
 	    &msg($who, "you don't have access to remove factoids");
@@ -241,7 +241,7 @@ sub FactoidStuff {
 
 	# lets do it!
 
-	if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay")) {
+	if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay") > 0) {
 	    if (!($isop or $isau) and $faqtoid =~ / #DEL#$/) {
 		&msg($who, "cannot delete it ($faqtoid).");
 		return;
@@ -290,7 +290,7 @@ sub FactoidStuff {
 
 	my $i = 0;
 	$i++ if (&IsParam("factoidDeleteDelay"));
-	$i++ if (&IsChanConf("factoidDeleteDelay"));
+	$i++ if (&IsChanConf("factoidDeleteDelay") > 0);
 	if (!$i) {
 	    &performReply("safe delete has been disable so what is there to undelete?");
 	    return;
@@ -427,11 +427,16 @@ sub FactoidStuff {
 		    &performReply("that's too long");
 		    return;
 		}
+		# empty
+		if (length $result == 0) {
+		    &performReply("factoid would be empty. use forget?");
+		    return;
+		}
 		# min length.
 		my $faqauth = &getFactInfo($faqtoid, "created_by");
 		if ((length $result)*2 < length $was and
 			&IsFlag("o") ne "o" and
-			&IsHostMask($faqauth) != 2
+			&IsHostMatch($faqauth) != 2
 		) {
 		    &performReply("too drastic change of factoid.");
 		}