imapd: sort LIST response

[public-inbox.git] / lib / PublicInbox / IMAPD.pm

diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 7425409d3594ebbd1b985c3ca1c323e534a8857a..6aa3d12fa1e76eb4a2ab20008e281a9dfad03ec8 100644 (file)
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -70,12 +70,21 @@ sub imapd_refresh_finalize {
        }
        %$mailboxes = (%$mailboxes, %{$imapd->{mailboxes}});
        $imapd->{mailboxes} = $mailboxes;
-       $imapd->{inboxlist} = [
+       $imapd->{mailboxlist} = [
+               map { $_->[2] }
+               sort { $a->[0] cmp $b->[0] || $a->[1] <=> $b->[1] }
                map {
-                       my $no = $mailboxes->{$_} == $dummy ? '' : 'No';
                        my $u = $_; # capitalize "INBOX" for user-familiarity
                        $u =~ s/\Ainbox(\.|\z)/INBOX$1/i;
-                       qq[* LIST (\\Has${no}Children) "." $u\r\n]
+                       if ($mailboxes->{$_} == $dummy) {
+                               [ $u, -1,
+                                 qq[* LIST (\\HasChildren) "." $u\r\n]]
+                       } else {
+                               $u =~ /\A(.+)\.([0-9]+)\z/ or
+                                       die "BUG: `$u' has no slice digit(s)";
+                               [ $1, $2 + 0,
+                                 qq[* LIST (\\HasNoChildren) "." $u\r\n] ]
+                       }
                } keys %$mailboxes
        ];
        $imapd->{pi_cfg} = $pi_cfg;