diff options
author | Eric Wong <e@80x24.org> | 2016-06-30 08:57:49 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-06-30 08:57:49 +0000 |
commit | 2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03 (patch) | |
tree | 51cae3ecfd9a2d0edd9730409eafc5381779778f /lib/PublicInbox/WWW.pm | |
parent | 10a26e3c869783673933962d0c38f6d13012f3e8 (diff) | |
parent | 8e52aa5d5a9186a1c90bc77e444d77d6130c8779 (diff) | |
download | public-inbox-2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03.tar.gz |
* thread-view-skel: view: show thread size when linking to summary view: default to flat/hybrid thread display view: fix up some HTML injection via Message-ID vectors www: reinstate old thread view as an option view: show more nearby messages in flat thread view view: tweak thread/index header slightly feed: add $INBOX/new.html endpoint view: merge $state hash with existing $ctx view: show thread context in the thread-aware flat view www: use WwwStream for dumping thread and search views www: implement hybrid flat+thread conversation view
Diffstat (limited to 'lib/PublicInbox/WWW.pm')
-rw-r--r-- | lib/PublicInbox/WWW.pm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index d6b07bf7..cbd3142d 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -75,7 +75,8 @@ sub call { invalid_inbox($self, $ctx, $1) || get_index($ctx); } elsif ($path_info =~ m!$INBOX_RE/(?:atom\.xml|new\.atom)\z!o) { invalid_inbox($self, $ctx, $1) || get_atom($ctx); - + } elsif ($path_info =~ m!$INBOX_RE/new\.html\z!o) { + invalid_inbox($self, $ctx, $1) || get_new($ctx); } elsif ($path_info =~ m!$INBOX_RE/ ($PublicInbox::GitHTTPBackend::ANY)\z!ox) { my $path = $2; @@ -190,6 +191,13 @@ sub get_atom { PublicInbox::Feed::generate($ctx); } +# /$INBOX/new.html -> HTML only +sub get_new { + my ($ctx) = @_; + require PublicInbox::Feed; + PublicInbox::Feed::new_html($ctx); +} + # /$INBOX/?r=$GIT_COMMIT -> HTML only sub get_index { my ($ctx) = @_; @@ -235,11 +243,10 @@ sub get_mid_html { # /$INBOX/$MESSAGE_ID/t/ sub get_thread { my ($ctx, $flat) = @_; - my $srch = searcher($ctx) or return need_search($ctx); - require PublicInbox::View; - my $foot = footer($ctx); + searcher($ctx) or return need_search($ctx); $ctx->{flat} = $flat; - PublicInbox::View::thread_html($ctx, $foot, $srch); + require PublicInbox::View; + PublicInbox::View::thread_html($ctx); } sub ctx_get { @@ -411,11 +418,11 @@ sub msg_page { my $ret; $ret = invalid_inbox_mid($self, $ctx, $inbox, $mid) and return $ret; '' eq $e and return get_mid_html($ctx); + 'T/' eq $e and return get_thread($ctx, 1); 't/' eq $e and return get_thread($ctx); 't.atom' eq $e and return get_thread_atom($ctx); 't.mbox' eq $e and return get_thread_mbox($ctx); 't.mbox.gz' eq $e and return get_thread_mbox($ctx, '.gz'); - 'T/' eq $e and return get_thread($ctx, 1); 'raw' eq $e and return get_mid_txt($ctx); # legacy, but no redirect for compatibility: |