remove the comment

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 8253b8998d0674430b57ddb88e16ec75277df2aa..7112f97a7d314ad2fee479a4d6f307cc2505672f 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) {
@@ -73,18 +72,14 @@ sub chaninfo {
        }
 
        ### unique user count.
-       my @nicks;
+       my %nicks = ();
        foreach $chan (keys %channels) {
-           foreach (keys %{ $channels{$chan}{''} }) {
-               next if (grep /^\Q$_\E$/, @nicks);
-               $uucount++;
-               push(@nicks, $_);
+           my $nick;
+           foreach $nick (keys %{ $channels{$chan}{''} }) {
+               $nicks{$nick}++;
            }
        }
-
-       if (scalar @nicks != $uucount) {
-           &DEBUG("nicks != uucount...");
-       }
+       $uucount = scalar(keys %nicks);
 
        my $chans = scalar(keys %channels);
        &performStrictReply(
@@ -93,6 +88,7 @@ sub chaninfo {
            ", distributed over \002$chans\002 ".
            &fixPlural("channel", $chans)."."
        );
+       &ircCheck();
 
        return;
     }
@@ -394,7 +390,7 @@ sub do_countrystats {
        push(@list, "$str ($_, $perc %)");
     }
 
-    # TODO: move this into a scheduler like nickometer
+    # TODO: move this into a scheduler
     $msgType   = "private";
     &performStrictReply( &formListReply(0, "Country Stats ", @list) );
 
@@ -410,7 +406,7 @@ sub userCommands {
     # conversion: ascii.
     if ($message =~ /^(asci*|chr) (\d+)$/) {
        &DEBUG("ascii/chr called ...");
-       return unless (&hasParam("allowConv"));
+       return unless (&IsChanConfOrWarn("allowConv"));
 
        &DEBUG("ascii/chr called");
 
@@ -425,7 +421,7 @@ sub userCommands {
 
     # conversion: ord.
     if ($message =~ /^ord(\s+(.*))$/) {
-       return unless (&hasParam("allowConv"));
+       return unless (&IsChanConfOrWarn("allowConv"));
 
        $arg = $2;
 
@@ -449,7 +445,7 @@ sub userCommands {
 
     # hex.
     if ($message =~ /^hex(\s+(.*))?$/i) {
-       return unless (&hasParam("allowConv"));
+       return unless (&IsChanConfOrWarn("allowConv"));
        my $arg = $2;
 
        if (!defined $arg) {