- modified db_mysql to allow eleet usage of dbSet

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 259fcdb422db7b75d064ab825a3ec5c2ebc89c56..925ae964cbfb17865cdbfcb8bacfcde04ceef2c7 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -63,8 +63,8 @@ sub process {
            }
 
            if (&validChan($thischan)) {
-               &msg($who,"I'm already on $thischan...");
-               return;
+               &msg($who,"warn: I'm already on $thischan, joining  anyway...");
+#              return;
            }
        }
        $cache{join}{$thischan} = $who; # used for on_join self.
@@ -188,11 +188,11 @@ sub process {
 
     # override msgType.
     if ($msgType =~ /public/ and $message =~ s/^\+//) {
-       &status("found '+' flag; setting msgType to public.");
-       $force_public_reply++;
+       &status("Process: '+' flag detected; changing reply to public");
        $msgType = 'public';
        $who     = $chan;       # major hack to fix &msg().
-       &DEBUG("addressed => $addressed.");
+       $force_public_reply++;
+       # notice is still NOTICE but to whole channel => good.
     }
 
     # User Processing, for all users.
@@ -263,7 +263,7 @@ sub process {
     if ($message =~ /^than(ks?|x)( you)?( \S+)?/i) {
        return 'thank: no addr' unless ($message =~ /$ident/ or $talkok);
 
-       &performReply( &getRandom(keys %{$lang{'welcome'}}) );
+       &performReply( &getRandom(keys %{ $lang{'welcome'} }) );
        return;
     }
 
@@ -287,19 +287,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;
     }
@@ -316,12 +319,9 @@ sub process {
            return 'SOMETHING 1';
        }
 
-       ### FIXME: should this only apply to public messages?
-       if ($addrchar) {
-           &DEBUG("floodwho => '$floodwho'.");
-           delete $flood{$floodwho}{$message};
-           &status("short return due to unknown command.");
-           return 'ADDR CHAR';
+       if (0 and $addrchar) {
+           &msg($who, "I don't trust people to use the core commands while addressing me in a short-cut way.");
+           return;
        }
     }
 
@@ -393,7 +393,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;
@@ -401,26 +405,40 @@ sub FactoidStuff {
 
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
-           if (&IsParam("factoidDeleteDelay")) {
-               if ($faqtoid =~ /#DEL#/ and !&IsFlag("o")) {
+           # 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;
                }
+
                &status("forgot (safe delete): <$who> '$faqtoid' =is=> '$result'");
                ### TODO: check if the "backup" exists and overwrite it
                my $check = &getFactoid("$faqtoid #DEL#");
-               if (!$check) {
-                   if ($faqtoid !~ /#DEL#/) {
-                       &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
 
-                       &setFactInfo($faqtoid, "modified_by", $who);
-                       &setFactInfo($faqtoid, "modified_time", time());
+               if (!defined $check or $check =~ /^\s*$/) {
+                   if ($faqtoid !~ / #DEL#$/) {
+                       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);
+                       &setFactInfo($new, "modified_time", time());
+
                    } else {
                        &status("not backing up $faqtoid.");
                    }
+
                } else {
                    &status("forget: not overwriting backup!");
                }
+
            } else {
                &status("forget: <$who> '$faqtoid' =is=> '$result'");
            }
@@ -440,7 +458,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;
        }
@@ -460,7 +481,6 @@ sub FactoidStuff {
            return;
        }
 
-       &DEBUG("unforget: check => $check");
        if (defined $check) {
            &performReply("cannot undeleted '$faqtoid' because it already exists?");
            return;
@@ -634,6 +654,7 @@ sub FactoidStuff {
        my $newresult = &perlMath();
 
        if (defined $newresult and $newresult ne "") {
+           $cmdstats{'Maths'}++;
            $result = $newresult;
            &status("math: <$who> $message => $result");
        }
@@ -658,13 +679,15 @@ 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;
     }
 
     &status("unparseable: $message");
-    &performReply( &getRandom(keys %{$lang{'dunno'}}) );
+    &performReply( &getRandom(keys %{ $lang{'dunno'} }) );
     $count{'Dunno'}++;
 }