for join, ignore whether on a channel if we have power

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@213 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/Process.pl b/src/Process.pl
index fde372c07dc85b0438ca12e28579ec5c2c85c077..a6193e0a509f9ff8f3390375d152f667783e08e5 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -67,7 +67,7 @@ sub process {
            }
        }
 
-       if (&validChan($thischan)) {
+       if (&validChan($thischan) and &IsFlag("o") ne "o") {
            &msg($who,"I'm already on $thischan...");
            return;
        }
@@ -98,7 +98,10 @@ sub process {
     }
 
     # User Processing, for all users.
-    return '$noreply from userC' if &userCommands() eq $noreply;
+    if ($addressed) {
+       return '$noreply from pCH'   if &parseCmdHook("main",$message);
+       return '$noreply from userC' if &userCommands() eq $noreply;
+    }
 
     ###
     # once useless messages have been parsed out, we match them.
@@ -207,7 +210,7 @@ sub process {
     # here's where the external routines get called.
     # if they return anything but null, that's the "answer".
     if ($addressed) {
-       if (&parseCmdHook()) {
+       if ( &parseCmdHook("extra",$message) ) {
            return 'DID SOMETHING IN PCH.';
        }