lei q: trim JSON output

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

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 48237f8ab5b3c6f89895133c5958a7b180c8f893..1ce2a09878329645499e91be4c8e9a429c0f4d08 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -136,7 +136,10 @@ sub ovv_end {
 sub _unbless_smsg {
        my ($smsg, $mitem) = @_;
 
-       delete @$smsg{qw(lines bytes num tid)};
+       # TODO: make configurable
+       # num/tid are nonsensical with multi-inbox search,
+       # lines/bytes are not generally useful
+       delete @$smsg{qw(num tid lines bytes)};
        $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt
        $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
        $smsg->{pct} = get_pct($mitem) if $mitem;
@@ -151,7 +154,8 @@ sub _unbless_smsg {
                $smsg->{substr($f, 0, 1)} = pairs($v);
        }
        $smsg->{'s'} = delete $smsg->{subject};
-       scalar { %$smsg }; # unbless
+       my $kw = delete($smsg->{kw});
+       scalar { %$smsg, ($kw && scalar(@$kw) ? (kw => $kw) : ()) }; # unbless
 }
 
 sub ovv_atexit_child {
@@ -176,7 +180,10 @@ sub _json_pretty {
                                        $pair =~ s/(null|"),"/$1, "/g;
                                        $pair;
                                } @$v) . ']';
-                       } else { # references
+                       } elsif ($k eq 'kw') { # keywords are short, one-line
+                               $v = $json->encode($v);
+                               $v =~ s/","/", "/g;
+                       } else { # refs, labels, ...
                                $v = '[' . join($sep, map {
                                        substr($json->encode([$_]), 1, -1);
                                } @$v) . ']';