Sisimai::Lhost::Exim now can decode a bounce mail generated by mail.ru #557

Author: azumakuniyuki

Diff for: lib/Sisimai/Lhost.pm

@@ -42,7 +42,7 @@ sub index {
     return [qw|
         Activehunter AmazonSES AmazonWorkMail ApacheJames Biglobe Courier Domino DragonFly EZweb
         EinsUndEins Exchange2003 Exchange2007 Exim FML GMX GoogleGroups GoogleWorkspace Gmail
-        IMailServer InterScanMSS KDDI MXLogic MailFoundry MailMarshalSMTP MailRu McAfee MessagingServer
+        IMailServer InterScanMSS KDDI MXLogic MailFoundry MailMarshalSMTP McAfee MessagingServer
         Notes Office365 OpenSMTPD Postfix Sendmail V5sendmail Verizon X1 X2 X3 X4 X6 Yahoo Zoho mFILTER qmail
     |];
 }

Diff for: lib/Sisimai/Lhost/Exim.pm

@@ -15,7 +15,6 @@ sub inquire {
     my $class = shift;
     my $mhead = shift // return undef;
     my $mbody = shift // return undef;
-    return undef if index($mhead->{'from'}, '.mail.ru') > 0;
 
     # Message-Id: <[email protected]>
     # X-Failed-Recipients: [email protected]

Diff for: lib/Sisimai/Lhost/MailRu.pm

@@ -50,7 +50,6 @@ sub make {
         'mail-delivery' => [
             'Sisimai::Lhost::Exim',
             'Sisimai::Lhost::DragonFly',
-            'Sisimai::Lhost::MailRu',
             'Sisimai::Lhost::GMX',
             'Sisimai::Lhost::EinsUndEins',
             'Sisimai::Lhost::Zoho',
@@ -112,7 +111,6 @@ sub another {
     # There are another patterns in the value of "Subject:" header of a bounce mail generated by the
     # following MTA modules
     state $orderE0 = [
-        'Sisimai::Lhost::MailRu',
         'Sisimai::Lhost::Exim',
         'Sisimai::Lhost::Sendmail',
         'Sisimai::Lhost::Office365',

Diff for: lib/Sisimai/Order.pm

@@ -26,10 +26,10 @@ my $moduletest = sub {
     my $lhostindex = Sisimai::Lhost->index; push @$lhostindex, 'ARF', 'RFC3464', 'RFC3834';
     my $isnotlhost = qr/\A(?:ARF|RFC3464|RFC3834)\z/;
     my $methodlist = ['DELIVERYSTATUS', 'INDICATORS', 'description', 'index', 'path'];
-    my $rfc3464use = [qw|
-        Aol Amavis Barracuda Bigfoot Facebook GSuite MessageLabs Outlook PowerMTA ReceivingSES
-        SendGrid SurfControl Yandex X5
-    |];
+    my $alternates = {
+        'RFC3464' => [qw|Aol Amavis Barracuda Bigfoot Facebook GSuite MessageLabs Outlook PowerMTA ReceivingSES SendGrid SurfControl Yandex X5|],
+        'Exim'    => [qw|MailRu|],
+    };
     my $skiptonext = {
         'public'  => ['lhost-postfix-49', 'lhost-postfix-50'],
         'private' => [
@@ -49,7 +49,7 @@ my $moduletest = sub {
         # ARF, RFC3464, ARF3834
         $M = sprintf("Sisimai::%s", $E);
 
-    } elsif( grep { $E eq $_ } @$rfc3464use ) {
+    } elsif( grep { $E eq $_ } $alternates->{'RFC3464'}->@* ) {
         # Removed Lhost moudles (Sisimai::RFC3464 can decode)
         $M = "Sisimai::RFC3464";
         my $c = [caller()]->[1];
@@ -413,10 +413,14 @@ my $moduletest = sub {
                             ok $cv =~ $cr, sprintf("%s %s", $ct, $cr);
                             is scalar @{ [grep { $cv eq $_ } @$lhostindex] }, 0, sprintf("%s %s", $ct, $cv);
 
-                        } elsif( grep { $E eq $_ } @$rfc3464use ) {
+                        } elsif( grep { $E eq $_ } $alternates->{'RFC3464'}->@* ) {
                             # Decoded by Sisimai::RFC3464 since v5.2.0
                             is $cv, 'RFC3464', sprintf("%s %s", $ct, $cr);
 
+                        } elsif( grep { $E eq $_ } $alternates->{'Exim'}->@* ) {
+                            # Decoded by Sisimai::Lhost::Exim since v5.2.0
+                            is $cv, 'Exim', sprintf("%s %s", $ct, $cr);
+
                         } elsif( $E eq 'ARF' ) {
                             # Parsed by Sisimai::ARF
                             is $cv, 'Feedback-Loop', sprintf("%s %s", $ct, $cr);

Diff for: t/600-lhost-code

@@ -18,7 +18,7 @@ my $isexpected = {
     '07' => [['5.0.910', '550', 'filtered',        0]],
     '08' => [['5.0.911', '550', 'userunknown',     1]],
     '09' => [['5.1.8',   '501', 'rejected',        0]],
-    '10' => [['5.0.947', '',    'expired',         0]],
+    '10' => [['4.0.947', '',    'expired',         0]],
 };
 
 $enginetest->($enginename, $isexpected);

Diff for: t/732-lhost-mailru.t

@@ -32,7 +32,6 @@ sub list {
             Lhost/KDDI.pm
             Lhost/MailFoundry.pm
             Lhost/MailMarshalSMTP.pm
-            Lhost/MailRu.pm
             Lhost/McAfee.pm
             Lhost/MessagingServer.pm
             Lhost/mFILTER.pm