A can unlobotomize

[infobot.git] / src / Process.pl

diff --git a/src/Process.pl b/src/Process.pl
index abe7d187943107a479672743a88d313e33942205..aea3e1e5561795852b72d733b428e3652fe0876c 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -24,7 +24,12 @@ sub process {
     return 'addressedother set' if ($addressedother);
 
     $talkok    = ($param{'addressing'} =~ /^OPTIONAL$/i or $addressed);
-    $learnok   = ($param{'learn'}      =~ /^HUNGRY$/i   or $addressed);
+    $learnok   = 1 if ($addressed);
+    if ($param{'learn'} =~ /^HUNGRY$/i) {
+       $learnok        = 1;
+       $addressed      = 1;
+       $talkok         = 1;
+    }
 
     &shmFlush();               # hack.
 
@@ -43,7 +48,7 @@ sub process {
            &msg($who, "give me an unlobotomy.") if ($delta_time > 60*60);
            $cache{lobotomy}{$who} = time();
        }
-       return 'LOBOTOMY';
+       return 'LOBOTOMY' unless IsFlag("A");
     }
 
     # talkMethod.
@@ -70,6 +75,11 @@ sub process {
            return;
        }
 
+       if ($thischan !~ /^$mask{chan}$/) {
+           &msg($who, "$thischan is not a valid channel name.");
+           return;
+       }
+
        if (&IsFlag("o") ne "o") {
            if (!exists $chanconf{$thischan}) {
                &msg($who, "I am not allowed to join $thischan.");
@@ -77,8 +87,7 @@ sub process {
            }
 
            if (&validChan($thischan)) {
-               &msg($who,"warn: I'm already on $thischan, joining  anyway...");
-#              return;
+               &msg($who,"warn: I'm already on $thischan, joining anyway...");
            }
        }
        $cache{join}{$thischan} = $who; # used for on_join self.
@@ -148,7 +157,7 @@ sub process {
            return;
        }
 
-       # todo: use &getUser()?
+       # TODO: use &getUser()?
        my $first       = 1;
        foreach (keys %users) {
            if ($users{$_}{FLAGS} =~ /n/) {
@@ -262,10 +271,8 @@ sub process {
 
     # greetings.
     if ($message =~ /how (the hell )?are (ya|you)( doin\'?g?)?\?*$/) {
-       my $reply = &getRandom(keys %{ $lang{'howareyou'} });
 
-       &performReply($reply);
-        
+       &performReply(&getRandom(keys %{ $lang{'howareyou'} }));
        return;
     }
 
@@ -275,11 +282,7 @@ sub process {
     {
        return 'praise: no addr' unless ($addressed);
 
-       &status("random praise detected");
-
-       my $tmp = (rand() < 0.5) ? "thanks $who " : "";
-       &pSReply($tmp.":)");
-
+       &performReply(&getRandom(keys %{ $lang{'praise'} }));
        return;
     }
 
@@ -296,18 +299,11 @@ sub process {
     ###
 
     # karma. set...
-    if ($message =~ /^(\S+)(--|\+\+)\s*$/ and $addressed) {
-       return '' unless (&hasParam("karma"));
-       # well... since it is policy to do bot functions before factoids
-       # karma gets hit if, for example, "g++" is issued.
-       # only way to request it is to put a question mark at the end.
-
-       my($term,$inc) = (lc $1,$2);
-
-       if ($msgType !~ /public/i) {
-           &msg($who, "karma must be done in public!");
-           return;
-       }
+    if ($msgType =~ /public/i && $message =~ /^(\S+)(--|\+\+)\s*$/ &&
+       $addressed && &hasParam("karma")
+    ) {
+       # to request factoids such as "g++" or "libstdc++", append "?" to the query.
+       my ($term,$inc) = (lc $1,$2);
 
        if (lc $term eq lc $who) {
            &msg($who, "please don't karma yourself");