diff options
| author | Eric Wong <e@80x24.org> | 2021-03-08 08:08:16 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-03-09 18:23:21 -0400 |
| commit | f67658d41387f486b7a725ece2c5e1015a7c5a84 (patch) | |
| tree | 5eab8b9dd224c18d363dcf7d1f4ff1d05648ccd9 | |
| parent | 7d72d2814e6703bdf411f55ed0461eeb214b7e89 (diff) | |
| download | public-inbox-f67658d41387f486b7a725ece2c5e1015a7c5a84.tar.gz | |
They're unnecessary visual noise, and angle brackets don't always work as intended when going through Xapian's query parser. Since we already use "m:" and "refs:" instead of the actual header names, it should be obvious we're at liberty to abbreviate such things Link: https://public-inbox.org/meta/20210304184348.GA19350@dcvr/
| -rw-r--r-- | lib/PublicInbox/LeiOverview.pm | 5 | ||||
| -rw-r--r-- | t/lei-externals.t | 2 | ||||
| -rw-r--r-- | t/lei-q-thread.t | 8 | ||||
| -rw-r--r-- | xt/net_writer-imap.t | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 4db1d8c8..01556273 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -141,17 +141,16 @@ sub _unbless_smsg { $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate $smsg->{pct} = get_pct($mitem) if $mitem; if (my $r = delete $smsg->{references}) { - $smsg->{refs} = [ map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ]; + $smsg->{refs} = [ map { $_ } ($r =~ m/$MID_EXTRACT/go) ]; } if (my $m = delete($smsg->{mid})) { - $smsg->{'m'} = "<$m>"; + $smsg->{'m'} = $m; } for my $f (qw(from to cc)) { my $v = delete $smsg->{$f} or next; $smsg->{substr($f, 0, 1)} = pairs($v); } $smsg->{'s'} = delete $smsg->{subject}; - # can we be bothered to parse From/To/Cc into arrays? scalar { %$smsg }; # unbless } diff --git a/t/lei-externals.t b/t/lei-externals.t index 29667640..2a92d101 100644 --- a/t/lei-externals.t +++ b/t/lei-externals.t @@ -25,7 +25,7 @@ SKIP: { lei_ok(@cmd, \"query $url"); is($lei_err, '', "no errors on $url"); my $res = json_utf8->decode($lei_out); - is($res->[0]->{'m'}, "<$mid>", "got expected mid from $url") or + is($res->[0]->{'m'}, $mid, "got expected mid from $url") or skip 'further remote tests', 1; lei_ok(@cmd, 'd:..20101002', \'no results, no error'); is($lei_err, '', 'no output on 404, matching local FS behavior'); diff --git a/t/lei-q-thread.t b/t/lei-q-thread.t index 28c639f5..e24fb2cb 100644 --- a/t/lei-q-thread.t +++ b/t/lei-q-thread.t @@ -27,9 +27,9 @@ test_lei(sub { is(scalar(@$res), 3, 'got 2 results'); pop @$res; my %m = map { $_->{'m'} => $_ } @$res; - is_deeply($m{'<testmessage@example.com>'}->{kw}, ['seen'], + is_deeply($m{'testmessage@example.com'}->{kw}, ['seen'], 'flag set in direct hit'); - 'TODO' or is_deeply($m{'<a-reply@miss>'}->{kw}, ['draft'], + 'TODO' or is_deeply($m{'a-reply@miss'}->{kw}, ['draft'], 'flag set in thread hit'); lei_ok qw(q -t -t m:testmessage@example.com); @@ -37,9 +37,9 @@ test_lei(sub { is(scalar(@$res), 3, 'got 2 results with -t -t'); pop @$res; %m = map { $_->{'m'} => $_ } @$res; - is_deeply($m{'<testmessage@example.com>'}->{kw}, ['flagged', 'seen'], + is_deeply($m{'testmessage@example.com'}->{kw}, ['flagged', 'seen'], 'flagged set in direct hit'); - 'TODO' or is_deeply($m{'<testmessage@example.com>'}->{kw}, ['draft'], + 'TODO' or is_deeply($m{'testmessage@example.com'}->{kw}, ['draft'], 'flagged set in direct hit'); lei_ok qw(q -tt m:testmessage@example.com --only), "$ro_home/t2"; $res = json_utf8->decode($lei_out); diff --git a/xt/net_writer-imap.t b/xt/net_writer-imap.t index c24fa993..3631d932 100644 --- a/xt/net_writer-imap.t +++ b/xt/net_writer-imap.t @@ -168,7 +168,7 @@ test_lei(sub { is_deeply($empty, [], 'clobbered folder'); lei_ok qw(q -o /dev/stdout m:testmessage@example.com --no-external); $res = json_utf8->decode($lei_out)->[0]; - is_deeply([@$res{qw(m kw)}], ['<testmessage@example.com>', ['seen']], + is_deeply([@$res{qw(m kw)}], ['testmessage@example.com', ['seen']], 'kw set'); }); |