switch read-only Email::Simple users to Eml

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

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index d1f75f6fc07a17e942d0c372fb114d63d8a40ac3..54207500dd8db5576658ae993169efd10318fdc5 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -8,7 +8,7 @@ use warnings;
 use base qw(PublicInbox::DS);
 use fields qw(nntpd article ng long_cb);
 use PublicInbox::MID qw(mid_escape $MID_EXTRACT);
-use Email::Simple;
+use PublicInbox::Eml;
 use POSIX qw(strftime);
 use PublicInbox::DS qw(now);
 use Digest::SHA qw(sha1_hex);
@@ -38,8 +38,7 @@ NEWNEWS\r
 LIST ACTIVE ACTIVE.TIMES NEWSGROUPS OVERVIEW.FMT\r
 HDR\r
 OVER\r
-
-my $have_deflate;
+COMPRESS DEFLATE\r
 
 sub greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) };
 
@@ -384,7 +383,7 @@ sub cmd_quit ($) {
 
 sub header_append ($$$) {
        my ($hdr, $k, $v) = @_;
-       my @v = $hdr->header($k);
+       my @v = $hdr->header_raw($k);
        foreach (@v) {
                return if $v eq $_;
        }
@@ -417,11 +416,11 @@ sub set_nntp_headers ($$$$$) {
        # leafnode (and maybe other NNTP clients) have trouble dealing
        # with v2 messages which have multiple Message-IDs (either due
        # to our own content-based dedupe or buggy git-send-email versions).
-       my @mids = $hdr->header('Message-ID');
+       my @mids = $hdr->header_raw('Message-ID');
        if (scalar(@mids) > 1) {
                my $mid0 = "<$mid>";
                $hdr->header_set('Message-ID', $mid0);
-               my @alt = $hdr->header('X-Alt-Message-ID');
+               my @alt = $hdr->header_raw('X-Alt-Message-ID');
                my %seen = map { $_ => 1 } (@alt, $mid0);
                push(@alt, grep { !$seen{$_}++ } @mids);
                $hdr->header_set('X-Alt-Message-ID', @alt);
@@ -479,10 +478,9 @@ found:
        my $smsg = $ng->over->get_art($n) or return $err;
        my $msg = $ng->msg_by_smsg($smsg) or return $err;
 
-       # Email::Simple->new will modify $msg in-place as documented
-       # in its manpage, so what's left is the body and we won't need
-       # to call Email::Simple::body(), later
-       my $hdr = Email::Simple->new($msg)->header_obj;
+       # PublicInbox::Eml->new will modify $msg in-place, so what's
+       # left is the body and we won't need to call ->body(), later
+       my $hdr = PublicInbox::Eml->new($msg)->header_obj;
        set_nntp_headers($self, $hdr, $ng, $n, $mid) if $set_headers;
        [ $n, $mid, $msg, $hdr ];
 }
@@ -506,13 +504,13 @@ sub set_art {
 sub msg_hdr_write ($$$) {
        my ($self, $hdr, $body_follows) = @_;
        $hdr = $hdr->as_string;
+       # fixup old bug from import (pre-a0c07cba0e5d8b6a)
+       $hdr =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
        utf8::encode($hdr);
        $hdr =~ s/(?<!\r)\n/\r\n/sg; # Alpine barfs without this
 
        # for leafnode compatibility, we need to ensure Message-ID headers
-       # are only a single line.  We can't subclass Email::Simple::Header
-       # and override _default_fold_at in here, either; since that won't
-       # affect messages already in the archive.
+       # are only a single line.
        $hdr =~ s/^(Message-ID:)[ \t]*\r\n[ \t]+([^\r]+)\r\n/$1 $2\r\n/igsm;
        $hdr .= "\r\n" if $body_follows;
        $self->msg_more($hdr);
@@ -901,7 +899,7 @@ sub cmd_starttls ($) {
 sub cmd_compress ($$) {
        my ($self, $alg) = @_;
        return '503 Only DEFLATE is supported' if uc($alg) ne 'DEFLATE';
-       return r502 if $self->compressed || !$have_deflate;
+       return r502 if $self->compressed;
        PublicInbox::NNTPdeflate->enable($self);
        $self->requeue;
        undef
@@ -988,10 +986,4 @@ sub busy {
        ($self->{rbuf} || $self->{wbuf} || $self->not_idle_long($now));
 }
 
-# this is an import to prevent "perl -c" from complaining about fields
-sub import {
-       $have_deflate = eval { require PublicInbox::NNTPdeflate } and
-               $CAPABILITIES .= "COMPRESS DEFLATE\r\n";
-}
-
 1;