From: timriker Date: Tue, 2 Feb 2010 01:25:23 +0000 (+0000) Subject: more multinick X-Git-Url: https://git.donarmstrong.com/?p=infobot.git;a=commitdiff_plain;h=7f32f2e34506a1ff3947f1126676028761012714 more multinick git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@1881 c11ca15a-4712-0410-83d8-924469b57eb5 --- diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index ced6f28..2822e0d 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -151,15 +151,12 @@ sub irc { $conns{$mynick}->add_global_handler( 'nick', \&on_nick ); $conns{$mynick}->add_global_handler( 'quit', \&on_quit ); $conns{$mynick}->add_global_handler( 'notice', \&on_notice ); - $conns{$mynick} - ->add_global_handler( 'whoischannels', \&on_whoischannels ); - $conns{$mynick} - ->add_global_handler( 'useronchannel', \&on_useronchannel ); + $conns{$mynick}->add_global_handler( 'whoischannels', \&on_whoischannels ); + $conns{$mynick}->add_global_handler( 'useronchannel', \&on_useronchannel ); $conns{$mynick}->add_global_handler( 'whois', \&on_whois ); $conns{$mynick}->add_global_handler( 'other', \&on_other ); $conns{$mynick}->add_global_handler( 'disconnect', \&on_disconnect ); - $conns{$mynick} - ->add_global_handler( [ 251, 252, 253, 254, 255 ], \&on_init ); + $conns{$mynick}->add_global_handler( [ 251, 252, 253, 254, 255 ], \&on_init ); # $conns{$mynick}->add_global_handler(302, \&on_init); # userhost $conns{$mynick}->add_global_handler( 303, \&on_ison ); # notify. @@ -738,23 +735,20 @@ sub invite { # Usage: &joinNextChan(); sub joinNextChan { my $joined = 0; - #foreach ( sort keys %conns ) { - #$conn = $conns{$mynick}; - if (defined $conn) { - my $mynick = $conn->nick(); - my @join = getJoinChans(1); - - if ( scalar @join ) { - my $chan = shift @join; - &joinchan($chan); - - if ( my $i = scalar @join ) { - &status("joinNextChan: $mynick $i chans to join."); - } - $joined = 1; + if (defined $conn) { + my $mynick = $conn->nick(); + my @join = getJoinChans(1); + + if ( scalar @join ) { + my $chan = shift @join; + &joinchan($chan); + + if ( my $i = scalar @join ) { + &status("joinNextChan: $mynick $i chans to join."); } + $joined = 1; } - #} + } return if $joined; if ( exists $cache{joinTime} ) {