re-order as ircCheck changes our nick

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 047916436b1c6ccb445bdf676c25a0b0e195c6f7..d5ac5dcfaf0470882bc552ca33ab1275957d5886 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -47,7 +47,7 @@ sub chaninfo {
 
     if ($chan eq "") {         # all channels.
        my $i           = keys %channels;
-       my $reply       = "i am on \002$i\002 ".&fixPlural("channel",$i);
+       my $reply       = "I'm on \002$i\002 ".&fixPlural("channel",$i);
        my $tucount     = 0;    # total user count.
        my $uucount     = 0;    # unique user count.
        my @array;
@@ -61,11 +61,10 @@ sub chaninfo {
            }
            next if (/^_default$/);
 
-           my $str = sprintf("%s (%d)", $_, scalar(keys %{ $channels{$_}{''} }));
+           my $str = sprintf("%s/%d", $_, scalar(keys %{ $channels{$_}{''} }));
            push(@array, $str);
        }
        &performStrictReply($reply.": ".join(', ', @array));
-       &ircCheck();
 
        ### total user count.
        foreach $chan (keys %channels) {
@@ -75,12 +74,14 @@ sub chaninfo {
        ### unique user count.
        my @nicks;
        foreach $chan (keys %channels) {
-           foreach (keys %{ $channels{$chan}{''} }) {
-               next if (grep /^\Q$_\E$/, @nicks);
+           my $nick = '';
+           foreach $nick (keys %{ $channels{$chan}{''} }) {
+               next if (grep /^\Q$nick\E$/, @nicks);
                $uucount++;
-               push(@nicks, $_);
+               push(@nicks, $nick);
            }
        }
+       #&::DEBUG(join ":", @nicks);
 
        if (scalar @nicks != $uucount) {
            &DEBUG("nicks != uucount...");
@@ -93,6 +94,7 @@ sub chaninfo {
            ", distributed over \002$chans\002 ".
            &fixPlural("channel", $chans)."."
        );
+       &ircCheck();
 
        return;
     }