From da146947a8eff3ec3e0064e9fb13b1165976ac5f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 23 Feb 2020 22:47:15 +0000 Subject: searchview: set obfuscation inbox properly We never lookup `$ctx->{-obfuscate}' anywhere, as the correct key is `$ctx->{-obfs_ibx}' since some of the address obfuscation stuff is inbox-specific. Note: some of the obfuscation stuff still needs tests, but it's low-priority at the moment since I don't think it's a good feature after all. --- lib/PublicInbox/SearchView.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 9b67b045..0bd94774 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -268,7 +268,8 @@ sub load_msgs { sub mset_thread { my ($ctx, $mset, $q) = @_; - my $msgs = $ctx->{-inbox}->search->retry_reopen(\&load_msgs, $mset); + my $ibx = $ctx->{-inbox}; + my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset); my $r = $q->{r}; my $rootset = PublicInbox::SearchThread::thread($msgs, $r ? \&sort_relevance : \&PublicInbox::View::sort_ds, @@ -285,7 +286,7 @@ sub mset_thread { $ctx->{s_nr} = scalar(@$msgs).'+ results'; # reduce hash lookups in skel_dump - $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate}; + $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; PublicInbox::View::walk_thread($rootset, $ctx, \&PublicInbox::View::pre_thread); -- cgit v1.2.3-24-ge0c7