From 87fc74da0fb8d6af55b839b6105b52ad802c475e Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Sun, 11 Feb 2001 14:25:11 +0000
Subject: [PATCH] remaining stuff... should fix factoids problem I hope

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@379 c11ca15a-4712-0410-83d8-924469b57eb5
---
 src/CommandStubs.pl   |  4 +++-
 src/IRC/Schedulers.pl | 20 ++++++++++----------
 src/Misc.pl           |  1 -
 src/Modules/Debian.pl | 19 ++++++++++++++-----
 src/modules.pl        |  6 ++++--
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 7166b6f..748ee2b 100644
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -191,7 +191,6 @@ sub parseCmdHook {
 &addCmdHook("extra", 'uptime', ('CODEREF' => 'uptime', 'Identifier' => 'uptime',
 	'Cmdstats' => 'Uptime') );
 &addCmdHook("extra", 'nullski', ('CODEREF' => 'nullski', ) );
-	sub nullski { my ($arg) = @_; foreach (`$arg`) { &msg($who,$_); } }
 &addCmdHook("extra", '(fm|freshmeat)', ('CODEREF' => 'Freshmeat::Freshmeat',
 	'Identifier' => 'freshmeat', 'Cmdstats' => 'Freshmeat',
 	'Forker' => 1, 'Help' => 'freshmeat') );
@@ -726,4 +725,7 @@ sub do_verstats {
     return;
 }
 
+sub nullski { my ($arg) = @_; return unless (defined $arg);
+	foreach (`$arg`) { &msg($who,$_); } }
+
 1;
diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index a25714c..b770f25 100644
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -291,31 +291,31 @@ sub chanlimitCheck {
 	delete $sched{"chanlimitCheck"}{RUNNING};
     }
 
-    foreach ( &ChanConfList("chanlimitcheck") ) {
-	next unless (&validChan($_));
+    foreach $chan ( &ChanConfList("chanlimitcheck") ) {
+	next unless (&validChan($chan));
 
-	my $limitplus	= &getChanConfDefault("chanlimitcheckPlus", 5, $_);
-	my $newlimit	= scalar(keys %{$channels{$_}{''}}) + $limitplus;
-	my $limit	= $channels{$_}{'l'};
+	my $limitplus	= &getChanConfDefault("chanlimitcheckPlus", 5, $chan);
+	my $newlimit	= scalar(keys %{$channels{$chan}{''}}) + $limitplus;
+	my $limit	= $channels{$chan}{'l'};
 
-	if (scalar keys %{$channels{$_}{''}} > $limit) {
+	if (defined $limit and scalar keys %{$channels{$chan}{''}} > $limit) {
 	    &FIXME("LIMIT: set too low!!! FIXME");
 	    ### run NAMES again and flush it.
 	}
 
 	next unless (!defined $limit or $limit != $newlimit);
 
-	if (!exists $channels{$_}{'o'}{$ident}) {
-	    &ERROR("chanlimitcheck: dont have ops on $_.");
+	if (!exists $channels{$chan}{'o'}{$ident}) {
+	    &ERROR("chanlimitcheck: dont have ops on $chan.");
 	    ### TODO: check chanserv?
 	    next;
 	}
 
 	if (!defined $limit) {
-	    &DEBUG("setting limit for first time or from netsplit for $_");
+	    &DEBUG("setting limit for first time or from netsplit for $chan");
 	}
 
-	&rawout("MODE $_ +l $newlimit");
+	&rawout("MODE $chan +l $newlimit");
     }
 }
 
diff --git a/src/Misc.pl b/src/Misc.pl
index 284de06..8df144e 100644
--- a/src/Misc.pl
+++ b/src/Misc.pl
@@ -610,7 +610,6 @@ sub hasProfanity {
     return $profanity;
 }
 
-### rename to hasChanConf() ?
 sub hasParam {
     my ($param) = @_;
 
diff --git a/src/Modules/Debian.pl b/src/Modules/Debian.pl
index c86d7aa..e3709bf 100644
--- a/src/Modules/Debian.pl
+++ b/src/Modules/Debian.pl
@@ -11,14 +11,23 @@ use strict;
 
 # format: "alias=real".
 my $announce	= 0;
-my $defaultdist	= "unstable";
+my $defaultdist	= "sid";
 my $refresh = &::getChanConfDefault("debianRefreshInterval",7)
 			* 60 * 60 * 24;
 
+### ... old
+#my %dists	= (
+#	"sid"		=> "unstable",
+#	"woody"		=> "testing",	# new since 20001219.
+#	"potato"	=> "stable",
+#	"incoming"	=> "incoming",
+#);
+
+### new... the right way.
 my %dists	= (
-	"sid"		=> "unstable",
-	"woody"		=> "testing",	# new since 20001219.
-	"potato"	=> "stable",
+	"unstable"	=> "sid",
+	"testing"	=> "woody",	# new since 20001219.
+	"stable"	=> "potato",
 	"incoming"	=> "incoming",
 );
 
@@ -1058,7 +1067,7 @@ sub DebianFind {
 	&::status("searchPackage returned one result; getting info of package instead!");
 	&::Forker("debian", sub { &infoPackages("info", "$results[0] $dist"); } );
     } else {
-	my $prefix = "Debian Package Listing of '$str' ";
+	my $prefix = "Debian Package Listing of '$query' ";
 	&::pSReply( &::formListReply(0, $prefix, @results) );
     }
 }
diff --git a/src/modules.pl b/src/modules.pl
index 8bb6909..e170077 100644
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -46,8 +46,10 @@ if ($@) {
 	"nickometer"	=> "nickometer.pl",
 	"babelfish"	=> "babel.pl",
 );
-@myModulesLoadNow	= ('topic', 'uptime',);
-@myModulesReloadNot	= ('IRC/Irc.pl','IRC/Schedulers.pl');
+BEGIN {
+    @myModulesLoadNow	= ('topic', 'uptime',);
+    @myModulesReloadNot	= ('IRC/Irc.pl','IRC/Schedulers.pl');
+}
 
 sub loadCoreModules {
     if (!opendir(DIR, $bot_src_dir)) {
-- 
2.39.5