- fixed "news #debian latest" - how did I break it?

[infobot.git] / blootbot / src / Process.pl

diff --git a/blootbot/src/Process.pl b/blootbot/src/Process.pl
index fffba84f174ca5451b43f80e6e179fc2aa285fd2..4988e67e91a7548c2799cdf696a2dba04d458447 100644 (file)
--- a/blootbot/src/Process.pl
+++ b/blootbot/src/Process.pl
@@ -271,11 +271,6 @@ sub process {
     ### bot commands...
     ###
 
-    if ($message =~ s/^literal\s+//i) {
-       &status("literal ask of '$message'.");
-       $literal = 1;
-    }
-
     # karma. set...
     if ($message =~ /^(\S+)(--|\+\+)\s*$/ and $addressed) {
        return '' unless (&hasParam("karma"));
@@ -287,19 +282,22 @@ sub process {
            return;
        }
 
-       if (lc($term) eq lc($who)) {
+       if (lc $term eq lc $who) {
            &msg($who, "please don't karma yourself");
            return;
        }
 
-       my $karma = &dbGet("karma", "nick",$term,"karma") || 0;
+       my $karma = &dbGet("stats", "counter", "nick='$term' and type='karma'") || 0;
        if ($inc eq '++') {
            $karma++;
        } else {
            $karma--;
        }
 
-       &dbSet("karma", "nick",$term,"karma",$karma);
+       &dbSet("stats", 
+               { nick => $term, type => "karma" },
+               { counter => $karma }
+       );
 
        return;
     }
@@ -390,7 +388,11 @@ sub FactoidStuff {
        my $result = &getFactoid($faqtoid);
 
        if (defined $result) {
-           my $author = &getFactInfo($faqtoid, "created_by");
+           my $author  = &getFactInfo($faqtoid, "created_by");
+           my $count   = &getFactInfo($faqtoid, "requested_count") || 0;
+           my $limit   = &getChanConfDefault("factoidPreventForgetLimit", 
+                               0, $chan);
+
            if (IsFlag("r") ne "r") {
                &msg($who, "you don't have access to remove factoids");
                return;
@@ -398,7 +400,13 @@ sub FactoidStuff {
 
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
-           if (&IsParam("factoidDeleteDelay")) {
+           # factoidPreventForgetLimit:
+           if ($limit and $count > $limit and (&IsFlag("o") ne "o")) {
+               &msg($who, "will not delete '$faqtoid', count > limit ($count > $limit)");
+               return;
+           }
+
+           if (&IsParam("factoidDeleteDelay") or &IsChanConf("factoidDeleteDelay")) {
                if ($faqtoid =~ / #DEL#$/ and !&IsFlag("o")) {
                    &msg($who, "cannot delete it ($faqtoid).");
                    return;
@@ -407,12 +415,12 @@ sub FactoidStuff {
                &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'");
                ### TODO: check if the "backup" exists and overwrite it
                my $check = &getFactoid("$faqtoid #DEL#");
-               &DEBUG("Process: check => '$check'.");
 
-               if (!$check) {
+               if (!defined $check or $check =~ /^\s*$/) {
                    if ($faqtoid !~ / #DEL#$/) {
-                       &DEBUG("Process: backing up $faqtoid to '$new'.");
                        my $new = $faqtoid." #DEL#";
+                       &DEBUG("Process: backing up $faqtoid to '$new'.");
+
                        # this looks weird but does it work?
                        &setFactInfo($faqtoid, "factoid_key", $new);
                        &setFactInfo($new, "modified_by", $who);
@@ -445,7 +453,10 @@ sub FactoidStuff {
     if ($message =~ s/^un(forget|delete)\s+//i) {
        return 'unforget: no addr' unless ($addressed);
 
-       if (!&IsParam("factoidDeleteDelay")) {
+       my $i = 0;
+       $i++ if (&IsParam("factoidDeleteDelay"));
+       $i++ if (&IsChanConf("factoidDeleteDelay"));
+       if (!$i) {
            &performReply("safe delete has been disable so what is there to undelete?");
            return;
        }
@@ -465,7 +476,6 @@ sub FactoidStuff {
            return;
        }
 
-       &DEBUG("unforget: check => $check");
        if (defined $check) {
            &performReply("cannot undeleted '$faqtoid' because it already exists?");
            return;
@@ -664,8 +674,10 @@ sub FactoidStuff {
 
     if (length $message > 64) {
        &status("unparseable-moron: $message");
-       &performReply( &getRandom(keys %{ $lang{'moron'} }) );
+#      &performReply( &getRandom(keys %{ $lang{'moron'} }) );
        $count{'Moron'}++;
+
+       &performReply("You are moron #".$count{'Moron'}."!");
        return;
     }