HTML: various encoding fixups

[public-inbox.git] / public-inbox-mda

diff --git a/public-inbox-mda b/public-inbox-mda
index 70fbdf27faded071df827f9af0bea765dcd798f3..2335cd3e068437321f58cfd83b396a8d8fa266ad 100755 (executable)
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -7,6 +7,8 @@ my $usage = 'public-inbox-mda < rfc2822_message';
 
 use Email::Filter;
 use Email::Address;
+use Encode qw/decode encode/;
+use Encode::MIME::Header;
 use File::Path::Expand qw/expand_filename/;
 use IPC::Run qw(run);
 use constant MDA => 'ssoma-mda';
@@ -41,7 +43,23 @@ if (PublicInbox->precheck($filter, $recipient) &&
        if (PublicInbox::Filter->run($simple)) {
                # run spamc again on the HTML-free message
                if (do_spamc($simple, \$filtered)) {
-                       $filter->simple(Email::Simple->new($filtered));
+                       $simple = Email::Simple->new($filtered);
+                       set_list_headers($simple, $dst);
+                       $filter->simple($simple);
+
+                       my $from = decode('MIME-Header', $filter->from);
+                       $from = encode("utf8", $from);
+                       my @from = Email::Address->parse($from);
+                       my $name = $from[0]->name;
+                       defined $name or $name = "";
+                       my $email = $from[0]->address;
+                       defined $email or $email = "";
+                       local $ENV{GIT_AUTHOR_NAME} = $name;
+                       local $ENV{GIT_AUTHOR_EMAIL} = $email;
+                       local $ENV{GIT_AUTHOR_DATE} = $simple->header("Date");
+                       local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
+                       local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
+
                        $filter->pipe(MDA, '-1', $main_repo);
                }
        }
@@ -60,3 +78,17 @@ sub do_spamc {
 
        return ($@ || $? || !defined($$out) || length($$out) == 0) ? 0 : 1;
 }
+
+# RFC2919 and RFC2369
+sub set_list_headers {
+       my ($simple, $dst) = @_;
+       my $pa = "<$dst->{-primary_address}>";
+       $simple->header_set("List-Id", $pa);
+       $simple->header_set("List-Post", $pa);
+
+       my $url = $dst->{url};
+       if (defined $url) {
+               $simple->header_set("List-Archive", "<$url>");
+               $simple->header_set("List-Help", "<${url}help>");
+       }
+}