- allow textcounters request irrelevent of setting

- disable banning of ppl w/ aggressive in rootwarn
- rootwarn: don't keep count of nick=root

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

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 8ee0f27c8c625a8ba23a06e07cd973f26d22377a..f302d0cf94bfd0c9fa4ce2c7fd5c94f9ad0d5215 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -272,7 +272,8 @@ sub Modules {
     }
 
     # text counters.
-    if ($_ = &getChanConf("ircTextCounters")) {
+    # warn: lets process it anyway.
+    if (1 and $_ = &getChanConf("ircTextCounters")) {
        s/([^\w\s])/\\$1/g;
        my $z = join '|', split ' ';
 

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 05e9d3f43b6283bf712df5a4a8db9112dc920bd8..3fe7900aaa174ba9929946b3ed679868872182b3 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -35,7 +35,9 @@ sub rootWarn {
        }
 
     } else {                   # >3rd time occurrance.
-       if ($warnmode =~ /aggressive/i) {
+
+       # disable this for the time being.
+       if (0 and $warnmode =~ /aggressive/i) {
            if ($channels{$chan}{'o'}{$ident}) {
                &status("RootWarn: $nick... sigh... bye bye.");
                rawout("MODE $chan +b *!root\@$host");  # ban
@@ -46,12 +48,13 @@ sub rootWarn {
 
     $attempt++;
     ### TODO: OPTIMIZE THIS.
-    if (1) {   # old
+    # ok... don't record the attempt if nick==root.
+    if (1 and $nick ne "root") {       # old
        &dbSet("rootwarn", { nick => lc($nick) }, { attempt => $attempt });
        &dbSet("rootwarn", { nick => lc($nick) }, { time => time() });
        &dbSet("rootwarn", { nick => lc($nick) }, { host => $user."\@".$host });
        &dbSet("rootwarn", { nick => lc($nick) }, { channel => $chan });
-    } else {   # new. replace.
+    } else {   # new. replace. TODO
        &dbSet("rootwarn", "nick", lc($nick), "attempt", $attempt);
        &dbSet("rootwarn", "nick", lc($nick), "time", time());
        &dbSet("rootwarn", "nick", lc($nick), "host", $user."\@".$host);