www: allow including links to NNTP sites in HTML footer

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 1c97f959c84502f6529310af2b5f6704f4858c30..dc41548b87ce68726dc41aa79bd571589a150641 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -8,7 +8,6 @@ use strict;
 use warnings;
 use PublicInbox::MID qw/mid_clean/;
 use URI::Escape qw/uri_escape_utf8/;
-use Plack::Util;
 require Email::Simple;
 
 sub emit1 {
@@ -28,7 +27,7 @@ sub msg_str {
                $header_obj->header_set($d);
        }
        my $ibx = $ctx->{-inbox};
-       my $base = $ibx->base_url($ctx->{cgi});
+       my $base = $ibx->base_url($ctx->{env});
        my $mid = mid_clean($header_obj->header('Message-ID'));
        $mid = uri_escape_utf8($mid);
        my @append = (
@@ -130,7 +129,7 @@ sub getline {
        my $gz = $self->{gz};
        do {
                while (defined(my $smsg = shift @{$self->{msgs}})) {
-                       my $msg = eval { $ibx->msg_by_mid($smsg->mid) } or next;
+                       my $msg = eval { $ibx->msg_by_smsg($smsg) } or next;
                        $msg = Email::Simple->new($msg);
                        $gz->write(PublicInbox::Mbox::msg_str($ctx, $msg));
                        my $bref = $self->{buf};
@@ -139,6 +138,9 @@ sub getline {
                                ${$self->{buf}} = '';
                                return $ret;
                        }
+
+                       # be fair to other clients on public-inbox-httpd:
+                       return '';
                }
                $res = $self->{cb}->($self->{opts});
                $self->{msgs} = $res->{msgs};