From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Sun, 22 Apr 2001 12:25:06 +0000 (+0000)
Subject: don't call chanservcheck in joinnextchan
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=61d2bab8e7754a3eeaf58d108cbe3c84aba339ad;p=infobot.git

don't call chanservcheck in joinnextchan
call chanservcheck in on_endofnames
ircCheck "resets" itself if it thinks so


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

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 8d09e0a..615b62f 100644
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -579,10 +579,6 @@ sub joinNextChan {
 	    &status("joinNextChan: $i chans to join.");
 	}
 
-	# chanserv check: channel specific.
-	### what the hell is this for...
-	&chanServCheck($chan);
-
     } else {
 	# chanserv check: global channels, in case we missed one.
 
diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 56e9760..22df4e6 100644
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -367,11 +367,13 @@ sub on_endofnames {
     my $chanstats = join(' || ', @array);
     &status("$b_blue$chan$ob: [$chanstats]");
 
-    &joinNextChan();
+    &chanServCheck($chan);
+
     if (scalar @joinchan) {	# remaining channels to join.
 	# lets do two at once!
 	&joinNextChan();
     }
+    &joinNextChan();
 }
 
 sub on_init {
diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 5851b64..484147d 100644
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -646,11 +646,13 @@ sub ircCheck {
 	delete $sched{"ircCheck"}{RUNNING};
     }
 
-    my @array = grep !/^_default$/, keys %chanconf;
-    my $iconf = scalar(@array);
-    my $inow  = scalar(keys %channels);
+    my @x	= &getJoinChans();
+    my $iconf = scalar( @x );
+    my $inow  = scalar( keys %channels );
     if ($iconf > 2 and $inow * 2 <= $iconf) {
 	&FIXME("ircCheck: current channels * 2 <= config channels. FIXME.");
+	@joinchan	= @x;
+	&joinNextChan();
     }
 
     if (!$conn->connected or time() - $msgtime > 3600) {