summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
05e81bf)
# Display 'Chans:' only if more than $show seconds since last display
if ( time() - $lastChansTime > $show ) {
$lastChansTime = time();
# Display 'Chans:' only if more than $show seconds since last display
if ( time() - $lastChansTime > $show ) {
$lastChansTime = time();
- }
- else {
- $show = 0; # Don't display since < 15min since last
+ } else {
+ # Don't display since < 15min since last
+ $show = 0;
}
# can't join any if not connected
}
# can't join any if not connected
$chanconf{$_}{autojoin} = $val;
}
$skip++ if ( lc $val ne lc $nick );
$chanconf{$_}{autojoin} = $val;
}
$skip++ if ( lc $val ne lc $nick );
$skip++;
}
if ($skip) {
push( @skip, $_ );
$skip++;
}
if ($skip) {
push( @skip, $_ );
if ( defined $channels{$_} or exists $channels{$_} ) {
push( @in, $_ );
if ( defined $channels{$_} or exists $channels{$_} ) {
push( @in, $_ );
push( @join, $_ );
}
}
}
my $str;
push( @join, $_ );
}
}
}
my $str;
- $str .= ' in:' . join( ',', sort @in ) if scalar @in;
- $str .= ' skip:' . join( ',', sort @skip ) if scalar @skip;
$str .= ' join:' . join( ',', sort @join ) if scalar @join;
$str .= ' join:' . join( ',', sort @join ) if scalar @join;
+ $str .= ' in:' . join( ',', sort @in ) if scalar @in;
+ $str .= ' skip:' . scalar @skip if scalar @skip;
&status("Chans: ($nick)$str") if ($show);
&status("Chans: ($nick)$str") if ($show);
if (@_) {
&ScheduleThis( 300, 'ircCheck' ); # every 5 minutes
if (@_) {
&ScheduleThis( 300, 'ircCheck' ); # every 5 minutes
- return if ( $_[0] eq '2' ); # defer.
+ return $retval if ( $_[0] eq '2' ); # defer.
}
$cache{statusSafe} = 1;
}
$cache{statusSafe} = 1;
+ # save current connection
+ my $saveconn = $conn;
foreach ( sort keys %conns ) {
$conn = $conns{$_};
foreach ( sort keys %conns ) {
$conn = $conns{$_};
- next if (!defined $conn);
- my $mynick = $conn->nick();
+ next if (!defined $myconn);
+ my $nick = $myconn->nick();
&DEBUG("ircCheck for $_");
# Display with min of 900sec delay between redisplay
# FIXME: should only use 900sec when we are on the LAST %conns
my @join = &getJoinChans(900);
if ( scalar @join ) {
&DEBUG("ircCheck for $_");
# Display with min of 900sec delay between redisplay
# FIXME: should only use 900sec when we are on the LAST %conns
my @join = &getJoinChans(900);
if ( scalar @join ) {
- &FIXME( 'ircCheck: found channels to join! ' . join( ',', @join ) );
+ &FIXME( 'ircCheck: found ' . scalar @join . 'channels to join! ' . join( ',', @join ) );
+ $retval += scalar @join;
+ # restore connection we were called from
+ $conn = $saveconn;
if ( grep /^\s*$/, keys %channels ) {
&WARN('ircCheck: we have a NULL chan in hash channels? removing!');
if ( grep /^\s*$/, keys %channels ) {
&WARN('ircCheck: we have a NULL chan in hash channels? removing!');
$cache{statusSafe} = 0;
### USER FILE.
$cache{statusSafe} = 0;
### USER FILE.
- if ( $utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600 )
- {
+ if ($utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600) {
&writeUserFile();
$wtime_userfile = time();
}
### CHAN FILE.
&writeUserFile();
$wtime_userfile = time();
}
### CHAN FILE.
- if ( $utime_chanfile > $wtime_chanfile and time() - $wtime_chanfile > 3600 )
- {
+ if ($utime_chanfile > $wtime_chanfile and time() - $wtime_chanfile > 3600) {
&writeChanFile();
$wtime_chanfile = time();
}
&writeChanFile();
$wtime_chanfile = time();
}
if ( $chan eq '' ) { # all channels.
my $i = keys %channels;
if ( $chan eq '' ) { # all channels.
my $i = keys %channels;
- my $reply = "I'm on \002$i\002 " . &fixPlural( 'channel', $i );
my $tucount = 0; # total user count.
my $uucount = 0; # unique user count.
my %chans;
my $tucount = 0; # total user count.
my $uucount = 0; # unique user count.
my %chans;
foreach $chan ( sort { $chans{$b} <=> $chans{$a} } keys %chans ) {
push( @array, "$chan/" . $chans{$chan} );
}
foreach $chan ( sort { $chans{$b} <=> $chans{$a} } keys %chans ) {
push( @array, "$chan/" . $chans{$chan} );
}
- &performStrictReply( $reply . ': ' . join( ', ', @array ) );
### total user count.
foreach $chan ( keys %channels ) {
### total user count.
foreach $chan ( keys %channels ) {
$uucount = scalar( keys %nicks );
my $chans = scalar( keys %channels );
$uucount = scalar( keys %nicks );
my $chans = scalar( keys %channels );
- &performStrictReply( "i've cached \002$tucount\002 "
- . &fixPlural( 'user', $tucount )
- . ", \002$uucount\002 unique "
- . &fixPlural( 'user', $uucount )
- . ", distributed over \002$chans\002 "
- . &fixPlural( 'channel', $chans )
- . '.' );
- &ircCheck();
+ my $join = &ircCheck();
+ &performStrictReply(
+ "\002$chans/".($chans+$join)."\002 " . &fixPlural('channel', $chans)
+ . ", \002$tucount\002 " . &fixPlural('user', $tucount)
+ . ", \002$uucount\002 unique: "
+ . join(', ', @array));