Merge remote-tracking branch 'origin/inboxdir'

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index a04838a1a608948cbc096af61413337bd0f9444e..6d6597597d90c501dd6a8ce0b96e246573548c3a 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for generating Atom feeds for web-accessible mailing list archives.
@@ -31,9 +31,6 @@ sub generate_thread_atom {
        my $msgs = $ibx->over->get_thread($mid);
        return _no_thread() unless @$msgs;
 
-       my $html_url = $ibx->base_url($ctx->{env});
-       $html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
-       $ctx->{-html_url} = $html_url;
        PublicInbox::WwwAtomStream->response($ctx, 200, sub {
                while (my $smsg = shift @$msgs) {
                        $ibx->smsg_mime($smsg) and return $smsg;
@@ -102,7 +99,7 @@ sub recent_msgs {
        my $hex = '[a-f0-9]';
        my $addmsg = qr!^:000000 100644 \S+ (\S+) A\t${hex}{2}/${hex}{38}$!;
        my $delmsg = qr!^:100644 000000 (\S+) \S+ D\t(${hex}{2}/${hex}{38})$!;
-       my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~\d+)?/;
+       my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/;
 
        # revision ranges may be specified
        my $range = 'HEAD';