- I broke maths when I tried to fix "999!" - fixed :-)

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 600729defdfcf8f423cb99adb1902574ca845679..f35b41d53b681681f681de914b4e32d487b67f1e 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.
@@ -186,6 +186,15 @@ sub process {
        }
     }
 
+    # override msgType.
+    if ($msgType =~ /public/ and $message =~ s/^\+//) {
+       &status("Process: '+' flag detected; changing reply to public");
+       $msgType = 'public';
+       $who     = $chan;       # major hack to fix &msg().
+       $force_public_reply++;
+       # notice is still NOTICE but to whole channel => good.
+    }
+
     # User Processing, for all users.
     if ($addressed) {
        my $retval;
@@ -254,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;
     }
 
@@ -262,13 +271,6 @@ sub process {
     ### bot commands...
     ###
 
-    # override msgType.
-    if ($msgType =~ /public/ and $message =~ s/^\+//) {
-       &status("found '+' flag; setting msgType to public.");
-       $force_public_reply++;
-       $msgType = 'public';
-    }
-
     if ($message =~ s/^literal\s+//i) {
        &status("literal ask of '$message'.");
        $literal = 1;
@@ -314,12 +316,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;
        }
     }
 
@@ -377,7 +376,6 @@ sub FactoidStuff {
        }
     }
 
-
     # factoid forget.
     if ($message =~ s/^forget\s+//i) {
        return 'forget: no addr' unless ($addressed);
@@ -392,7 +390,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;
@@ -400,18 +402,40 @@ sub FactoidStuff {
 
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
+           # 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")) {
+               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#");
+               &DEBUG("Process: check => '$check'.");
+
                if (!$check) {
-                   &setFactInfo($faqtoid, "factoid_key", $faqtoid." #DEL#");
+                   if ($faqtoid !~ / #DEL#$/) {
+                       &DEBUG("Process: backing up $faqtoid to '$new'.");
+                       my $new = $faqtoid." #DEL#";
+                       # 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.");
+                   }
 
-                   &setFactInfo($faqtoid, "modified_by", $who);
-                   &setFactInfo($faqtoid, "modified_time", time());
                } else {
                    &status("forget: not overwriting backup!");
                }
+
            } else {
                &status("forget: <$who> '$faqtoid' =is=> '$result'");
            }
@@ -577,11 +601,12 @@ sub FactoidStuff {
        return;
     }
 
-
     # Fix up $message for question.
-    for ($message) {
+    my $question = $message;
+    for ($question) {
        # fix the string.
        s/^hey([, ]+)where/where/i;
+       s/\s+\?$/?/;
        s/whois/who is/ig;
        s/where can i find/where is/i;
        s/how about/where is/i;
@@ -611,7 +636,7 @@ sub FactoidStuff {
        $correction_plausible = 0;
     }
 
-    my $result = &doQuestion($message);
+    my $result = &doQuestion($question);
     if (!defined $result or $result eq $noreply) {
        return 'result from doQ undef.';
     }
@@ -624,6 +649,7 @@ sub FactoidStuff {
        my $newresult = &perlMath();
 
        if (defined $newresult and $newresult ne "") {
+           $cmdstats{'Maths'}++;
            $result = $newresult;
            &status("math: <$who> $message => $result");
        }
@@ -648,13 +674,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'}++;
 }