sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/reason/securityerror.rb

@@ -20,9 +20,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SecurityError.pm
       class << self
         def text; return 'securityerror'; end
-        def description
-          return 'Email rejected due to security violation was detected on a destination host'
-        end
+        def description; return 'Email rejected due to security violation was detected on a destination host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -31,29 +29,29 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             Account[ ]not[ ]subscribed[ ]to[ ]SES
-            |Authentification[ ]requise.+[A-Z]{3}.+402
+             account[ ]not[ ]subscribed[ ]to[ ]ses
+            |authentification[ ]requise.+[a-z]{3}.+402
             |authentication[ ](?:
-               Credentials Invalid
+               credentials invalid
               |failure
               |failed;[ ]server[ ].+[ ]said:  # Postfix
               |required
               |turned[ ]on[ ]in[ ]your[ ]email[ ]client
               )
-            |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]Mode:[ ].+[)]
-            |Codes?[ ]d'?[ ]*authentification[ ]invalide.+[A-Z]{3}.+305
+            |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]mode:[ ].+[)]
+            |codes?[ ]d'?[ ]*authentification[ ]invalide.+[a-z]{3}.+305
             |domain[ ].+[ ]is[ ]a[ ]dead[ ]domain
-            |Executable[ ]files[ ]are[ ]not[ ]allowed[ ]in[ ]compressed[ ]files
+            |executable[ ]files[ ]are[ ]not[ ]allowed[ ]in[ ]compressed[ ]files
             |insecure[ ]mail[ ]relay
-            |Recipient[ ]address[ ]rejected:[ ]Access[ ]denied
+            |recipient[ ]address[ ]rejected:[ ]access[ ]denied
             |sorry,[ ]you[ ]don'?t[ ]authenticate[ ]or[ ]the[ ]domain[ ]isn'?t[ ]in[ ]
               my[ ]list[ ]of[ ]allowed[ ]rcpthosts
-            |TLS[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
-            |User[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:SendRawEmail[ ]on[ ]resource
+            |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
+            |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
             |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
             |verification[ ]failure
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/spamdetected.rb

@@ -17,9 +17,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SpamDetected.pm
       class << self
         def text; return 'spamdetected'; end
-        def description
-          return 'Email rejected by spam filter running on the remote host'
-        end
+        def description; return 'Email rejected by spam filter running on the remote host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -28,15 +26,15 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             ["]The[ ]mail[ ]server[ ]detected[ ]your[ ]message[ ]as[ ]spam[ ]and[ ]
+             ["]the[ ]mail[ ]server[ ]detected[ ]your[ ]message[ ]as[ ]spam[ ]and[ ]
                 has[ ]prevented[ ]delivery[.]["]    # CPanel/Exim with SA rejections on
             |(?:\d[.]\d[.]\d|\d{3})[ ]spam\z
             |appears[ ]to[ ]be[ ]unsolicited
-            |Blacklisted[ ]URL[ ]in[ ]message
+            |blacklisted[ ]url[ ]in[ ]message
             |block[ ]for[ ]spam
             |blocked[ ]by[ ](?:
                policy:[ ]no[ ]spam[ ]please
-              |spamAssassin                   # rejected by SpamAssassin
+              |spamassassin                   # rejected by SpamAssassin
               )
             |blocked[ ]for[ ]abuse[.][ ]see[ ]http://att[.]net/blocks   # AT&T
             |bulk[ ]email
@@ -50,7 +48,7 @@ module Sisimai
             |mail[ ](?:
                appears[ ]to[ ]be[ ]unsolicited    # rejected due to spam
               |content[ ]denied   # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000726
-              |rejete.+[A-Z]{3}.+506
+              |rejete.+[a-z]{3}.+506
               )
             |may[ ]consider[ ]spam
             |message[ ](?:
@@ -59,10 +57,10 @@ module Sisimai
               |filtered
               |filtered[.][ ](?:
                  please[ ]see[ ]the[ ]faqs[ ]section[ ]on[ ]spam
-                |Refer[ ]to[ ]the[ ]Troubleshooting[ ]page[ ]at[ ]
+                |refer[ ]to[ ]the[ ]troubleshooting[ ]page[ ]at[ ]
                 )
               |looks[ ]like[ ]spam
-              |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]See[ ]http:   # Yahoo!
+              |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]see[ ]http:   # Yahoo!
               |refused[ ]by[ ]mailmarshal[ ]spamprofiler
               |rejected[ ](?:
                  as[ ]spam
@@ -77,8 +75,8 @@ module Sisimai
               |system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
               )
             |probable[ ]spam
-            |REJECT[ ]bulk[.]advertising
-            |Reject,.+[ ][-][ ]SPAM[.][ ]
+            |reject[ ]bulk[.]advertising
+            |reject,.+[ ][-][ ]spam[.][ ]
             |rejected(?:
                :[ ]spamassassin[ ]score[ ]
               |[ ]by[ ].+[ ][(]spam[)]
@@ -87,7 +85,7 @@ module Sisimai
             |rejecting[ ]banned[ ]content
             |related[ ]to[ ]content[ ]with[ ]spam[-]like[ ]characteristics
             |rule[ ]imposed[ ]as[ ].+is[ ]blacklisted[ ]on              # Mailmarshal RBLs
-            |Sender[ ]domain[ ]listed[ ]at[ ].+
+            |sender[ ]domain[ ]listed[ ]at[ ].+
             |sending[ ]address[ ]not[ ]accepted[ ]due[ ]to[ ]spam[ ]filter
             |spam[ ](?:
                .+[ ]exceeded
@@ -101,18 +99,18 @@ module Sisimai
               |not[ ]accepted
               |refused
               |rejection
-              |Reporting[ ]Address    # SendGrid: a message to an address has previously been marked as Spam by the recipient.
+              |reporting[ ]address    # SendGrid: a message to an address has previously been marked as Spam by the recipient.
               |score[ ]
               )
             |spambouncer[ ]identified[ ]spam    # SpamBouncer identified SPAM
             |spamming[ ]not[ ]allowed
-            |Too[ ]much[ ]spam[.]               # Earthlink
+            |too[ ]much[ ]spam[.]               # Earthlink
             |the[ ]message[ ](?:
                has[ ]been[ ]rejected[ ]by[ ]spam[ ]filtering[ ]engine
               |was[ ]rejected[ ]due[ ]to[ ]classification[ ]as[ ]bulk[ ]mail
               )
-            |The[ ]content[ ]of[ ]this[ ]message[ ]looked[ ]like[ ]spam # SendGrid
-            |This[ ](?:e-mail|mail)[ ](?:
+            |the[ ]content[ ]of[ ]this[ ]message[ ]looked[ ]like[ ]spam # SendGrid
+            |this[ ](?:e-mail|mail)[ ](?:
                cannot[ ]be[ ]forwarded[ ]because[ ]it[ ]was[ ]detected[ ]as[ ]spam
               |is[ ]classified[ ]as[ ]spam[ ]and[ ]is[ ]rejected
               )
@@ -124,7 +122,7 @@ module Sisimai
                 )
               |scored[ ].+[ ]spam[ ]points
               |was[ ]classified[ ]as[ ]spam
-              |was[ ]rejected[ ]by[ ]Recurrent[ ]Pattern[ ]Detection[ ]System
+              |was[ ]rejected[ ]by[ ]recurrent[ ]pattern[ ]detection[ ]system
               )
             |transaction[ ]failed[ ]spam[ ]message[ ]not[ ]queued       # SendGrid
             |we[ ]dont[ ]accept[ ]spam
@@ -132,7 +130,7 @@ module Sisimai
             |your[ ](?:
                email[ ](?:
                  appears[ ]similar[ ]to[ ]spam[ ]we[ ]have[ ]received[ ]before
-                |breaches[ ]local[ ]URIBL[ ]policy
+                |breaches[ ]local[ ]uribl[ ]policy
                 |had[ ]spam[-]like[ ]
                 |is[ ](?:considered|probably)[ ]spam
                 |was[ ]detected[ ]as[ ]spam
@@ -141,15 +139,15 @@ module Sisimai
                  as[ ]spam[ ]and[ ]has[ ]prevented[ ]delivery
                 |has[ ]been[ ](?:
                    temporarily[ ]blocked[ ]by[ ]our[ ]filter
-                  |rejected[ ]because[ ]it[ ]appears[ ]to[ ]be[ ]SPAM
+                  |rejected[ ]because[ ]it[ ]appears[ ]to[ ]be[ ]spam
                   )
-                |has[ ]triggered[ ]a[ ]SPAM[ ]block
+                |has[ ]triggered[ ]a[ ]spam[ ]block
                 |may[ ]contain[ ]the[ ]spam[ ]contents
                 |failed[ ]several[ ]antispam[ ]checks
                 )
               )
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -164,24 +162,12 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
           return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::SpamDetected.text
+          return true if argvs.reason == 'spamdetected'
 
           require 'sisimai/smtp/status'
-          statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
-          reasontext = Sisimai::Reason::SpamDetected.text
-          v = false
-
-          if Sisimai::SMTP::Status.name(statuscode) == reasontext
-            # Delivery status code points "spamdetected".
-            v = false
-
-          else
-            # Matched with a pattern in this class
-            v = true if Sisimai::Reason::SpamDetected.match(diagnostic)
-          end
-
-          return v
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'spamdetected'
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end

data/lib/sisimai/reason/suspend.rb

@@ -9,9 +9,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Suspend.pm
       class << self
         def text; return 'suspend'; end
-        def description
-          return 'Email rejected due to a recipient account is being suspended'
-        end
+        def description; return 'Email rejected due to a recipient account is being suspended'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -20,7 +18,7 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             Boite[ ]du[ ]destinataire[ ]archivee.+[A-Z]{3}.+420
+             boite[ ]du[ ]destinataire[ ]archivee.+[a-z]{3}.+420
             |email[ ]account[ ]that[ ]you[ ]tried[ ]to[ ]reach[ ]is[ ]disabled
             |invalid/inactive[ ]user
             # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
@@ -30,17 +28,17 @@ module Sisimai
               |unavailable[ ]or[ ]access[ ]denied
               )
             |recipient[ ](?:
-               rejected:[ ]Temporarily[ ]inactive
+               rejected:[ ]temporarily[ ]inactive
               |suspend[ ]the[ ]service
               )
             |sorry[ ]your[ ]message[ ]to[ ].+[ ]cannot[ ]be[ ]delivered[.][ ]this[ ]
               account[ ]has[ ]been[ ]disabled[ ]or[ ]discontinued
-            |The[ ]domain[ ].+[ ]is[ ]currently[ ]suspended
-            |User[ ].+[ ]temporary[ ]locked
+            |the[ ]domain[ ].+[ ]is[ ]currently[ ]suspended
+            |user[ ].+[ ]temporary[ ]locked
             |user[ ]suspended   # http://mail.163.com/help/help_spam_16.htm
             |vdelivermail:[ ]account[ ]is[ ]locked[ ]email[ ]bounced
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -55,8 +53,9 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
           return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::Suspend.text
-          return true if Sisimai::Reason::Suspend.match(argvs.diagnosticcode)
+
+          return true if argvs.reason == 'suspend'
+          return true if match(argvs.diagnosticcode.downcase)
           return false
         end
 

data/lib/sisimai/reason/syntaxerror.rb

@@ -15,9 +15,7 @@ module Sisimai
       # 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 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
@@ -30,7 +28,8 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::SyntaxError.text
+
+          return true if argvs.reason == 'syntaxerror'
           return true if argvs.replycode =~ /\A[45]0[0-7]\z/
           return false
         end

data/lib/sisimai/reason/systemerror.rb

@@ -13,9 +13,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemError.pm
       class << self
         def text; return 'systemerror'; end
-        def description
-          return 'Email returned due to system error on the remote host'
-        end
+        def description; return 'Email returned due to system error on the remote host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -25,10 +23,10 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              can[']t[ ]create[ ]user[ ]output[ ]file
-            |Could[ ]not[ ]load[ ]DRD[ ]for[ ]domain
-            |Internal[ ](?:
+            |could[ ]not[ ]load[ ]drd[ ]for[ ]domain
+            |internal[ ](?:
                error[ ]reading[ ]data                             # Microsoft
-              |server[ ]error:[ ]Operation[ ]now[ ]in[ ]progress  # Microsoft
+              |server[ ]error:[ ]operation[ ]now[ ]in[ ]progress  # Microsoft
               )
             |interrupted[ ]system[ ]call
             |it[ ](?:
@@ -39,7 +37,7 @@ module Sisimai
                configuration[ ]error
               |error[ ]in[ ]processing
               )
-            |loop[ ]was[ ]found[ ]in[ ]the[ ]Mail[ ]eXchanger
+            |loop[ ]was[ ]found[ ]in[ ]the[ ]mail[ ]exchanger
             |mail[ ](?:
                for[ ].+[ ]loops[ ]back[ ]to[ ]myself
               |system[ ]configuration[ ]error
@@ -47,10 +45,10 @@ module Sisimai
             |server[ ]configuration[ ]error
             |service[ ]currently[ ]unavailable
             |system[ ]config[ ]error
-            |Temporary[ ]local[ ]problem
+            |temporary[ ]local[ ]problem
             |timeout[ ]waiting[ ]for[ ]input
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/systemfull.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemFull.pm
       class << self
         def text; return 'systemfull'; end
-        def description
-          return "Email rejected due to a destination mail server's disk is full"
-        end
+        def description; return "Email rejected due to a destination mail server's disk is full"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -24,7 +22,7 @@ module Sisimai
              mail[ ]system[ ]full
             |requested[ ]mail[ ]action[ ]aborted:[ ]exceeded[ ]storage[ ]allocation # MS Exchange
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/toomanyconn.rb

@@ -13,9 +13,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/TooManyConn.pm
       class << self
         def text; return 'toomanyconn'; end
-        def description
-          return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'
-        end
+        def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -24,25 +22,25 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             All[ ]available[ ]IPs[ ]are[ ]at[ ]maximum[ ]connection[ ]limit    # SendGrid
+             all[ ]available[ ]ips[ ]are[ ]at[ ]maximum[ ]connection[ ]limit    # SendGrid
             |connection[ ]rate[ ]limit[ ]exceeded
             |domain[ ].+[ ]has[ ]exceeded[ ]the[ ]max[ ]emails[ ]per[ ]hour[ ].+[ ]allowed
-            |no[ ]IPs[ ]available[ ][-][ ].+[ ]exceeds[ ]per[-]domain[ ]connection[ ]limit[ ]for
-            |Throttling[ ]failure:[ ](?:
-               Daily[ ]message[ ]quota[ ]exceeded
-              |Maximum[ ]sending[ ]rate[ ]exceeded
+            |no[ ]ips[ ]available[ ][-][ ].+[ ]exceeds[ ]per[-]domain[ ]connection[ ]limit[ ]for
+            |throttling[ ]failure:[ ](?:
+               daily[ ]message[ ]quota[ ]exceeded
+              |maximum[ ]sending[ ]rate[ ]exceeded
               )
-            |Too[ ]many[ ](?:
+            |too[ ]many[ ](?:
                connections
               |connections[ ]from[ ]your[ ]host[.]    # Microsoft
-              |concurrent[ ]SMTP[ ]connections        # Microsoft
-              |errors[ ]from[ ]your[ ]IP              # Free.fr
-              |SMTP[ ]sessions[ ]for[ ]this[ ]host    # Sendmail(daemon.c)
+              |concurrent[ ]smtp[ ]connections        # Microsoft
+              |errors[ ]from[ ]your[ ]ip              # Free.fr
+              |smtp[ ]sessions[ ]for[ ]this[ ]host    # Sendmail(daemon.c)
               )
-            |Trop[ ]de[ ]connexions,[ ].+[A-Z]{3}.+104
-            |We[ ]have[ ]already[ ]made[ ]numerous[ ]attempts[ ]to[ ]deliver[ ]this[ ]message
+            |trop[ ]de[ ]connexions,[ ].+[a-z]{3}.+104
+            |we[ ]have[ ]already[ ]made[ ]numerous[ ]attempts[ ]to[ ]deliver[ ]this[ ]message
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -56,23 +54,12 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::TooManyConn.text
+          return true if argvs.reason == 'toomanyconn'
 
           require 'sisimai/smtp/status'
-          statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
-          reasontext = Sisimai::Reason::TooManyConn.text
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
-          v = false
-
-          if tempreason == reasontext
-            # Delivery status code points "toomanyconn".
-            v = true
-          else
-            # Matched with a pattern in this class
-            v = true if Sisimai::Reason::TooManyConn.match(diagnostic)
-          end
-          return v
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'toomanyconn'
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end

data/lib/sisimai/reason/undefined.rb

@@ -6,9 +6,7 @@ module Sisimai
       # 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
+        def description; return 'Sisimai could not detect an error reason'; end
         def match;   return nil; end
         def true(*); return nil; end
       end

data/lib/sisimai/reason/userunknown.rb

@@ -17,9 +17,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
         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
+        def description; return "Email rejected due to a local part of a recipient's email address does not exist"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -31,13 +29,13 @@ module Sisimai
              .+[ ]user[ ]unknown
             |[#]5[.]1[.]1[ ]bad[ ]address
             |[<].+[>][ ]not[ ]found
-            |[<].+[@].+[>][.][.][.][ ]Blocked[ ]by[ ]
-            |5[.]0[.]0[.][ ]Mail[ ]rejected[.]
-            |5[.]1[.]0[ ]Address[ ]rejected[.]
-            |Adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[A-Z]{3}.+(?:416|418)
+            |[<].+[@].+[>][.][.][.][ ]blocked[ ]by[ ]
+            |5[.]0[.]0[.][ ]mail[ ]rejected[.]
+            |5[.]1[.]0[ ]address[ ]rejected[.]
+            |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[a-z]{3}.+(?:416|418)
             |address[ ](?:does[ ]not[ ]exist|unknown)
             |archived[ ]recipient
-            |BAD[-_ ]RECIPIENT
+            |bad[-_ ]recipient
             |can[']t[ ]accept[ ]user
             |destination[ ](?:
                addresses[ ]were[ ]unknown
@@ -80,7 +78,7 @@ module Sisimai
                 |recipient
                 |user(?:[ ]here)?
                 )
-              |thank[ ]you[ ]rejected:[ ]Account[ ]Unavailable:
+              |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
               |valid[ ]recipients[,][ ]bye    # Microsoft
               )
             |non[- ]?existent[ ]user
@@ -93,7 +91,7 @@ module Sisimai
             |rece?ipient[ ](?:
                .+[ ]was[ ]not[ ]found[ ]in
               |address[ ]rejected:[ ](?:
-                 Access[ ]denied
+                 access[ ]denied
                 |invalid[ ]user
                 |user[ ].+[ ]does[ ]not[ ]exist
                 |user[ ]unknown[ ]in[ ].+[ ]table
@@ -101,13 +99,13 @@ module Sisimai
                 )
               |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
               |is[ ]not[ ]local
-              |not[ ](?:exist|found|OK)
+              |not[ ](?:exist|found|ok)
               |unknown
               )
             |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-            |RESOLVER[.]ADR[.]Recip(?:ient)NotFound
+            |resolver[.]adr[.]recip(?:ient)notfound
             |said:[ ]550[-[ ]]5[.]1[.]1[ ].+[ ]user[ ]unknown[ ]
-            |SMTP[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
+            |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
             |sorry,[ ](?:
                user[ ]unknown
               |badrcptto
@@ -118,7 +116,7 @@ module Sisimai
               |following[ ]recipients[ ]was[ ]undeliverable
               |user[']s[ ]email[ ]name[ ]is[ ]not[ ]found
               )
-            |There[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
+            |there[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
             |this[ ](?:
                address[ ]no[ ]longer[ ]accepts[ ]mail
               |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
@@ -143,7 +141,7 @@ module Sisimai
             |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
             |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -157,33 +155,30 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::UserUnknown.text
+          return true if argvs.reason == 'userunknown'
 
           require 'sisimai/smtp/status'
-          prematches = %w|NoRelaying Blocked MailboxFull HasMoved Blocked Rejected|
-          matchother = false
-          statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
-          reasontext = Sisimai::Reason::UserUnknown.text
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
-          v = false
-
+          diagnostic = argvs.diagnosticcode.downcase;
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
           return false if tempreason == 'suspend'
 
-          if tempreason == reasontext
+          if tempreason == 'userunknown'
             # *.1.1 = 'Bad destination mailbox address'
             #   Status: 5.1.1
             #   Diagnostic-Code: SMTP; 550 5.1.1 <***@example.jp>:
             #     Recipient address rejected: User unknown in local recipient table
+            prematches = %w[NoRelaying Blocked MailboxFull HasMoved Blocked Rejected]
+            matchother = false
+
             prematches.each do |e|
               # Check the value of "Diagnostic-Code" with other error patterns.
-              p = 'Sisimai::Reason::' + e
+              p = 'Sisimai::Reason::' << e
               r = nil
               begin
                 require p.downcase.gsub('::', '/')
                 r = Module.const_get(p)
               rescue
-                warn '***warning: Failed to load ' + p
+                warn '***warning: Failed to load ' << p
                 next
               end
 
@@ -192,20 +187,15 @@ module Sisimai
               matchother = true
               break
             end
+            return true unless matchother # Did not match with other message patterns
 
-            # Did not match with other message patterns
-            v = true unless matchother
-
-          else
-            # Check the last SMTP command of the session.
-            if argvs.smtpcommand == 'RCPT'
-              # When the SMTP command is not "RCPT", the session rejected by other
-              # reason, maybe.
-              v = true if Sisimai::Reason::UserUnknown.match(diagnostic)
-            end
+          elsif argvs.smtpcommand == 'RCPT'
+            # When the SMTP command is not "RCPT", the session rejected by other
+            # reason, maybe.
+            return true if match(diagnostic)
           end
 
-          return v
+          return false
         end
 
       end