- added CR's here and there; minor reformatting

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index 259fcdb422db7b75d064ab825a3ec5c2ebc89c56..fffba84f174ca5451b43f80e6e179fc2aa285fd2 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;
     }
 
@@ -316,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;
        }
     }
 
@@ -402,25 +399,33 @@ sub FactoidStuff {
            return 'locked factoid' if (&IsLocked($faqtoid) == 1);
 
            if (&IsParam("factoidDeleteDelay")) {
-               if ($faqtoid =~ /#DEL#/ and !&IsFlag("o")) {
+               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) {
-                   if ($faqtoid !~ /#DEL#/) {
-                       &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());
 
-                       &setFactInfo($faqtoid, "modified_by", $who);
-                       &setFactInfo($faqtoid, "modified_time", time());
                    } else {
                        &status("not backing up $faqtoid.");
                    }
+
                } else {
                    &status("forget: not overwriting backup!");
                }
+
            } else {
                &status("forget: <$who> '$faqtoid' =is=> '$result'");
            }
@@ -634,6 +639,7 @@ sub FactoidStuff {
        my $newresult = &perlMath();
 
        if (defined $newresult and $newresult ne "") {
+           $cmdstats{'Maths'}++;
            $result = $newresult;
            &status("math: <$who> $message => $result");
        }
@@ -658,13 +664,13 @@ sub FactoidStuff {
 
     if (length $message > 64) {
        &status("unparseable-moron: $message");
-       &performReply( &getRandom(keys %{$lang{'moron'}}) );
+       &performReply( &getRandom(keys %{ $lang{'moron'} }) );
        $count{'Moron'}++;
        return;
     }
 
     &status("unparseable: $message");
-    &performReply( &getRandom(keys %{$lang{'dunno'}}) );
+    &performReply( &getRandom(keys %{ $lang{'dunno'} }) );
     $count{'Dunno'}++;
 }