From 9abb382431062fd903da6e978e7e06d02f4c29c7 Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Fri, 29 Dec 2000 14:46:02 +0000
Subject: [PATCH] for join, ignore whether on a channel if we have power

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@213 c11ca15a-4712-0410-83d8-924469b57eb5
---
 blootbot/src/Process.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/blootbot/src/Process.pl b/blootbot/src/Process.pl
index fde372c..a6193e0 100644
--- a/blootbot/src/Process.pl
+++ b/blootbot/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.';
 	}
 
-- 
2.39.5