- getJoinChans, don't add _default

- joinNextChan() - check nickServ_pass

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

diff --git a/blootbot/src/IRC/Irc.pl b/blootbot/src/IRC/Irc.pl
index 7deecb572e5d099441caf94a95664cc38bf01cde..b0b683402135f17281feb29baba8fca18e9481d2 100644 (file)
--- a/blootbot/src/IRC/Irc.pl
+++ b/blootbot/src/IRC/Irc.pl
@@ -319,6 +319,7 @@ sub dccsay {
        return '';
     }
 
+    &status("=>$who<= $reply");                # dcc chat.
     $conn->privmsg($dcc{'CHAT'}{$who}, $reply);
 }
 
@@ -498,7 +499,7 @@ sub joinNextChan {
        return;
     }
 
-    if ($nickserv < 1) {
+    if (&IsParam("nickServ_pass") and $nickserv < 1) {
        &WARN("jNC: nickserv/chanserv not up.") if (!$nickserv);
        $nickserv--;
     }
@@ -617,8 +618,11 @@ sub getJoinChans {
     my @skip;
 
     foreach (keys %chanconf) {
+       next if ($_ eq "_default");
+
        my $val = $chanconf{$_}{autojoin};
        my $skip = 0;
+
        if (defined $val) {
            $skip++ if ($val eq "0");
        } else {
@@ -635,6 +639,8 @@ sub getJoinChans {
 
     if (scalar @skip) {
        &status("channels not auto-joining: @skip");
+    } else {
+       &status("auto-joining all chans.");
     }
 
     return @chans;