- strictify

[infobot.git] / src / IRC / Schedulers.pl

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 9c5bbeda5409c2b045f0601ff120b5096504abb0..18360d862814aa46bafc8513ad43cc1d7964a635 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -5,7 +5,7 @@
 #         Created: 20000117
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 use POSIX qw(strftime);
 use vars qw(%sched);
@@ -41,10 +41,10 @@ sub setupSchedulers {
     &factoidCheck(2);  # takes a couple of seconds on a 486. defer it
     &newsFlush(1);
 
+    # todo: squeeze this into a one-liner.
 #    my $count = map { exists $sched{$_}{TIME} } keys %sched;
     my $count  = 0;
     foreach (keys %sched) {
-#      next unless (exists $sched{$_}{TIME});
        my $time = $sched{$_}{TIME};
        next unless (defined $time and $time > time());
 
@@ -138,7 +138,7 @@ sub randomFactoid {
 }
 
 sub randomFreshmeat {
-    my $interval = &getChanConfDefault("randomFresheatInterval", 60);
+    my $interval = &getChanConfDefault("randomFreshmeatInterval", 60);
 
     if (@_) {
        &ScheduleThis($interval, "randomFreshmeat");
@@ -243,10 +243,10 @@ sub seenFlushOld {
     my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24;
     my $delete   = 0;
 
-    if ($param{'DBType'} =~ /^pgsql|mysql/i) {
+    if ($param{'DBType'} =~ /^pgsql|mysql|sqlite/i) {
        my $query;
 
-       if ($param{'DBType'} =~ /^mysql$/i) {
+       if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
            $query = "SELECT nick,time FROM seen GROUP BY nick HAVING ".
                        "UNIX_TIMESTAMP() - time > $max_time";
        } else {        # pgsql.
@@ -547,7 +547,7 @@ sub seenFlush {
     $stats{'new'}      = 0;
     $stats{'old'}      = 0;
 
-    if ($param{'DBType'} =~ /^(mysql|pgsql)$/i) {
+    if ($param{'DBType'} =~ /^(mysql|pgsql|sqlite|dbm)$/i) {
        foreach $nick (keys %seencache) {
            my $retval = &dbReplace("seen", "nick", (
                        "nick" => lc $seencache{$nick}{'nick'},
@@ -558,57 +558,6 @@ sub seenFlush {
            ) );
            delete $seencache{$nick};
            $flushed++;
-
-           next;
-
-           ###
-           ### old code.
-           ###
-
-           my $exists = &dbGet("seen", "nick", "nick=".&dbQuote($nick) );
-
-           if (defined $exists and $exists) {
-               &dbUpdate("seen", "nick", $nick, (
-                       "time" => $seencache{$nick}{'time'},
-                       "host" => $seencache{$nick}{'host'},
-                       "channel" => $seencache{$nick}{'chan'},
-                       "message" => $seencache{$nick}{'msg'},
-               ) );
-               $stats{'old'}++;
-           } else {
-               my $retval = &dbInsert("seen", $nick, (
-                       "nick" => $seencache{$nick}{'nick'},
-                       "time" => $seencache{$nick}{'time'},
-                       "host" => $seencache{$nick}{'host'},
-                       "channel" => $seencache{$nick}{'chan'},
-                       "message" => $seencache{$nick}{'msg'},
-               ) );
-               $stats{'new'}++;
-
-               ### TODO: put bad nick into a list and don't do it again!
-               &FIXME("Should never happen! (nick => $nick)") if !$retval;
-           }
-
-           delete $seencache{$nick};
-           $flushed++;
-       }
-
-    } elsif ($param{'DBType'} =~ /^dbm/i) {
-
-       foreach $nick (keys %seencache) {
-           my $retval = &dbInsert("seen", $nick, (
-               "nick" => $seencache{$nick}{'nick'},
-               "time" => $seencache{$nick}{'time'},
-               "host" => $seencache{$nick}{'host'},
-               "channel" => $seencache{$nick}{'chan'},
-               "message" => $seencache{$nick}{'msg'},
-           ) );
-
-           ### TODO: put bad nick into a list and don't do it again!
-           &FIXME("Should never happen! (nick => $nick)") if !$retval;
-
-           delete $seencache{$nick};
-           $flushed++;
        }
     } else {
        &DEBUG("seenFlush: NO VALID FACTOID SUPPORT?");
@@ -748,7 +697,7 @@ sub ircCheck {
 
     if ($ident !~ /^\Q$param{ircNick}\E$/) {
        # this does not work unfortunately.
-       &WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick}).");
+       &WARN("ircCheck: ident($ident) != param{ircNick}($param{ircNick}).");
 
        # this check is misleading... perhaps we should do a notify.
        if (! &IsNickInAnyChan( $param{ircNick} ) ) {