sisimai 4.25.16 → 5.0.0

data/lib/sisimai/reason/suspend.rb

@@ -1,21 +1,20 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Suspend checks the bounce reason is C<suspend> or not.
-    # This class is called only Sisimai::Reason class.
-    #
-    # This is the error that a recipient account is being suspended due to
-    # unpaid or other reasons.
+    # Sisimai::Reason::Suspend checks the bounce reason is "suspend" or not. This class is called
+    # only Sisimai::Reason class.  This is the error that a recipient account is being suspended
+    # due to unpaid or other reasons.
     module Suspend
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Suspend.pm
       class << self
         Index = [
           ' is currently suspended',
           ' temporary locked',
+          'archived recipient',
           'boite du destinataire archivee',
           'email account that you tried to reach is disabled',
           'has been suspended',
           'invalid/inactive user',
           'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
+          'is unavailable: user is terminated',
           'mailbox currently suspended',
           'mailbox is frozen',
           'mailbox unavailable or access denied',
@@ -25,7 +24,7 @@ module Sisimai
           'this mailbox is disabled',
           'user suspended',   # http://mail.163.com/help/help_spam_16.htm
           'vdelivermail: account is locked email bounced',
-        ]
+        ].freeze
 
         def text; return 'suspend'; end
         def description; return 'Email rejected due to a recipient account is being suspended'; end
@@ -41,14 +40,15 @@ module Sisimai
         end
 
         # The envelope recipient's mailbox is suspended or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is mailbox suspended
         #                                   false: is not suspended
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs.deliverystatus.empty?
-          return true if argvs.reason == 'suspend'
-          return true if match(argvs.diagnosticcode.downcase)
+          return nil  if argvs['deliverystatus'].empty?
+          return true if argvs['reason'] == 'suspend'
+          return true if argvs['replycode'].to_i == 525
+          return true if match(argvs['diagnosticcode'].downcase)
           return false
         end
 

data/lib/sisimai/reason/syntaxerror.rb

@@ -1,33 +1,34 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SyntaxError checks the bounce reason is "syntaxerror" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::SyntaxError checks the bounce reason is "syntaxerror" or not. This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that a destination mail server could not recognize SMTP
-    # command which is sent from a sender's MTA. Sisimai will set "syntaxerror"
-    # to the reason if the value of "replycode" begins with "50" such as 502,
-    # or 503.
+    # This is the error that a destination mail server could not recognize SMTP command which is
+    # sent from a sender's MTA. Sisimai will set "syntaxerror" to the reason if the value of
+    # "replycode" begins with "50" such as 502, or 503.
     #   Action: failed
     #   Status: 5.5.0
     #   Diagnostic-Code: SMTP; 503 Improper sequence of commands
     #
     module SyntaxError
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/SyntaxError.pm
       class << self
         def text; return 'syntaxerror'; end
         def description; return 'Email rejected due to syntax error at sent commands in SMTP session'; end
         def match(*); return nil; end
 
         # Connection rejected due to syntax error or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: Connection rejected due to
         #                                         syntax error
         #                                   false: is not syntax error
         # @since 4.1.25
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs.reason == 'syntaxerror'
-          return true if argvs.replycode =~ /\A[45]0[0-7]\z/
+          return true if argvs['reason'] == 'syntaxerror'
+
+          reply = argvs['replycode'].to_i
+          return true if reply > 400 && reply < 408
+          return true if reply > 500 && reply < 508
           return false
         end
 

data/lib/sisimai/reason/systemerror.rb

@@ -1,16 +1,13 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SystemError checks the bounce reason is "systemerror" or
-    # not. This class is called only Sisimai::Reason class.
-    #
-    # This is the error that an email has bounced due to system error on the
-    # remote host such as LDAP connection failure or other internal system error.
+    # Sisimai::Reason::SystemError checks the bounce reason is "systemerror" or not. This class is
+    # called only Sisimai::Reason class. This is the error that an email has bounced due to system
+    # error on the remote host such as LDAP connection failure or other internal system error.
     #
     #   <kijitora@example.net>:
     #   Unable to contact LDAP server. (#4.4.3)I'm not going to try again; this
     #   message has been in the queue too long.
     module SystemError
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemError.pm
       class << self
         Index = [
           'aliasing/forwarding loop broken',
@@ -27,14 +24,15 @@ module Sisimai
           'loops back to myself',
           'mail system configuration error',
           'queue file write error',
+          'recipient deferred because there is no mdb',
           'remote server is misconfigured',
           'server configuration error',
           'service currently unavailable',
           'system config error',
           'temporary local problem',
           'timeout waiting for input',
-          'transaction failed',
-        ]
+          'transaction failed ',
+        ].freeze
 
         def text; return 'systemerror'; end
         def description; return 'Email returned due to system error on the remote host'; end
@@ -50,7 +48,7 @@ module Sisimai
         end
 
         # The bounce reason is system error or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is system error
         #                                   false: is not system error
         # @see http://www.ietf.org/rfc/rfc2822.txt

data/lib/sisimai/reason/systemfull.rb

@@ -1,18 +1,17 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SystemFull checks the bounce reason is "systemfull" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::SystemFull checks the bounce reason is "systemfull" or not. This class is called
+    # only Sisimai::Reason class.
     #
-    # This is the error that a destination mail server's disk (or spool) is full.
-    # Sisimai will set C<systemfull> to the reason of email bounce if the value
-    # of Status: field in a bounce email is "4.3.1" or "5.3.1".
+    # This is the error that a destination mail server's disk (or spool) is full. Sisimai will set
+    # systemfull to the reason of email bounce if the value of Status: field in a bounce email is
+    # "4.3.1" or "5.3.1".
     module SystemFull
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemFull.pm
       class << self
         Index = [
           'mail system full',
           'requested mail action aborted: exceeded storage allocation',   # MS Exchange
-        ]
+        ].freeze
 
         def text; return 'systemfull'; end
         def description; return "Email rejected due to a destination mail server's disk is full"; end
@@ -28,7 +27,7 @@ module Sisimai
         end
 
         # The bounce reason is system full or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is system full
         #                                   false: is not system full
         # @see http://www.ietf.org/rfc/rfc2822.txt

data/lib/sisimai/reason/toomanyconn.rb

@@ -1,16 +1,14 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::TooManyConn checks the bounce reason is "toomanyconn" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::TooManyConn checks the bounce reason is "toomanyconn" or not. This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that SMTP connection was rejected temporarily due to too
-    # many concurrency connections to the remote server. This reason has added
-    # in Sisimai 4.1.26 and does not exist in any version of bounceHammer.
+    # This is the error that SMTP connection was rejected temporarily due to too many concurrency
+    # connections to the remote server. This reason has added in Sisimai 4.1.26.
     #
     #   <kijitora@example.ne.jp>: host mx02.example.ne.jp[192.0.1.20] said:
     #     452 4.3.2 Connection rate limit exceeded. (in reply to MAIL FROM command)
     module TooManyConn
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/TooManyConn.pm
       class << self
         Index = [
           'all available ips are at maximum connection limit',    # SendGrid
@@ -27,7 +25,7 @@ module Sisimai
           'too many smtp sessions for this host', # Sendmail(daemon.c)
           'trop de connexions, ',
           'we have already made numerous attempts to deliver this message',
-        ]
+        ].freeze
 
         def text; return 'toomanyconn'; end
         def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
@@ -43,14 +41,14 @@ module Sisimai
         end
 
         # Rejected by domain or address filter ?
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is filtered
         #                                   false: is not filtered
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs.reason == 'toomanyconn'
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'toomanyconn'
-          return true if match(argvs.diagnosticcode.downcase)
+          return true if argvs['reason'] == 'toomanyconn'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'toomanyconn'
+          return true if match(argvs['diagnosticcode'].downcase)
           return false
         end
 

data/lib/sisimai/reason/undefined.rb

@@ -1,9 +1,8 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Undefined is for only returning text and description.
-    # This class is called only from Sisimai.reason method.
+    # Sisimai::Reason::Undefined is for only returning text and description. This class is called only
+    # from Sisimai.reason method.
     module Undefined
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Undefined.pm
       class << self
         def text; return 'undefined'; end
         def description; return 'Sisimai could not detect an error reason'; end

data/lib/sisimai/reason/userunknown.rb

@@ -1,21 +1,21 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::UserUnknown checks the bounce reason is "userunknown" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::UserUnknown checks the bounce reason is "userunknown" or not. This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that a local part (Left hand side of @ sign) of a recipient's
-    # email address does not exist. In many case, a user has changed internet service
-    # provider, or has quit company, or the local part is misspelled. Sisimai will
-    # set "userunknown" to the reason of email bounce if the value of Status: field
-    # in a bounce email is "5.1.1", or connection was refused at SMTP RCPT command,
-    # or the contents of Diagnostic-Code: field represents that it is unknown user.
+    # This is the error that a local part (Left hand side of @ sign) of a recipient's email address
+    # does not exist. In many case, a user has changed internet service provider, or has quit company,
+    # or the local part is misspelled. Sisimai will set "userunknown" to the reason of email bounce
+    # if the value of Status: field in a bounce email is "5.1.1", or connection was refused at SMTP
+    # RCPT command, or the contents of Diagnostic-Code: field represents that it is unknown user.
     #
     #   <kijitora@example.co.jp>: host mx01.example.co.jp[192.0.2.8] said:
     #   550 5.1.1 Address rejected kijitora@example.co.jp (in reply to
     #   RCPT TO command)
     module UserUnknown
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
+        require 'sisimai/string'
+
         PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected NotAccept]
         ModulePath = {
           'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
@@ -25,135 +25,117 @@ module Sisimai
           'Sisimai::Reason::Rejected'    => 'sisimai/reason/rejected',
           'Sisimai::Reason::NotAccept'   => 'sisimai/reason/notaccept',
         }
-        Regex = %r{(?>
-           [#]5[.]1[.]1[ ]bad[ ]address
-          |[<][^ ]+[>][ ]not[ ]found
-          |[<][^ ]+[@][^ ]+[>][.][.][.][ ]blocked[ ]by[ ]
-          |550[ ]address[ ]invalid
-          |5[.]0[.]0[.][ ]mail[ ]rejected[.]
-          |5[.]1[.]0[ ]address[ ]rejected[.]
-          |account[ ][^ ]+[ ]does[ ]not[ ]exist[ ]at[ ]the[ ]organization
-          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide[.][ ]invalid[ ]recipient[.][0-9a-z_]+41[68]
-          |address[ ](?:does[ ]not[ ]exist|unknown)
-          |address[ ](?:does[ ]not[ ]exist|not[ ]present[ ]in[ ]directory|unknown)
-          |archived[ ]recipient
-          |bad[-_ ]recipient
-          |can[']t[ ]accept[ ]user
-          |does[ ]not[ ]exist[.]
-          |destination[ ](?:
-             addresses[ ]were[ ]unknown
-            |server[ ]rejected[ ]recipients
-            )
-          |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
-          |invalid[ ](?:
-             address
-            |mailbox:?
-            |mailbox[ ]path
-            |recipient
-            )
-          |is[ ]not[ ](?:
-             a[ ]known[ ]user
-            |a[ ]valid[ ]mailbox
-            |an[ ]active[ ]address[ ]at[ ]this[ ]host
-            )
-          |mailbox[ ](?:
-             [^ ]+[ ]does[ ]not[ ]exist
-            |[^ ]+[@][^ ]+[ ]unavailable
-            |does[ ]not[ ]exist
-            |invalid
-            |is[ ](?:inactive|unavailable)
-            |not[ ](?:present|found)
-            |unavailable
-            )
-          |nessun[ ]utente[ ]simile[ ]in[ ]questo[ ]indirizzo
-          |no[ ](?:
-             [ ][^ ]+[ ]in[ ]name[ ]directory
-            |account[ ]by[ ]that[ ]name[ ]here
-            |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
-            |mail[ ]box[ ]available[ ]for[ ]this[ ]user
-            |mailbox[ ](?:
-               by[ ]that[ ]name[ ]is[ ]currently[ ]available
-              |found
-              )
-            |matches[ ]to[ ]nameserver[ ]query
-            |such[ ](?:
-               address[ ]here
-              |mailbox
-              |person[ ]at[ ]this[ ]address
-              |recipient
-              |user(?:[ ]here)?
-              )
-            |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-            |valid[ ]recipients,[ ]bye
-            )
-          |non[- ]?existent[ ]user
-          |not[ ](?:
-             a[ ]valid[ ](?:recipient|user[ ]here)
-            |a[ ]local[ ]address
-            |email[ ]addresses
-            )
-          |rcpt[ ][<][^ ]+[>][ ]does[ ]not[ ]exist
-          |recipient[ ]address[ ]rejected[.][ ][(]in[ ]reply[ ]to[ ]rcpt[ ]to[ ]command[)]
-          |recipient[ ](?:
-             [^ ]+[ ]was[ ]not[ ]found[ ]in
-            |address[ ]rejected:[ ](?:
-               access[ ]denied
-              |invalid[ ]user
-              |invalid-recipient
-              |user[ ][^ ]+[ ]does[ ]not[ ]exist
-              |user[ ]unknown[ ]in[ ][^ ]+[ ]table
-              |unknown[ ]user
-              )
-            |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
-            |is[ ]not[ ]local
-            |not[ ](?:exist|found|ok)
-            |refuses[ ]to[ ]accept[ ]your[ ]mail
-            |unknown
-            )
-          |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-          |resolver[.]adr[.]recipient notfound
-          |said:[ ]550[-[ ]]5[.]1[.]1[ ][^ ]+[ ]user[ ]unknown[ ]
-          |sorry,[ ](?:
-             user[ ]unknown
-            |badrcptto
-            |no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
-            |your[ ]envelope[ ]recipient[ ]has[ ]been[ ]denied
-            )
-          |that[ ]domain[ ]or[ ]user[ ]isn't[ ]in[ ]my[ ]list[ ]of[ ]allowed[ ]rcpthosts
-          |the[ ](?:
-             email[ ]account[ ]that[ ]you[ ]tried[ ]to[ ]reach[ ]does[ ]not[ ]exist
-            |following[ ]recipients[ ]was[ ]undeliverable
-            |user[']s[ ]email[ ]name[ ]is[ ]not[ ]found
-            )
-          |there[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
-          |this[ ](?:
-             address[ ]no[ ]longer[ ]accepts[ ]mail
-            |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
-            |recipient[ ]is[ ]in[ ]my[ ]badrecipientto[ ]list
-            |recipient[ ]is[ ]not[ ]in[ ]my[ ]validrcptto[ ]list
-            |spectator[ ]does[ ]not[ ]exist
-            |user[ ]doesn[']?t[ ]have[ ]a[ ][^ ]+[ ]account
-            )
-          |unknown[ ](?:
-             e[-]?mail[ ]address
-            |local[- ]part
-            |mailbox
-            |recipient
-            |user
-            )
-          |user[ ](?:
-             [^ ]+[ ]was[ ]not[ ]found
-            |[^ ]+[ ]does[ ]not[ ]exist
-            |does[ ]not[ ]exist
-            |missing[ ]home[ ]directory
-            |not[ ](?:active|exist|found|known)
-            |unknown
-            )
-          |utilisateur[ ]inconnu[ ]!
-          |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
-          |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
-          )
-        }x
+        Index = [
+          '#5.1.1 bad address',
+          '550 address invalid',
+          '5.1.0 address rejected.',
+          'address does not exist',
+          'address not present in directory',
+          'address unknown',
+          "can't accept user",
+          'does not exist.',
+          'destination addresses were unknown',
+          'destination server rejected recipients',
+          'email address does not exist',
+          'email address could not be found',
+          'invalid address',
+          'invalid mailbox',
+          'invalid mailbox path',
+          'invalid recipient',
+          'is not a known user',
+          'is not a valid mailbox',
+          'is not an active address at this host',
+          'mailbox does not exist',
+          'mailbox invalid',
+          'mailbox is inactive',
+          'mailbox is unavailable',
+          'mailbox not present',
+          'mailbox not found',
+          'mailbox unavaiable',
+          'nessun utente simile in questo indirizzo',
+          'no account by that name here',
+          'no existe dicha persona',
+          'no existe ese usuario ',
+          'no mail box available for this user',
+          'no mailbox by that name is currently available',
+          'no mailbox found',
+          'no such address here',
+          'no such mailbox',
+          'no such person at this address',
+          'no such recipient',
+
+          'no such user',
+          'no thank you rejected: account unavailable',
+          'no valid recipients, bye',
+          'not a valid recipient',
+          'not a valid user here',
+          'not a local address',
+          'not email addresses',
+          'recipient address rejected. (in reply to rcpt to command)',
+          'recipient address rejected: access denied',
+          'recipient address rejected: invalid user',
+          'recipient address rejected: invalid-recipient',
+          'recipient address rejected: unknown user',
+          'recipient does not exist',
+          'recipient is not local',
+          'recipient not exist',
+          'recipient not found',
+          'recipient not ok',
+          'recipient refuses to accept your mail',
+          'recipient unknown',
+          'requested action not taken: mailbox unavailable',
+          'resolver.adr.recipient notfound',
+          'sorry, user unknown',
+          'sorry, badrcptto',
+          'sorry, no mailbox here by that name',
+          'sorry, your envelope recipient has been denied',
+          "that domain or user isn't in my list of allowed rcpthosts",
+          'the email account that you tried to reach does not exist',
+          'the following recipients was undeliverable',
+          "the user's email name is not found",
+          'there is no one at this address',
+          'this address no longer accepts mail',
+          'this email address is wrong or no longer valid',
+          'this recipient is in my badrecipientto list',
+          'this recipient is not in my validrcptto list',
+          'this spectator does not exist',
+          'unknown mailbox',
+          'unknown recipient',
+          'unknown user',
+          'user does not exist',
+          'user missing home directory',
+          'user not active',
+          'user not exist',
+          'user not found',
+          'user not known',
+          'user unknown',
+          'utilisateur inconnu !',
+          'vdeliver: invalid or unknown virtual user',
+          'your envelope recipient is in my badrcptto list',
+        ].freeze
+        Pairs = [
+          ['<', '> not found'],
+          ['<', '>... blocked by '],
+          ['account ', ' does not exist at the organization'],
+          ['adresse d au moins un destinataire invalide. invalid recipient.', '416'],
+          ['adresse d au moins un destinataire invalide. invalid recipient.', '418'],
+          ['bad', 'recipient'],
+          ['mailbox ', 'does not exist'],
+          ['mailbox ', 'unavailable or access denied'],
+          ['no ', ' in name directory'],
+          ['non', 'existent user'],
+          ['rcpt <', ' does not exist'],
+          ['recipient ', ' was not found in'],
+          ['recipient address rejected: user ', '  does not exist'],
+          ['recipient address rejected: user unknown in ', '  table'],
+          ['said: 550-5.1.1 ', ' user unknown '],
+          ['said: 550 5.1.1 ', ' user unknown '],
+          ["this user doesn't have a ", " account"],
+          ['unknown e', 'mail address'],
+          ['unknown local', 'part'],
+          ['user ', ' was not found'],
+          ['user ', ' does not exist'],
+        ].freeze
 
         def text; return 'userunknown'; end
         def description; return "Email rejected due to a local part of a recipient's email address does not exist"; end
@@ -164,22 +146,23 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          return true if argv1 =~ Regex
+          return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # Whether the address is "userunknown" or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is unknown user
         #                                   false: is not unknown user.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs.reason == 'userunknown'
+          return true if argvs['reason'] == 'userunknown'
 
-          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || ''
+          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus']) || ''
           return false if tempreason == 'suspend'
 
-          diagnostic = argvs.diagnosticcode.downcase
+          issuedcode = argvs['diagnosticcode'].downcase
           if tempreason == 'userunknown'
             # *.1.1 = 'Bad destination mailbox address'
             #   Status: 5.1.1
@@ -198,17 +181,17 @@ module Sisimai
                 next
               end
 
-              next unless r.match(diagnostic)
+              next unless r.match(issuedcode)
               # Match with reason defined in Sisimai::Reason::* except UserUnknown.
               matchother = true
               break
             end
             return true unless matchother # Did not match with other message patterns
 
-          elsif argvs.smtpcommand == 'RCPT'
+          elsif argvs['smtpcommand'] == 'RCPT'
             # When the SMTP command is not "RCPT", the session rejected by other
             # reason, maybe.
-            return true if match(diagnostic)
+            return true if match(issuedcode)
           end
 
           return false

data/lib/sisimai/reason/vacation.rb

@@ -1,16 +1,15 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Vacation is for only returning text and description.
-    # This class is called only from Sisimai.reason method.
+    # Sisimai::Reason::Vacation is for only returning text and description. This class is called only
+    # from Sisimai.reason method.
     module Vacation
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Vacation.pm
       class << self
         Index = [
           'i am away on vacation',
           'i am away until',
           'i am out of the office',
           'i will be traveling for work on',
-        ]
+        ].freeze
 
         def text; return 'vacation'; end
         def description; return 'Email replied automatically due to a recipient is out of office'; end