autojoin <nick> instead of +autojoin

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

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index 4e37e97f4ec4dcebae82405780d0cc246e19a5fc..46f1327534f6c0b0f9a9a1d9694da1318df9208a 100644 (file)
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -700,7 +700,7 @@ sub chanSet {
            return;
        }
        $chanconf{$chan}{_time_added}   = time();
-       $chanconf{$chan}{autojoin}      = 1;
+       $chanconf{$chan}{autojoin}      = $conn->nick();
 
        &pSReply("Joining $chan...");
        &joinchan($chan);

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 66d5fb84c222c4609b6dd18d3351bb69734f299d..7bb730204bc9d3c9c9f88352bdb120ff1da89963 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -797,21 +797,27 @@ sub getJoinChans {
     foreach (keys %chanconf) {
        next if ($_ eq "_default");
 
-       my $val = $chanconf{$_}{autojoin};
        my $skip = 0;
+       my $val = $chanconf{$_}{autojoin};
 
        if (defined $val) {
            $skip++ if ($val eq "0");
+           if (($conn) and ($val eq "1")) {
+               # convert old +autojoin to autojoin <nick>
+               $val = $conn->nick();
+               $chanconf{$_}{autojoin} = $val;
+           }
        } else {
            $skip++;
        }
 
        if ($skip) {
            push(@skip, $_);
-           next;
+       } elsif (($conn) and ($conn->nick() eq $val)) {
+           push(@chans, $_);
+       } else {
+           push(@skip, $_);
        }
-
-       push(@chans, $_);
     }
 
     my $str;
@@ -823,7 +829,7 @@ sub getJoinChans {
 
     &status("Chans: ".$str) if ($show);
 
-    return @chans;
+    return sort @chans;
 }
 
 sub closeDCC {