'Email::Filter' => 0,
'Email::MIME' => 0,
'Email::MIME::ContentType' => 0,
+ 'Email::Simple' => 0,
'Encode::MIME::Header' => 0,
'File::Path::Expand' => 0,
'IPC::Run' => 0,
my $midurl = $feed_opts->{midurl};
my $header_obj = $mime->header_obj;
- my $mid = $header_obj->header('Message-ID');
+ my $mid = $header_obj->header_raw('Message-ID');
defined $mid or return 0;
$mid = PublicInbox::Hval->new_msgid($mid);
my $href = $mid->as_href;
package PublicInbox::MDA;
use strict;
use warnings;
+use Email::Simple;
use Email::Address;
use Date::Parse qw(strptime);
use constant MAX_SIZE => 1024 * 500; # same as spamc default, should be tunable
# do not allow Bcc, only Cc and To if recipient is set
sub precheck {
my ($klass, $filter, $address) = @_;
- my $simple = $filter->simple;
+ my Email::Simple $simple = $filter->simple;
my $mid = $simple->header("Message-ID");
return 0 if (length($mid) > MAX_MID_SIZE);
return 0 unless usable_str(length('<m@h>'), $mid) && $mid =~ /\@/;
use strict;
use warnings;
use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean id_compress mid2path/;
+our @EXPORT_OK = qw/mid_clean id_compress mid2path mid_mime/;
use Digest::SHA qw/sha1_hex/;
use constant MID_MAX => 40; # SHA-1 hex length
"$x2/$x38";
}
+sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
+
1;
use strict;
use warnings;
use base qw(PublicInbox::Search);
-use PublicInbox::MID qw/mid_clean id_compress/;
+use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
require PublicInbox::Git;
*xpfx = *PublicInbox::Search::xpfx;
my $db = $self->{xdb};
my $doc_id;
- my $mid = mid_clean($mime->header('Message-ID'));
+ my $mid = mid_clean(mid_mime($mime));
my $was_ghost = 0;
my $ct_msg = $mime->header('Content-Type') || 'text/plain';
my $doc = $smsg->{doc};
my $mid = $smsg->mid;
my $mime = $smsg->mime;
- my $refs = $mime->header('References');
+ my $hdr = $mime->header_obj;
+ my $refs = $hdr->header_raw('References');
my @refs = $refs ? ($refs =~ /<([^>]+)>/g) : ();
- if (my $irt = $mime->header('In-Reply-To')) {
+ if (my $irt = $hdr->header_raw('In-Reply-To')) {
# last References should be $irt
# we will de-dupe later
push @refs, mid_clean($irt);
sub unindex_blob {
my ($self, $git, $mime) = @_;
- my $mid = mid_clean($mime->header('Message-ID'));
+ my $mid = eval { mid_clean(mid_mime($mime)) };
$self->remove_message($mid) if defined $mid;
}
sub index_mm {
my ($self, $git, $mime) = @_;
- $self->{mm}->mid_insert(mid_clean($mime->header('Message-ID')));
+ $self->{mm}->mid_insert(mid_clean(mid_mime($mime)));
}
sub unindex_mm {
my ($self, $git, $mime) = @_;
- $self->{mm}->mid_delete(mid_clean($mime->header('Message-ID')));
+ $self->{mm}->mid_delete(mid_clean(mid_mime($mime)));
}
sub index_mm2 {
my ($self, $git, $mime, $bytes) = @_;
- my $num = $self->{mm}->num_for(mid_clean($mime->header('Message-ID')));
+ my $num = $self->{mm}->num_for(mid_clean(mid_mime($mime)));
index_blob($self, $git, $mime, $bytes, $num);
}
sub unindex_mm2 {
my ($self, $git, $mime) = @_;
- $self->{mm}->mid_delete(mid_clean($mime->header('Message-ID')));
+ $self->{mm}->mid_delete(mid_clean(mid_mime($mime)));
unindex_blob($self, $git, $mime);
}
use warnings;
use Search::Xapian;
use Email::Address qw//;
-use Email::Simple qw//;
use POSIX qw//;
use Date::Parse qw/str2time/;
use PublicInbox::MID qw/mid_clean/;
}
}
-sub _extract_mid {
- my ($self) = @_;
-
- my $mid = $self->mime->header('Message-ID');
- defined $mid ? mid_clean($mid) : $mid;
-}
+sub _extract_mid { mid_clean(mid_mime($_[0]->mime)) }
sub mime {
my ($self, $mime) = @_;
use PublicInbox::SearchMsg;
use PublicInbox::Hval;
use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_clean);
+use PublicInbox::MID qw(mid2path mid_clean mid_mime);
use Email::MIME;
require PublicInbox::Git;
our $LIM = 50;
if ($mime) {
# lazy load the full message from mini_mime:
- my $mid = $mime->header('Message-ID');
+ my $mid = mid_mime($mime);
$mime = eval {
my $path = mid2path(mid_clean($mid));
Email::MIME->new($git->cat_file('HEAD:'.$path));
use Email::MIME::ContentType qw/parse_content_type/;
use PublicInbox::Hval;
use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid2path/;
+use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/;
require POSIX;
# TODO: make these constants tunable
my $f = $hdr->header('From');
$f = '' unless defined $f;
$s = PublicInbox::Hval->new_oneline($s);
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
my $t = $s->as_html;
my $se_url =
sub in_reply_to {
my ($hdr) = @_;
- my $irt = $hdr->header('In-Reply-To');
+ my $irt = $hdr->header_raw('In-Reply-To');
return mid_clean($irt) if (defined $irt);
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
return $1;
}
my $enc = enc_for($hdr->header("Content-Type"));
my $subj = $hdr->header('Subject');
- my $mid_raw = mid_clean($hdr->header('Message-ID'));
+ my $mid_raw = mid_clean(mid_mime($mime));
my $id = anchor_for($mid_raw);
my $seen = $state->{seen};
$seen->{$id} = "#$id"; # save the anchor for children, later
my $srch = $ctx->{srch} if $ctx;
my $rv = "";
my @title;
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
foreach my $h (qw(From To Cc Subject Date)) {
my $v = $hdr->header($h);
sub thread_inline {
my ($dst, $ctx, $hdr, $upfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs) {
# avoid redundant URLs wasting bandwidth
my %seen;
my $subj = $hdr->header('Subject') || '';
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
push @arg, "--in-reply-to='" . ascii_html($mid) . "'";
my $irt = uri_escape_utf8($mid);
delete $cc{$to};
sub pre_anchor_entry {
my ($seen, $mime) = @_;
- my $id = anchor_for($mime->header('Message-ID'));
+ my $id = anchor_for(mid_mime($mime));
$seen->{$id} = "#$id"; # save the anchor for children, later
}
# lazy load the full message from mini_mime:
$mime = eval {
- my $path = mid2path(mid_clean($mime->header('Message-ID')));
+ my $path = mid2path(mid_clean(mid_mime($mime)));
Email::MIME->new($git->cat_file('HEAD:'.$path));
} or return;
my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $f = $hdr->header('X-PI-From');
my $d = _msg_date($hdr);
$f = PublicInbox::Hval->new_oneline($f)->as_html;
return unless $node;
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_obj('Message-ID'));
if ($mid eq $state->{parent_cmp}) {
$state->{parent} = $mid;
}
push @{$state->{order}}, [ $level, $subj ];
}
- my $mid = mid_clean($x->header('Message-ID'));
+ my $mid = mid_clean($x->header_raw('Message-ID'));
my $ts = $x->header('X-PI-TS');
my $exist = $state->{latest}->{$subj};
if ($mid = mid2blob($ctx)) {
require Email::Simple;
use PublicInbox::MID qw/mid_clean/;
- $mid = Email::Simple->new($mid);
- $ctx->{mid} = mid_clean($mid->header('Message-ID'));
+ my $s = Email::Simple->new($mid);
+ $ctx->{mid} = mid_clean($s->header('Message-ID'));
}
}
undef;