From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BC0E62018F for ; Mon, 20 Jun 2016 00:57:19 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 4/7] mbox: remove feed dependency Date: Mon, 20 Jun 2016 00:57:14 +0000 Message-Id: <20160620005717.1482-5-e@80x24.org> In-Reply-To: <20160620005717.1482-1-e@80x24.org> References: <20160620005717.1482-1-e@80x24.org> List-Id: We do not need feed options there (or anywhere, hopefully). --- lib/PublicInbox/Mbox.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 7934876..1c792c8 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -32,19 +32,14 @@ sub emit_msg { foreach my $d (qw(Lines Bytes Content-Length Status)) { $header_obj->header_set($d); } - my $feed_opts = $ctx->{feed_opts}; - unless ($feed_opts) { - require PublicInbox::Feed; # FIXME: gross - $feed_opts = PublicInbox::Feed::get_feedopts($ctx); - $ctx->{feed_opts} = $feed_opts; - } - my $base = $feed_opts->{url}; + my $ibx = $ctx->{-inbox}; + my $base = $ibx->base_url($ctx->{cgi}); my $mid = mid_clean($header_obj->header('Message-ID')); $mid = uri_escape_utf8($mid); my @append = ( 'Archived-At', "<$base$mid/>", 'List-Archive', "<$base>", - 'List-Post', "{id_addr}>", + 'List-Post', "{-primary_address}>", ); my $append = ''; my $crlf = $simple->crlf;