seen config

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

diff --git a/files/sample/sample.chan b/files/sample/sample.chan
index 920f4d28aac7fca83106d1af03934732986103b1..b4a2fbbecb3a8fa762d2c56023360d71ecb46d90 100644 (file)
--- a/files/sample/sample.chan
+++ b/files/sample/sample.chan
@@ -50,6 +50,7 @@ _default
     +seen
     seenFlushInterval 60
     seenMaxDays 90
+    +seenStoreAll
     +seenStats
     +slashdot
     +spell

diff --git a/files/sample/sample.config b/files/sample/sample.config
index 7733b7c54b4f067729eb388bae5ea967589b8fbe..8bd295379ac1e0897826ac16d73a34f200a301b6 100644 (file)
--- a/files/sample/sample.config
+++ b/files/sample/sample.config
@@ -257,21 +257,6 @@ set rootWarnMode   passive
 # [0/1] Factoid search.
 set search             false
 
-# [0/1] persistant "seen".
-set seen               true
-# [0/1] seen statistics for online users like idle time, total message
-#      count.
-set seenStats          true
-# [int] if someone's been away for more than xx days, delete their info.
-#      info.
-set seenMaxDays                30
-# [int] interval to flush cached seen info. in minutes.
-set seenFlushInterval  60
-# [bool] store all information, irrevelent of addressing.
-#      may chew more CPU.
-#      Will encourage severe leakaged (2-3x), caused by mysql-perl?
-set seenStoreAll       1
-
 # [0/1] keeps stats on individual commands
 set stats              true
 

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 5b26d5b721b30f772c8fa1c410ba2a5d2c999277..b1640ae66a01cccafa6fa0d79368b3b1ba8afcb6 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -541,7 +541,7 @@ sub seen {
            $reply .= " (".&Time2String(time() - $userstats{lc $seen[0]}{'Join'}).")";
        }
 
-       if (&IsParam("seenStats")) {
+       if (&IsChanConf("seenStats") > 0) {
            my $i;
            $i = $userstats{lc $seen[0]}{'Count'};
            $reply .= ".  Has said a total of \002$i\002 messages" if (defined $i);

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index 1ee2835238e137b12360daf594d77d59f4803fcf..2518772fd6339b939579a827a952af5c188d61b0 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -221,8 +221,8 @@ sub hookMsg {
     }
     push(@ignore, keys %{ $ignore{"*"} }) if (exists $ignore{"*"});
 
-    if ((!$skipmessage or &IsChanConf("seenStoreAll")) and
-       &IsChanConf("seen") and
+    if ((!$skipmessage or &IsChanConf("seenStoreAll") > 0) and
+       &IsChanConf("seen") > 0 and
        $msgType =~ /public/
     ) {
        $seencache{$who}{'time'} = time();

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 45fee8b074e0a14fed32232b85a87ce1d6d827a3..8c36f59a8880132e9b1dacf2b54ae0daf6c3be28 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -474,7 +474,7 @@ sub on_join {
     }
 
     $chanstats{$chan}{'Join'}++;
-    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats") > 0);
     $cache{maxpeeps}{$chan}    = $i if ($i > $j);
 
     &joinfloodCheck($who, $chan, $event->userhost);
@@ -817,7 +817,7 @@ sub on_part {
        &clearChanVars($chan);
     }
 
-    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
+    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats") > 0) {
        delete $userstats{lc $nick};
     }
 
@@ -868,7 +868,7 @@ sub on_public {
     $msgtime           = time();
     $lastWho{$chan}    = $nick;
     ### TODO: use $nick or lc $nick?
-    if (&IsChanConf("seenStats")) {
+    if (&IsChanConf("seenStats") > 0) {
        $userstats{lc $nick}{'Count'}++;
        $userstats{lc $nick}{'Time'} = time();
     }
@@ -977,7 +977,7 @@ sub on_quit {
        # well.. it's good but weird that this has happened - lets just
        # be quiet about it.
     }
-    delete $userstats{lc $nick} if (&IsChanConf("seenStats"));
+    delete $userstats{lc $nick} if (&IsChanConf("seenStats") > 0);
     delete $chanstats{lc $nick};
     ###