better shortened replies?

[infobot.git] / src / Misc.pl

diff --git a/src/Misc.pl b/src/Misc.pl
index 30222f406a7c2ffff6e7fd151342114b7a92959a..5488de83e4e460d950d5887dc88a720fb78ef189 100644 (file)
--- a/src/Misc.pl
+++ b/src/Misc.pl
@@ -134,7 +134,11 @@ sub formListReply {
            push(@rand, $list[$_]);
            last if (scalar @rand == $maxshow);
        }
-       @list = sort @rand;
+       if ($total > $maxshow) {
+           @list = sort @rand;
+       } else {
+           @list = @rand;
+       }
     } elsif ($total > $maxshow) {
        &status("formListReply: truncating list.");
 
@@ -142,6 +146,7 @@ sub formListReply {
     }
 
     # form the reply.
+    # FIXME: should grow and exit when full, not discard any that are oversize
     while () {
        $reply  = $prefix ."(\002". scalar(@list). "\002";
        $reply .= " of \002$total\002" if ($total != scalar @list);
@@ -585,10 +590,10 @@ sub hasProfanity {
     return $profanity;
 }
 
-sub hasParam {
+sub IsChanConfOrWarn {
     my ($param) = @_;
 
-    if (&IsChanConf($param) or &IsParam($param)) {
+    if (&IsChanConf($param)) {
        return 1;
     } else {
        ### TODO: specific reason why it failed.