* [PATCH 06/10] extmsg: disable automatic inbox switching
2016-07-06 7:14 7% [PATCH 0/10] various misc fixes and updates Eric Wong
@ 2016-07-06 7:14 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-07-06 7:14 UTC (permalink / raw)
To: meta
Automatic inbox switching was a potentially deceptive pattern
and surprises readers who do not check the URL bar closely.
Furthermore, a message could be cross-posted to multiple lists,
too.
---
lib/PublicInbox/ExtMsg.pm | 57 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 44 insertions(+), 13 deletions(-)
diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 62381e9..4925a59 100644
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -8,9 +8,9 @@
package PublicInbox::ExtMsg;
use strict;
use warnings;
-use URI::Escape qw(uri_escape_utf8);
use PublicInbox::Hval;
use PublicInbox::MID qw/mid2path/;
+use PublicInbox::WwwStream;
# TODO: user-configurable
our @EXT_URL = (
@@ -61,19 +61,21 @@ sub ext_msg {
}
});
- # TODO: multiple hits
- return r302($found[0], $mid) if @found;
+ return exact($ctx, \@found, $mid) if @found;
# Xapian not installed or configured for some repos,
- # do a full MID check:
+ # do a full MID check (this is expensive...):
if (@nox) {
my $path = mid2path($mid);
foreach my $other (@nox) {
my (undef, $type, undef) = $other->path_check($path);
- return r302($other, $mid) if $type && $type eq 'blob';
+ if ($type && $type eq 'blob') {
+ push @found, $other;
+ }
}
}
+ return exact($ctx, \@found, $mid) if @found;
# fall back to partial MID matching
my $n_partial = 0;
@@ -138,14 +140,43 @@ again:
[$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
}
-# Redirect to another public-inbox which is mapped by $pi_config
-# TODO: prompt for inbox-switching
-sub r302 {
- my ($inbox, $mid) = @_;
- my $url = $inbox->base_url . uri_escape_utf8($mid) . '/';
- [ 302,
- [ 'Location' => $url, 'Content-Type' => 'text/plain' ],
- [ "Redirecting to\n$url\n" ] ]
+sub ext_urls {
+ my ($ctx, $mid, $href, $html) = @_;
+
+ # Fall back to external repos if configured
+ if (@EXT_URL && index($mid, '@') >= 0) {
+ my $env = $ctx->{env};
+ my $e = "\nPerhaps try an external site:\n\n";
+ foreach my $url (@EXT_URL) {
+ my $u = PublicInbox::Hval::prurl($env, $url);
+ my $r = sprintf($u, $href);
+ my $t = sprintf($u, $html);
+ $e .= qq{<a\nhref="$r">$t</a>\n};
+ }
+ return $e;
+ }
+ ''
+}
+
+sub exact {
+ my ($ctx, $found, $mid) = @_;
+ my $h = PublicInbox::Hval->new_msgid($mid);
+ my $href = $h->as_href;
+ my $html = $h->as_html;
+ my $title = "<$html> found in ";
+ my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
+ $ctx->{-title_html} = $title . $end;
+ $ctx->{-upfx} = '../';
+ my $ext_urls = ext_urls($ctx, $mid, $href, $html);
+ my $code = (@$found == 1 && $ext_urls eq '') ? 200 : 300;
+ $ctx->{-html_tip} = join('',
+ "<pre>Message-ID: <$html>\nfound in $end:\n\n",
+ (map {
+ my $u = $_->base_url;
+ qq(<a\nhref="$u$href/">$u$html/</a>\n)
+ } @$found),
+ $ext_urls, '</pre>');
+ PublicInbox::WwwStream->response($ctx, $code);
}
1;
--
EW
^ permalink raw reply related [relevance 6%]
* [PATCH 0/10] various misc fixes and updates
@ 2016-07-06 7:14 7% Eric Wong
2016-07-06 7:14 6% ` [PATCH 06/10] extmsg: disable automatic inbox switching Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-07-06 7:14 UTC (permalink / raw)
To: meta
Close to a milestone with HTML UI consistency!
Eric Wong (10):
scripts/dc-dlvr: ensure temporary files are removed
daemon: disable USR2/TTIN/TTOU/WINCH in workers
hval: get rid of unused parameter for new_msgid
address: attempt to handle comments somewhat
wwwstream: allow undef noop callback
extmsg: disable automatic inbox switching
extmsg: switch to wwwstream for partial match, too
view: fix double-escaping of ghost links
www: use HTML <hr> instead of XHTML <hr />
feed: fix links to attachments in Atom feed
lib/PublicInbox/Address.pm | 6 ++--
lib/PublicInbox/Daemon.pm | 3 +-
lib/PublicInbox/ExtMsg.pm | 73 +++++++++++++++++++++++++++---------------
lib/PublicInbox/Feed.pm | 6 ++--
lib/PublicInbox/Hval.pm | 2 +-
lib/PublicInbox/SearchView.pm | 6 ++--
lib/PublicInbox/Unsubscribe.pm | 2 +-
lib/PublicInbox/View.pm | 17 +++++-----
lib/PublicInbox/WwwStream.pm | 6 ++--
scripts/dc-dlvr | 3 +-
t/address.t | 9 ++++++
11 files changed, 84 insertions(+), 49 deletions(-)
--
EW
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-07-06 7:14 7% [PATCH 0/10] various misc fixes and updates Eric Wong
2016-07-06 7:14 6% ` [PATCH 06/10] extmsg: disable automatic inbox switching Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).