- it would help if I had checked before committing to cvs.

  moved regex to proper location... before it would give anyone +o for
  free. last of my changes for +a/+O support.

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

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index 68ea16466d0e8da05ca4da29635fe2a711448dea..893011f2af1d1931be73b1fbb1e4a4b0f9311561 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -266,6 +266,13 @@ sub hookMsg {
 #      &DEBUG("IrcHooks: process returned '$_'.");
     }
 
+    # hack to remove +o from ppl with +O flag.
+    if (exists $users{$userHandle} && exists $users{$userHandle}{FLAGS} &&
+       $users{$userHandle}{FLAGS} =~ /O/
+    ) {
+       $users{$userHandle}{FLAGS} =~ s/o//g;
+    }
+
     return;
 }
 

diff --git a/src/Process.pl b/src/Process.pl
index d4473b414dd98c44ebea2723a5a411f740f231d3..5a166e12eec7da1e8b4007b66f95784feef18768 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -27,7 +27,6 @@ sub process {
     # is $who arg lowercase?
     if (exists $channels{$chan}{o}{ $orig{who} } && &IsFlag("O") eq "O") {
        &status("Gave $who/$chan +o (+O)\'ness");
-       $users{$userHandle}{FLAGS} =~ s/o//g;
        $users{$userHandle}{FLAGS} .= "o";
     }