view: fix link to raw message from /f/ endpoint

[public-inbox.git] / public-inbox.cgi

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 03202c61736afa7887887ab7a8786a8584bc2105..fc48f2f4416a42c7345ee5c2e4db0cd9f51b57bb 100755 (executable)
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -65,9 +65,7 @@ sub main {
                invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
        } elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) {
                invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0);
-       } elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) {
-               invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1);
-       } elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) {
+       } elsif ($path_info =~ m!$LISTNAME_RE/atom\.xml\z!o) {
                invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 0);
 
        # single-message pages
@@ -80,7 +78,7 @@ sub main {
        } elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
                invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx, $cgi);
 
-       # convenience redirect
+       # convenience redirects, order matters
        } elsif ($path_info =~ m!$LISTNAME_RE/(?:m|f)/(\S+)\z!o) {
                invalid_list_mid(\%ctx, $1, $2) || redirect_mid(\%ctx, $cgi);
 
@@ -114,8 +112,7 @@ sub invalid_list_mid {
        undef;
 }
 
-# /$LISTNAME/index.atom.xml                     -> Atom feed
-# /$LISTNAME/all.atom.xml                       -> Atom feed, includes replies
+# /$LISTNAME/atom.xml                       -> Atom feed, includes replies
 sub get_atom {
        my ($ctx, $cgi, $top) = @_;
        require PublicInbox::Feed;
@@ -170,8 +167,9 @@ sub get_mid_html {
        my $x = mid2blob($ctx);
        return r404() unless $x;
 
-       my $pfx = "../f/" . uri_escape($ctx->{mid}) . ".html";
        require PublicInbox::View;
+       my $mid_href = PublicInbox::View::ascii_html(uri_escape($ctx->{mid}));
+       my $pfx = "../f/$mid_href.html";
        require Email::MIME;
        [ "200 OK", {'Content-Type' => 'text/html'},
                PublicInbox::View->as_html(Email::MIME->new($$x), $pfx)];