From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/7] mbox: remove feed dependency
Date: Mon, 20 Jun 2016 00:57:14 +0000 [thread overview]
Message-ID: <20160620005717.1482-5-e@80x24.org> (raw)
In-Reply-To: <20160620005717.1482-1-e@80x24.org>
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', "<mailto:$feed_opts->{id_addr}>",
+ 'List-Post', "<mailto:$ibx->{-primary_address}>",
);
my $append = '';
my $crlf = $simple->crlf;
next prev parent reply other threads:[~2016-06-20 0:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 0:57 [PATCH 0/7] www: various feed/streaming related cleanups Eric Wong
2016-06-20 0:57 ` [PATCH 1/7] MANIFEST: update with recent changes Eric Wong
2016-06-20 0:57 ` [PATCH 2/7] feed: avoid needless method dispatches on 404 Eric Wong
2016-06-20 0:57 ` [PATCH 3/7] feed: remove dependence on fh->write for streaming Eric Wong
2016-06-20 0:57 ` Eric Wong [this message]
2016-06-20 0:57 ` [PATCH 5/7] mbox: avoid write dependency " Eric Wong
2016-06-20 0:57 ` [PATCH 6/7] feed: various object-orientation cleanups Eric Wong
2016-06-20 0:57 ` [PATCH 7/7] inbox: move field population logic to initializer Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160620005717.1482-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).