sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/bite/email/x4.rb

@@ -7,23 +7,20 @@ module Sisimai::Bite::Email
       # MTA module for qmail clones
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject  => %r{\A(?:
-           failure[ ]notice
-          |Permanent[ ]Delivery[ ]Failure
-          )
-        }xi,
-        :received => %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        error:  ['Remote host said:'],
+        rfc822: ['--- Below this line is a copy of the message.', '--- Original message follows.'],
       }.freeze
-      #  qmail-remote.c:248|    if (code >= 500) {
-      #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
-      #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
-      #  qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
-      #
-      # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
-      #  K = success, Z = temporary error, D = permanent error
-      Re1 = {
-        :begin  => %r{\A(?>
+      MarkingsOf = {
+        #  qmail-remote.c:248|    if (code >= 500) {
+        #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
+        #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
+        #  qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
+        #
+        # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
+        #  K = success, Z = temporary error, D = permanent error
+        message: %r{\A(?>
            He/Her[ ]is[ ]not.+[ ]user
           |Hi[.][ ].+[ ]unable[ ]to[ ]deliver[ ]your[ ]message[ ]to[ ]
             the[ ]following[ ]addresses
@@ -40,29 +37,22 @@ module Sisimai::Bite::Email
             )
           |We're[ ]sorry[.]
           )
-        }ix,
-        :rfc822 => %r{\A(?:
-           ---[ ]Below[ ]this[ ]line[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message[.]
-          |---[ ]Original[ ]message[ ]follows[.]
-          )
-        }xi,
-        :error  => %r/\ARemote host said:/,
-        :sorry  => %r/\A[Ss]orry[,.][ ]/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+        }x,
       }.freeze
+
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        conn: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
+        conn: %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        ehlo: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
+        ehlo: %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        mail: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
+        mail: %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        rcpt: %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
+        rcpt: %r/(?:Error:)?.+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
@@ -106,26 +96,24 @@ module Sisimai::Bite::Email
           )
         }x,
       }.freeze
-      # userunknown + expired
-      ReOnHold  = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
-      # qmail-remote-fallback.patch
-      ReCommand = %r/Sorry,[ ]no[ ]SMTP[ ]connection[ ]got[ ]far[ ]enough;[ ]most[ ]progress[ ]was[ ]([A-Z]{4})[ ]/x
-      ReFailure = {
+
+      # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
+      ReDelaying = %r/this message has been in the queue too long[.]\z/
+      ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
+      ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4})[ ]/
+      ReFailures = {
         # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        userunknown: %r{(?:
-           no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
-          |[ ]does[ ]not[ ]like[ ]recipient[.]
-          )
-        }x,
+        userunknown: %r/(?:no mailbox here by that name | does not like recipient[.])/,
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        mailboxfull: %r/disk[ ]quota[ ]exceeded/x,
+        mailboxfull: %r/disk quota exceeded/,
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        mesgtoobig:  %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
+        mesgtoobig:  %r/Message size exceeds fixed maximum message size:/,
         # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
         # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        hostunknown: %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
+        hostunknown: %r/\ASorry, I couldn't find any host /,
+        systemfull:  %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
         systemerror: %r{(?>
            bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
           |system[ ]error
@@ -138,16 +126,11 @@ module Sisimai::Bite::Email
           |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]or[ ]A[ ]for[ ]that[ ]host
           )
         }x,
-        systemfull: %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
       }.freeze
-      # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-      ReDelayed  = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Unknown MTA #4'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Unknown MTA #4
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -168,9 +151,10 @@ module Sisimai::Bite::Email
         # by qmail, see http://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
         #         Subject: failure notice
+        tryto  = %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/
         match  = 0
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['subject'].start_with?('failure notice', 'Permanent Delivery Failure')
+        match += 1 if mhead['received'].find { |a| a =~ tryto }
         return nil if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -181,10 +165,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -192,7 +176,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -206,7 +190,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -232,8 +215,8 @@ module Sisimai::Bite::Email
               # Append error message
               next if e.empty?
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' '
-              v['alterrors']   = e if e =~ Re1[:error]
+              v['diagnosis'] << e + ' '
+              v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
 
               next if v['rhost']
               if cv = e.match(ReHost)
@@ -243,8 +226,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -260,7 +243,7 @@ module Sisimai::Bite::Email
 
             unless e['command']
               # Verify each regular expression of patches
-              if cv = e['diagnosis'].match(ReCommand)
+              if cv = e['diagnosis'].match(ReCommands)
                 e['command'] = cv[1].upcase
               end
               e['command'] ||= ''
@@ -272,28 +255,26 @@ module Sisimai::Bite::Email
             # MAIL | Connected to 192.0.2.135 but sender was rejected.
             e['reason'] = 'rejected'
 
-          elsif e['command'] =~ /\A(?:HELO|EHLO)\z/
+          elsif %w[HELO EHLO].index(e['command'])
             # HELO | Connected to 192.0.2.135 but my name was rejected.
             e['reason'] = 'blocked'
-
           else
             # Try to match with each error message in the table
-            if e['diagnosis'] =~ ReOnHold
+            if e['diagnosis'] =~ ReIsOnHold
               # To decide the reason require pattern match with
               # Sisimai::Reason::* modules
               e['reason'] = 'onhold'
-
             else
-              ReFailure.each_key do |r|
+              ReFailures.each_key do |r|
                 # Verify each regular expression of session errors
                 if e['alterrors']
                   # Check the value of "alterrors"
-                  next unless e['alterrors'] =~ ReFailure[r]
+                  next unless e['alterrors'] =~ ReFailures[r]
                   e['reason'] = r.to_s
                 end
                 break if e['reason']
 
-                next unless e['diagnosis'] =~ ReFailure[r]
+                next unless e['diagnosis'] =~ ReFailures[r]
                 e['reason'] = r.to_s
                 break
               end
@@ -308,7 +289,7 @@ module Sisimai::Bite::Email
               end
 
               unless e['reason']
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelayed
+                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
               end
             end
           end

data/lib/sisimai/bite/email/x5.rb

@@ -6,21 +6,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X5.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from => %r/\bTWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0\b/,
-        :to   => %r/\bNotificationRecipients\b/,
-      }.freeze
-      Re1 = {
-        :begin  => %r|\AContent-Type: message/delivery-status|,
-        :rfc822 => %r|\AContent-Type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Content-Type: message/delivery-status'],
+        rfc822:  ['Content-Type: message/rfc822'],
+      }.freeze
 
       def description; return 'Unknown MTA #5'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Unknown MTA #5
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -36,19 +30,17 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        match = 0
-
-        # To: "NotificationRecipients" <...>
-        match += 1 if mhead['to'] && mhead['to'] =~ Re0[:to]
-
         require 'sisimai/mime'
-        if mhead['from'] =~ Re0[:from]
+
+        match  = 0
+        match += 1 if mhead['to'].to_s.include?('NotificationRecipients')
+        if mhead['from'].include?('TWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0')
           # From: "=?iso-2022-jp?B?TWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0=?=" <...>
           #       Mail Delivery Subsystem
           mhead['from'].split(' ').each do |f|
             # Check each element of From: header
             next unless Sisimai::MIME.is_mimeencoded(f)
-            match += 1 if Sisimai::MIME.mimedecode([f]) =~ /Mail Delivery Subsystem/
+            match += 1 if Sisimai::MIME.mimedecode([f]).include?('Mail Delivery Subsystem')
             break
           end
         end
@@ -56,7 +48,7 @@ module Sisimai::Bite::Email
         if Sisimai::MIME.is_mimeencoded(mhead['subject'])
           # Subject: =?iso-2022-jp?B?UmV0dXJuZWQgbWFpbDogVXNlciB1bmtub3du?=
           plain = Sisimai::MIME.mimedecode([mhead['subject']])
-          match += 1 if plain =~ /Mail Delivery Subsystem/
+          match += 1 if plain.include?('Mail Delivery Subsystem')
         end
         return nil if match < 2
 
@@ -69,14 +61,14 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -84,7 +76,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -95,7 +87,7 @@ module Sisimai::Bite::Email
             next if e.empty?
             v = dscontents[-1]
 
-            if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+            if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
               # Final-Recipient: RFC822; kijitora@example.jp
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
@@ -105,44 +97,42 @@ module Sisimai::Bite::Email
               v['recipient'] = cv[1]
               recipients += 1
 
-            elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                       e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+            elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
+                       e.match(/\AOriginal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
               # X-Actual-Recipient: RFC822; kijitora@example.co.jp
               # Original-Recipient: rfc822;kijitora@example.co.jp
               v['alias'] = cv[1]
 
-            elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
               # Action: failed
               v['action'] = cv[1].downcase
 
-            elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+            elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
               # Status: 5.1.1
               v['status'] = cv[1]
 
-            elsif cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+            elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
               # Reporting-MTA: dns; mx.example.jp
               v['lhost'] = cv[1].downcase
 
-            elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+            elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
               # Remote-MTA: DNS; mx.example.jp
               v['rhost'] = cv[1].downcase
 
-            elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+            elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
               # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
               v['date'] = cv[1]
-
             else
               # Get an error message from Diagnostic-Code: field
-              if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = cv[1].downcase
                 v['diagnosis'] = cv[2]
 
-              elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] ||= ''
-                v['diagnosis']  += ' ' + cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' + e
+                v['diagnosis'] << ' ' << cv[1]
+                havepassed[-1] = 'Diagnostic-Code: ' << e
               end
             end
           else
@@ -156,12 +146,11 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']       = self.smtpagent
           e['diagnosis'] ||= Sisimai::String.sweep(e['diagnosis'])

data/lib/sisimai/bite/email/yahoo.rb

@@ -6,15 +6,11 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Yahoo.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject => %r/\AFailure Notice\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\ASorry, we were unable to deliver your message/,
-        :rfc822  => %r/\A--- Below this line is a copy of the message[.]\z/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Sorry, we were unable to deliver your message'],
+        rfc822:  ['--- Below this line is a copy of the message.'],
+      }.freeze
 
       def description; return 'Yahoo! MAIL: https://www.yahoo.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -24,7 +20,6 @@ module Sisimai::Bite::Email
       # X-YMail-OSG: bTIbpDEVM1lHz...
       # X-Originating-IP: [192.0.2.9]
       def headerlist;  return ['X-YMailISG']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Yahoo! MAIL
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -40,6 +35,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :subject => %r/\AFailure Notice\z/,
         return nil unless mhead['x-ymailisg']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -50,10 +47,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -61,7 +58,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -75,7 +72,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -96,7 +92,6 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               if e.start_with?('Remote host said:')
                 # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
@@ -106,13 +101,12 @@ module Sisimai::Bite::Email
                   # Get SMTP command from the value of "Remote host said:"
                   v['command'] = cv[1]
                 end
-
               else
                 # <mailboxfull@example.jp>:
                 # Remote host said:
                 # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
                 # [RCPT_TO]
-                if v['diagnosis'] =~ /\ARemote host said:\z/
+                if v['diagnosis'].start_with?('Remote host said:')
                   # Remote host said:
                   # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
                   if cv = e.match(/\[([A-Z]{4}).*\]\z/)
@@ -123,15 +117,13 @@ module Sisimai::Bite::Email
                     v['diagnosis'] = e
                   end
                 end
-
               end
-
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])