$html>\n)
@@ -626,16 +623,16 @@ }
}
sub _msg_page_prepare_obuf {
- my ($hdr, $ctx) = @_;
+ my ($eml, $ctx) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
- my $mids = mids_for_index($hdr);
+ my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
$rv .= '';
} else {
- $ctx->{first_hdr} = $hdr;
+ $ctx->{first_hdr} = $eml->header_obj;
if ($ctx->{smsg}) {
$rv .=
"WARNING: multiple messages have this Message-ID\n
";
@@ -644,7 +641,7 @@ $rv .= ""; # anchor for body start
}
$ctx->{-upfx} = '../' if $over;
my @title; # (Subject[0], From[0])
- for my $v ($hdr->header('From')) {
+ for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
$v = ascii_html($v);
$title[1] //= ascii_html(join(', ', @n));
@@ -655,14 +652,14 @@ }
$rv .= "From: $v\n" if $v ne '';
}
foreach my $h (qw(To Cc)) {
- for my $v ($hdr->header($h)) {
+ for my $v ($eml->header($h)) {
fold_addresses($v);
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n" if $v ne '';
}
}
- my @subj = $hdr->header('Subject');
+ my @subj = $eml->header('Subject');
if (@subj) {
my $v = ascii_html(shift @subj);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
@@ -678,7 +675,7 @@ } else { # dummy anchor for thread skeleton at bottom of page
$rv .= qq() if $over;
$title[0] = '(no subject)';
}
- for my $v ($hdr->header('Date')) {
+ for my $v ($eml->header('Date')) {
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
$rv .= "Date: $v\n";
@@ -697,12 +694,12 @@ # public-inbox-nntpd because of multiple Message-ID headers.
my $lnk = PublicInbox::Linkify->new;
my $s = '';
for my $h (qw(Message-ID X-Alt-Message-ID)) {
- $s .= "$h: $_\n" for ($hdr->header_raw($h));
+ $s .= "$h: $_\n" for ($eml->header_raw($h));
}
$lnk->linkify_mids('..', \$s, 1);
$rv .= $s;
}
- $rv .= _parent_headers($hdr, $over);
+ $rv .= _parent_headers($eml, $over);
$rv .= "\n";
\$rv;
}
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 814b455b2ac579819feec01b8e291575b493e2d6..7d4139a5dcf983461193854495359c45556a97af 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -163,9 +163,8 @@
# any header match means it's eligible for the inbox:
if (my $watch_hdrs = $ibx->{-watchheaders}) {
my $ok;
- my $hdr = $eml->header_obj;
for my $wh (@$watch_hdrs) {
- my @v = $hdr->header_raw($wh->[0]);
+ my @v = $eml->header_raw($wh->[0]);
$ok = grep(/$wh->[1]/, @v) and last;
}
return unless $ok;
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 1ed806fd42543fcf4ad650577f8ad369732fbccb..388def1239f90af5a7758c2bcffe5045114dda64 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -116,9 +116,8 @@
# returns undef or string
sub feed_entry {
my ($ctx, $smsg, $eml) = @_;
- my $hdr = $eml->header_obj;
my $mid = $smsg->{mid};
- my $irt = PublicInbox::View::in_reply_to($hdr);
+ my $irt = PublicInbox::View::in_reply_to($eml);
my $uuid = to_uuid($mid);
my $base = $ctx->{feed_base_url};
if (defined $irt) {
@@ -130,13 +129,13 @@ } else {
$irt = '';
}
my $href = $base . mid_href($mid) . '/';
- my $updated = feed_updated(msg_timestamp($hdr));
+ my $updated = feed_updated(msg_timestamp($eml));
- my $title = $hdr->header('Subject');
+ my $title = $eml->header('Subject');
$title = '(no subject)' unless defined $title && $title ne '';
$title = title_tag($title);
- my $from = $hdr->header('From') // $hdr->header('Sender') //
+ my $from = $eml->header('From') // $eml->header('Sender') //
$ctx->{-inbox}->{-primary_address};
my ($email) = PublicInbox::Address::emails($from);
my $name = ascii_html(join(', ', PublicInbox::Address::names($from)));
diff --git a/script/public-inbox-edit b/script/public-inbox-edit
index 2d3c4af4d38827f1c3068190b38fa787c2aad5eb..240beb3a168ff3e6c6a35e4814b3cab144761642 100755
--- a/script/public-inbox-edit
+++ b/script/public-inbox-edit
@@ -93,7 +93,7 @@ warn "Will edit all of them\n";
}
} else {
my $eml = eml_from_path($file) or die "open($file) failed: $!";
- my $mids = mids($eml->header_obj);
+ my $mids = mids($eml);
find_mid($found, $_, \@ibxs) for (@$mids); # populates $found
my $chash = content_hash($eml);
my $to_edit = $found->{$chash};
@@ -214,9 +214,9 @@ PublicInbox::Import::drop_unwanted_headers($old_mime);
# allow changing Received: and maybe other headers which can
# contain sensitive info.
- my $nhdr = $new_mime->header_obj;
- my $ohdr = $old_mime->header_obj;
- if (($nhdr->as_string eq $ohdr->as_string) &&
+ my $nhdr = $new_mime->header_obj->as_string;
+ my $ohdr = $old_mime->header_obj->as_string;
+ if (($nhdr eq $ohdr) &&
(content_hash($new_mime) eq content_hash($old_mime))) {
warn "No change detected to:\n", show_cmd($ibx, $smsg);
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 42d0e00cbb72687bbdaf5e67e1fb0c6c379ba9b1..02ca343163eaf00658b8081f025695f94b6c2e58 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -119,7 +119,7 @@ # ->abort is idempotent, no emergency if a single
# destination succeeds
$emm->abort;
} else { # v1-only
- my $mid = $mime->header_obj->header_raw('Message-ID');
+ my $mid = $mime->header_raw('Message-ID');
# this message is similar to what ssoma-mda shows:
print STDERR "CONFLICT: Message-ID: $mid exists\n";
}