sisimai 5.4.0 → 5.5.0

data/lib/sisimai/lhost/exchange2003.rb

@@ -74,14 +74,14 @@ module Sisimai::Lhost
             throw :EXCHANGE_OR_NOT if mhead['received'].empty?
             mhead['received'].each do |e|
               # Received: by ***.**.** with Internet Mail Service (5.5.2657.72)
-              next unless e.include?(' with Internet Mail Service (')
+              next if e.include?(' with Internet Mail Service (') == false
               match += 1
               throw :EXCHANGE_OR_NOT
             end
             break
           end
         end
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -160,26 +160,26 @@ module Sisimai::Lhost
             #
             if e.start_with?('  To: ') || e.start_with?('      To: ')
               #  To:      shironeko@example.jp
-              next unless connheader['to'].empty?
+              next if connheader['to'].empty? == false
               connheader['to'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
             elsif e.start_with?('      Subject: ') || e.start_with?('  Subject: ')
               #  Subject: ...
-              next unless connheader['subject'].empty?
+              next if connheader['subject'].empty? == false
               connheader['subject'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
             elsif e.start_with?('  Sent: ') || e.start_with?('      Sent: ')
               #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
               #  Sent:    4/29/99 9:19:59 AM
-              next unless connheader['date'].empty?
+              next if connheader['date'].empty? == false
               connheader['date'] = e[e.index(':') + 2, e.size]
               connvalues += 1
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e.delete('msexch')
@@ -193,7 +193,7 @@ module Sisimai::Lhost
 
             ErrorCodes.each_key do |r|
               # Find captured code from the error code table
-              next unless ErrorCodes[r].index(capturedcode)
+              next if ErrorCodes[r].index(capturedcode).nil?
               e['reason'] = r
               e['status'] = Sisimai::SMTP::Status.code(r)
               break

data/lib/sisimai/lhost/exchange2007.rb

@@ -26,7 +26,7 @@ module Sisimai::Lhost
         rhost:   [
           "DSN generated by:",
           "Generating server",        # en-US
-          "Serveur de g",             # fr-FR/Serveur de g�Hn�Hration
+          "Serveur de g",             # fr-FR/Serveur de gènèration
           "Server di generazione",    # it-CH
           "Genererande server",       # sv-SE
         ]
@@ -143,11 +143,11 @@ module Sisimai::Lhost
           p3 = emailparts[0].index("\n", p2 + 20);              break if p3.nil?
           cv = Sisimai::Address.s3s4(emailparts[0][p2 + 20, p3 - p2 - 20])
 
-          break unless Sisimai::Address.is_emailaddress(cv)
+          break if Sisimai::Address.is_emailaddress(cv) == false
           dscontents[0]["recipient"] = cv
           recipients += 1
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Tidy up the error message in $e->{'diagnosis'}, Try to detect the bounce reason.

data/lib/sisimai/lhost/exim.rb

@@ -190,7 +190,7 @@ module Sisimai::Lhost
             if StartingOf["message"].any? { |a| e.include?(a) }
               # Check the message defined in StartingOf["message"], ["frozen"]
               readcursor |= Indicators[:deliverystatus]
-              next unless StartingOf["frozen"].any? { |a| e.include?(a) }
+              next if StartingOf["frozen"].none? { |a| e.include?(a) }
             end
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
@@ -269,7 +269,7 @@ module Sisimai::Lhost
             #    generated by userx@myhost.test.ex
             e.split(" ").each do |f|
               # Find the alias address
-              next unless f.include?('@')
+              next if f.include?('@') == false
               v["alias"] = Sisimai::Address.s3s4(f)
             end
           else
@@ -289,7 +289,7 @@ module Sisimai::Lhost
                 if o[3] == "addr"
                   # Final-Recipient: rfc822; kijitora@example.jp
                   # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  next unless o[0] == "final-recipient"
+                  next if o[0] != "final-recipient"
                   if v["spec"].empty?
                     v["spec"] = o[2].include?('@') ? "SMTP" : "X-UNIX"
                   end
@@ -301,7 +301,7 @@ module Sisimai::Lhost
 
                 else
                   # Other DSN fields defined in RFC3464
-                  next unless FieldTable[o[0]]
+                  next if FieldTable[o[0]].nil?
                   v[FieldTable[o[0]]] = o[2]
                 end
               else
@@ -311,7 +311,7 @@ module Sisimai::Lhost
                 # Content-type: message/delivery-status
                 nextcursor = true if e.start_with?(StartingOf["deliverystatus"][0])
                 v["alterrors"] ||= ''
-                v["alterrors"]  += "#{e} " unless v["alterrors"].include?(e) if e.start_with?(" ")
+                v["alterrors"]  += "#{e} " if e.start_with?(" ")
               end
             else
               # There is no boundary string in $boundary00
@@ -322,7 +322,7 @@ module Sisimai::Lhost
                 # Error message when email address above does not include '@' and domain part
                 # pipe to |/path/to/prog ...
                 #   generated by kijitora@example.com
-                next unless e.start_with?("  ")
+                next if e.start_with?("  ") == false
                 v["diagnosis"] += "#{e} "
               end
             end
@@ -439,7 +439,7 @@ module Sisimai::Lhost
               # Try to match the error message with each message pattern 
               MessagesOf.each_key do |r|
                 # Check each message pattern
-                next unless MessagesOf[r].any? { |a| e["diagnosis"].include?(a) }
+                next if MessagesOf[r].none? { |a| e["diagnosis"].include?(a) }
                 e["reason"] = r
                 break
               end

data/lib/sisimai/lhost/ezweb.rb

@@ -116,7 +116,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Check each value of DeliveryMatter{}, try to detect the bounce reason.
@@ -127,6 +127,7 @@ module Sisimai::Lhost
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # Filtered recipient returns message that include 'X-SPASIGN' header
             e['reason'] = 'filtered'
+            e['toxic']  = true
           else
             # There is no X-SPASIGN header or the value of the header is not "NG"
             catch :FINDREASON do
@@ -134,7 +135,7 @@ module Sisimai::Lhost
                 # Try to match with each session error message
                 Messagesof[r].each do |f|
                   # Check each error message pattern
-                  next unless e['diagnosis'].include?(f)
+                  next if e['diagnosis'].include?(f) == false
                   e['reason'] = r
                   throw :FINDREASON
                 end

data/lib/sisimai/lhost/fml.rb

@@ -30,12 +30,12 @@ module Sisimai::Lhost
           'reject spammers:',
           'You are not a member of this mailing list',
         ],
+        'notcompliantrfc' => ['Duplicated Message-ID'],
+        'securityerror' => ['Security alert:'],
         'systemerror' => [
           ' has detected a loop condition so that',
-          'Duplicated Message-ID',
           'Loop Back Warning:',
         ],
-        'securityerror' => ['Security alert:'],
       }.freeze
 
       # @abstract Decodes the bounce message from fml mailling list server/manager
@@ -45,9 +45,9 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.22.3
       def inquire(mhead, mbody)
-        return nil unless mhead['x-mlserver']
-        return nil unless mhead['from'].include?('-admin@')
-        return nil unless mhead['message-id'].index('.FML') > 1
+        return nil if mhead['x-mlserver'].nil?
+        return nil if mhead['from'].include?('-admin@') == false
+        return nil if mhead['message-id'].index('.FML') < 2
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -81,22 +81,22 @@ module Sisimai::Lhost
             v['diagnosis'] += e
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           ErrorTable.each_key do |f|
             # Try to match with error messages defined in ErrorTable
-            next unless ErrorTable[f].any? { |a| e['diagnosis'].include?(a) }
+            next if ErrorTable[f].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = f
             break
           end
 
-          unless e['reason']
+          if e['reason'].nil?
             # Error messages in the message body did not matched
             ErrorTitle.each_key do |f|
               # Try to match with the Subject string
-              next unless ErrorTitle[f].any? { |a| mhead["subject"].include?(a) }
+              next if ErrorTitle[f].none? { |a| mhead["subject"].include?(a) }
               e['reason'] = f
               break
             end

data/lib/sisimai/lhost/gmail.rb

@@ -52,7 +52,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support SMTP Authenticated Relay (state 12).
-        '12' => { 'command' => 'AUTH', 'reason' => 'relayingdenied' },
+        '12' => { 'command' => 'AUTH', 'reason' => 'norelaying' },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
@@ -148,8 +148,8 @@ module Sisimai::Lhost
         #   The error that the other server returned was:
         #   550 5.1.1 <userunknown@example.jp>... User Unknown
         #
-        return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
-        return nil unless mhead['subject'].start_with?('Delivery Status Notification')
+        return nil if mhead['from'].end_with?('<mailer-daemon@googlemail.com>') == false
+        return nil if mhead['subject'].start_with?('Delivery Status Notification') == false
 
         require 'sisimai/address'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
@@ -193,14 +193,14 @@ module Sisimai::Lhost
             end
 
             r = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
-            next unless Sisimai::Address.is_emailaddress(r)
+            next if Sisimai::Address.is_emailaddress(r) == false
             v['recipient'] = r
             recipients += 1
           else
             v["diagnosis"] += "#{e }"
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         require 'sisimai/string'
         require 'sisimai/rfc1123'
@@ -222,12 +222,12 @@ module Sisimai::Lhost
 
           while true do
             # Find "(state 18)" and pick "18" as a key of statetable
-            p1 = e['diagnosis'].rindex(' (state ');   break unless p1
-            p2 = e['diagnosis'].rindex(')');          break unless p2
+            p1 = e['diagnosis'].rindex(' (state ');   break if p1.nil?
+            p2 = e['diagnosis'].rindex(')');          break if p2.nil?
                                                       break if p1 > p2
             cu = e['diagnosis'][p1 + 8, p2 - p1 - 8]
             break if cu.empty?
-            break unless StateTable[cu]
+            break if StateTable[cu].nil?
             e['reason']  = StateTable[cu]['reason']
             e['command'] = StateTable[cu]['command']
             break
@@ -237,7 +237,7 @@ module Sisimai::Lhost
             # There is no no state code in the error message
             MessagesOf.each_key do |r|
               # Verify each regular expression of session errors
-              next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+              next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
               e['reason'] = r
               break
             end

data/lib/sisimai/lhost/gmx.rb

@@ -20,7 +20,7 @@ module Sisimai::Lhost
         # X-GMX-Antispam: 0 (Mail was not recognized as spam); Detail=V3;
         # X-GMX-Antivirus: 0 (no virus found)
         # X-UI-Out-Filterresults: unknown:0;
-        return nil unless mhead['x-gmx-antispam']
+        return nil if mhead['x-gmx-antispam'].nil?
 
         require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
@@ -79,14 +79,14 @@ module Sisimai::Lhost
             v['diagnosis'] += "#{e }"
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/googlegroups.rb

@@ -13,11 +13,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.25.6
       def inquire(mhead, mbody)
-        return nil unless mbody.include?("Google Groups")
-        return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
-        return nil unless mhead['subject'].start_with?('Delivery Status Notification')
-        return nil unless mhead['x-failed-recipients']
-        return nil unless mhead['x-google-smtp-source']
+        return nil if mbody.include?("Google Groups") == false
+        return nil if mhead['from'].end_with?('<mailer-daemon@googlemail.com>') == false
+        return nil if mhead['subject'].start_with?('Delivery Status Notification') == false
+        return nil if mhead['x-failed-recipients'].nil? || mhead['x-google-smtp-source'].nil?
 
         # Hello kijitora@libsisimai.org,
         #
@@ -55,7 +54,7 @@ module Sisimai::Lhost
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...
-          next unless Sisimai::Address.is_emailaddress(e)
+          next if Sisimai::Address.is_emailaddress(e) == false
 
           if v["recipient"] != ""
             # There are multiple recipient addresses in the message body.
@@ -66,7 +65,7 @@ module Sisimai::Lhost
           recipients += 1
           recordwide.each_key { |r| v[r] = recordwide[r] }
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Google Groups: https://groups.google.com'; end

data/lib/sisimai/lhost/googleworkspace.rb

@@ -26,10 +26,9 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @see https://workspace.google.com/.
       def inquire(mhead, mbody)
-        return nil if     mbody.include?("\nDiagnostic-Code:")
-        return nil if     mbody.include?("\nFinal-Recipient:")
-        return nil unless mhead["from"].include?('<mailer-daemon@googlemail.com>')
-        return nil unless mhead["subject"].include?("Delivery Status Notification")
+        return nil if mbody.include?("\nDiagnostic-Code:") || mbody.include?("\nFinal-Recipient:")
+        return nil if mhead["from"].include?('<mailer-daemon@googlemail.com>') == false
+        return nil if mhead["subject"].include?("Delivery Status Notification") == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -64,7 +63,7 @@ module Sisimai::Lhost
         while recipients == 0 do
           # Pick the recipient address from the value of To: header of the original message after
           # Content-Type: message/rfc822 field
-          p0 = emailparts[1].index("\nTo:"); break unless p0
+          p0 = emailparts[1].index("\nTo:"); break if p0.nil?
           p1 = emailparts[1].index("\n", p0 + 2)
           cv = Sisimai::Address.s3s4(emailparts[1][p0 + 4, p1 - p0])
           dscontents[0]["recipient"] = cv
@@ -78,7 +77,7 @@ module Sisimai::Lhost
           e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           MessagesOf.each_key do |r|
             # Guess an reason of the bounce
-            next unless MessagesOf[r].any? { |a| e["diagnosis"].include?(a) }
+            next if MessagesOf[r].none? { |a| e["diagnosis"].include?(a) }
             e["reason"] = r
             break
           end

data/lib/sisimai/lhost/imailserver.rb

@@ -27,7 +27,7 @@ module Sisimai::Lhost
         match  = 0
         match += 1 if mhead['subject'].start_with?('Undeliverable Mail ')
         match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -61,11 +61,11 @@ module Sisimai::Lhost
             v['alterrors']  = e if e.include?(StartingOf[:error][0])
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
-          unless e['alterrors'].to_s.empty?
+          if e['alterrors'].nil? == false && e['alterrors'].empty? == false
             # Copy alternative error message
             e['diagnosis'] = if e['diagnosis']
                                "#{e['alterrors']} #{e['diagnosis']}"
@@ -80,7 +80,7 @@ module Sisimai::Lhost
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/kddi.rb

@@ -26,7 +26,7 @@ module Sisimai::Lhost
         match += 1 if mhead['reply-to'].to_s == 'no-reply@app.auone-net.jp'
         match += 1 if mhead['received'].any? { |a| a.include?('ezweb.ne.jp (') }
         match += 1 if mhead['received'].any? { |a| a.include?('.au.com (') }
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -55,7 +55,7 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
             r = Sisimai::Address.s3s4(e[e.index('<') + 1, e.size])
-            next unless Sisimai::Address.is_emailaddress(r)
+            next if Sisimai::Address.is_emailaddress(r) == false
             v['recipient'] = r
             recipients += 1
 
@@ -67,7 +67,7 @@ module Sisimai::Lhost
             v['diagnosis'] += "#{e} " if e.start_with?(' ')
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
@@ -86,7 +86,7 @@ module Sisimai::Lhost
               # SMTP command is not RCPT
               MessagesOf.each_key do |r|
                 # Verify each regular expression of session errors
-                next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+                next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r
                 break
               end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -18,8 +18,8 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'] == 'Message delivery has failed'
-        return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
+        return nil if mhead['subject'] != 'Message delivery has failed'
+        return nil if mhead['received'].none? { |a| a.include?('(MAILFOUNDRY) id ') }
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -64,7 +64,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/{mailmarshalsmtp.rb → mailmarshal.rb}

@@ -1,8 +1,8 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailMarshalSMTP decodes a bounce email which created by Trustwave Secure Email
+  # Sisimai::Lhost::MailMarshal decodes a bounce email which created by Trustwave Secure Email
   # Gateway: formerly MailMarshal SMTP https://www.trustwave.com/en-us/services/email-security/.
   # Methods in the module are called from only Sisimai::Message.
-  module MailMarshalSMTP
+  module MailMarshal
     class << self
       require 'sisimai/lhost'
 
@@ -14,13 +14,13 @@ module Sisimai::Lhost
         rcpts:   ['The following recipients were affected:'],
       }.freeze
 
-      # @abstract Decodes the bounce message from Trustwave Secure Email Gateway (Formerly MailMarshalSMTP)
+      # @abstract Decodes the bounce message from Trustwave Secure Email Gateway (Formerly MailMarshal)
       # @param  [Hash] mhead    Message headers of a bounce email
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Undeliverable Mail: "')
+        return nil if mhead['subject'].start_with?('Undeliverable Mail: "') == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -109,7 +109,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/messagingserver.rb

@@ -20,7 +20,7 @@ module Sisimai::Lhost
         match  = 0
         match += 1 if mhead['content-type'].include?('Boundary_(ID_')
         match += 1 if mhead['subject'].start_with?('Delivery Notification: ')
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -63,7 +63,7 @@ module Sisimai::Lhost
             #   Recipient address: @smtp.example.net:kijitora@server
             #   Original address: kijitora@example.jp
             cv = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
-            next unless Sisimai::Address.is_emailaddress(cv)
+            next if Sisimai::Address.is_emailaddress(cv) == false
 
             if v["recipient"] != "" && cv != v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -99,9 +99,9 @@ module Sisimai::Lhost
 
             # The value does not include ".", use IP address instead.
             # (TCP|17.111.174.67|47323|192.0.2.225|25)
-            next unless sessionlog[0] == '(TCP'
+            next if sessionlog[0] != '(TCP'
             v['lhost'] = sessionlog[1]
-            v['rhost'] = sessionlog[3] unless remotehost.index('.') > 1
+            v['rhost'] = sessionlog[3] if remotehost.index('.') < 2
           else
             # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
             # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
@@ -118,7 +118,7 @@ module Sisimai::Lhost
             if e.start_with?('Status: ')
               # Status: 5.1.1 (Remote SMTP server has rejected address)
               p1 = e.index(':')
-              p2 = e.index('(')
+              p2 = e.index('('); next if p2.nil?
               v['status']    = e[p1 + 2, p2 - p1 - 3]
               v['diagnosis'] = e[p2 + 1, e[e.index(')') - p2 - 1]] if v["diagnosis"].empty?
 
@@ -130,17 +130,17 @@ module Sisimai::Lhost
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
               localhost = e[e.index(';') + 1, e.size]
               v['lhost'] = localhost if v["lhost"].empty?
-              v['lhost'] = localhost unless v['lhost'].index('.') > 0
+              v['lhost'] = localhost if v['lhost'].index('.') < 1
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/mfilter.rb

@@ -19,8 +19,12 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # X-Mailer: m-FILTER
-        return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
-        return nil unless mhead['subject'] == 'failure notice'
+        proceedsto = false
+        proceedsto = true if mhead['x-mailer'].to_s == 'm-FILTER'
+        proceedsto = true if Boundaries.any? { |a| mbody.include?(a) }
+        proceedsto = true if StartingOf[:error].any?   { |a| mbody.include?(a) }
+        proceedsto = true if StartingOf[:command].any? { |a| mbody.include?(a) }
+        return nil if proceedsto == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -91,7 +95,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -105,7 +109,7 @@ module Sisimai::Lhost
           e['lhost'] = Sisimai::RFC5322.received(rheads[0]).shift if e["lhost"].empty?
           [rhosts[0], rhosts[1]].each do |ee|
             # Avoid "... by m-FILTER"
-            next unless ee.include?('.')
+            next if ee.include?('.') == false
             e['rhost'] = ee
           end
         end