sisimai 5.6.0-java → 5.7.1-java

data/lib/sisimai/reason/contenterror.rb

@@ -1,14 +1,16 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::ContentError checks the bounce reason is "contenterror" or not This class is
+    # Sisimai::Reason::ContentError checks the bounce reason is "ContentError" or not This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a destination mail server has rejected email due to header format of the
-    # email like the following. Sisimai will set "contenterror" to the reason of email bounce if the
+    # email like the following. Sisimai will set "ContentError" to the reason of email bounce if the
     # value of Status: field in a bounce email is "5.6.*".
     module ContentError
       class << self
+        require 'sisimai/eb'
         Index = [
+          "charset not supported",
           "executable files are not allowed in compressed files",
           "header error",
           "header size exceeds maximum permitted",
@@ -22,10 +24,11 @@ module Sisimai
           "message mime complexity exceeds the policy maximum",
           "message was blocked because its content presents a potential", # https://support.google.com/mail/answer/6590
           "routing loop detected -- too many received: headers",
+          'too many "received" headers', # Exim/deliver.c:5425
           "we do not accept messages containing images or other attachments",
         ].freeze
 
-        def text; return 'contenterror'; end
+        def text; return Sisimai::Eb::ReBODY; end
         def description; return 'Email rejected due to a header format of the email'; end
 
         # Try to match that the given text and regular expressions
@@ -44,9 +47,9 @@ module Sisimai
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           require 'sisimai/reason/spamdetected'
-          return true  if argvs["reason"] == "blocked"
+          return true  if argvs["reason"] == Sisimai::Eb::ReBLOC
           return false if Sisimai::Reason::SpamDetected.true(argvs)
-          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]) == "contenterror"
+          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]) == Sisimai::Eb::ReBODY
           return match(argvs["diagnosticcode"].downcase)
         end
 

data/lib/sisimai/reason/delivered.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Reason
     # Sisimai::Reason::Delivered checks the email you sent is delivered successfully or not by matching
-    # diagnostic messages with message patterns. Sisimai will set "delivered" to the value of "reason"
+    # diagnostic messages with message patterns. Sisimai will set "Delivered" to the value of "reason"
     # when Status: field in the bounce message begins with "2" like following:
     #
     #  Final-Recipient: rfc822; kijitora@neko.nyaan.jp
@@ -12,7 +12,8 @@ module Sisimai
     # This class is called only Sisimai.reason method. This is NOT AN ERROR reason.
     module Delivered
       class << self
-        def text; return 'delivered'; end
+        require 'sisimai/eb'
+        def text; return Sisimai::Eb::ReSENT; end
         def description; return 'Email delivered successfully'; end
         def match;   return false; end
         def true(*); return false; end

data/lib/sisimai/reason/emailtoolarge.rb

@@ -2,13 +2,14 @@ module Sisimai
   module Reason
     # This is the error that a sent email size is too big for a destination mail server. In many
     # case, There are many attachment files with email, or the file size is too large. Sisimai will
-    # set "emailtoolarge" to the reason of email bounce if the value of Status: field in a bounce
+    # set "EmailTooLarge" to the reason of email bounce if the value of Status: field in a bounce
     # email is "5.2.3" or "5.3.4".
     module EmailTooLarge
       class << self
+        require 'sisimai/eb'
         Index = [
+          "exceeds the maximum size ",
           "line limit exceeded",
-          "mail file size exceeds the maximum size allowed for mail delivery",
           "message too large",
           "size limit",
           "taille limite du message atteinte",
@@ -20,7 +21,7 @@ module Sisimai
           ["message ", "too", "big"],
         ].freeze
 
-        def text; return 'emailtoolarge'; end
+        def text; return Sisimai::Eb::ReSIZE; end
         def description; return 'Email rejected due to an email size is too big for a destination mail server'; end
 
         # Try to match that the given text and regular expressions
@@ -39,18 +40,18 @@ module Sisimai
         #                                   false: is not big
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'emailtoolarge'
+          return true if argvs['reason'] == Sisimai::Eb::ReSIZE
 
           statuscode = argvs['deliverystatus'] || ''
           tempreason = Sisimai::SMTP::Status.name(statuscode)
 
-          # Delivery status code points "emailtoolarge".
+          # Delivery status code points "EmailTooLarge".
           # Status: 5.3.4
           # Diagnostic-Code: SMTP; 552 5.3.4 Error: message file too big
           #
           # Status: 5.2.3
           # Deiagnostic-Code: Message length exceeds administrative limit
-          return true if tempreason == 'emailtoolarge'
+          return true if tempreason == Sisimai::Eb::ReSIZE
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/expired.rb

@@ -1,34 +1,46 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Expired checks the bounce reason is "expired" or not. This class is called only
+    # Sisimai::Reason::Expired checks the bounce reason is "Expired" or not. This class is called only
     # Sisimai::Reason class.
     #
     # This is the error that delivery time has expired due to connection failure or network error and
     # the message you sent has been in the queue for long time.
     module Expired
       class << self
+        require 'sisimai/eb'
         Index = [
           "connection timed out",
           "could not find a gateway for",
+          "delay reason: ",    # Exim/deliver.c:7459
           "delivery attempts will continue to be",
+          "envelope expired",  # OpenSMTPD/smtpd/queue.c:221
           "failed to deliver to domain ",
-          "have been failing for a long time",
+          "frozen on arrival", # Exim/receive.c:4022
           "has been delayed",
+          "has been frozen",   # Exim/deliver.c:7586
+          "have been failing for a long time", # Exim/smtp.c:3508
+          "host not reachable",
           "it has not been collected after",
           "message could not be delivered for more than",
           "message expired, ",
           "message has been in the queue too long",
+          "message was not delivered within ",
           "message timed out",
+          "retry timeout exceeded",             # Exim/retry.c:902
+          "server did not accept our requests to connect",
           "server did not respond",
           "unable to deliver message after multiple retries",
         ].freeze
         Pairs = [
           ["could not be delivered for", " days"],
+          ["could not deliver for the last", "second"],
           ["delivery ", "expired"],
-          ["not", "reach", "period"],
+          ["delivery ", "delayed"],
+          ["exceed", "time", "out"],
+          ["not", "reach", "period"], # Exim/smtp.c:3508
         ].freeze
 
-        def text; return 'expired'; end
+        def text; return Sisimai::Eb::ReTIME; end
         def description; return 'Delivery time has expired due to a connection failure'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/failedstarttls.rb

@@ -1,16 +1,18 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::FailedSTARTTLS checks the bounce reason is "failedstarttls" or not.
+    # Sisimai::Reason::FailedSTARTTLS checks the bounce reason is "FailedSTARTTLS" or not.
     # This class is called only Sisimai::Reason class.
     module FailedSTARTTLS
       class << self
+        require 'sisimai/eb'
+
         # Email delivery failed due to STARTTLS related problem
         Index = [
           'starttls is required to send mail',
           'tls required but not supported',   # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
         ].freeze
 
-        def text; return 'failedstarttls'; end
+        def text; return Sisimai::Eb::ReTTLS; end
         def description; return "Email delivery failed due to STARTTLS related problem"; end
 
         # Try to match that the given text and regular expressions
@@ -28,7 +30,7 @@ module Sisimai
         #                                   false: Not FailedSTARTTLS
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs["reason"] == "failedstarttls" || argvs["command"] == "STARTTLS"
+          return true if argvs["reason"] == Sisimai::Eb::ReTTLS || argvs["command"] == Sisimai::Eb::CeTTLS
           return true if [523, 524, 538].index(argvs["replycode"].to_i)
           return match(argvs["diagnosticcode"].downcase)
         end

data/lib/sisimai/reason/feedback.rb

@@ -4,7 +4,8 @@ module Sisimai
     # from Sisimai.reason method and Sisimai::ARF class.
     module Feedback
       class << self
-        def text; return 'feedback'; end
+        require 'sisimai/eb'
+        def text; return Sisimai::Eb::ReFEED; end
         def description; return 'Email forwarded to the sender as a complaint message from your mailbox provider'; end
         def match;   return false; end
         def true(*); return false; end

data/lib/sisimai/reason/filtered.rb

@@ -1,14 +1,15 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Filtered checks the bounce reason is "filtered" or not. This class is called
+    # Sisimai::Reason::Filtered checks the bounce reason is "Filtered" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that an email has been rejected by a header content after SMTP DATA command.
     # In Japanese cellular phones, the error will incur that a sender's email address or a domain
-    # is rejected by recipient's email configuration. Sisimai will set "filtered" to the reason of
+    # is rejected by recipient's email configuration. Sisimai will set "Filtered" to the reason of
     # email bounce if the value of Status: field in a bounce email is "5.2.0" or "5.2.1".
     module Filtered
       class << self
+        require 'sisimai/eb'
         Index = [
           "account is protected by",
           "has restricted sms e-mail", # AT&T
@@ -24,7 +25,7 @@ module Sisimai
           "you have been blocked by the recipient",
         ].freeze
 
-        def text; return 'filtered'; end
+        def text; return Sisimai::Eb::ReFILT; end
         def description; return 'Email rejected due to a header content after SMTP DATA command'; end
 
         # Try to match that the given text and regular expressions
@@ -42,19 +43,19 @@ module Sisimai
         #                                   false: is not filtered
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'filtered'
+          return true if argvs['reason'] == Sisimai::Eb::ReFILT
 
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
-          return false if tempreason == 'suspend'
+          return false if tempreason == Sisimai::Eb::ReQUIT
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
           thecommand = argvs['command']                 || ''
-          if tempreason == 'filtered'
-            # Delivery status code points "filtered".
+          if tempreason == Sisimai::Eb::ReFILT
+            # Delivery status code points "Filtered".
             require 'sisimai/reason/userunknown'
             return true if Sisimai::Reason::UserUnknown.match(issuedcode) || match(issuedcode)
           else
-            # The value of "reason" isn't "filtered" when the value of "command" is an SMTP command
+            # The value of "reason" isn't "Filtered" when the value of "command" is an SMTP command
             # to be sent before the SMTP DATA command because all the MTAs read the headers and the
             # entire message body after the DATA command.
             return false if Sisimai::SMTP::Command::ExceptDATA.include?(thecommand)

data/lib/sisimai/reason/hasmoved.rb

@@ -1,16 +1,17 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::HasMoved checks the bounce reason is "hasmoved" or not. This class is called
+    # Sisimai::Reason::HasMoved checks the bounce reason is "HasMoved" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that a user's mailbox has moved (and is not forwarded automatically). Sisimai
-    # will set "hasmoved" to the reason of email bounce if the value of Status: field in a bounce email
+    # will set "HasMoved" to the reason of email bounce if the value of Status: field in a bounce email
     # is "5.1.6".
     module HasMoved
       class << self
+        require 'sisimai/eb'
         Index = [' has been replaced by '].freeze
 
-        def text; return 'hasmoved'; end
+        def text; return Sisimai::Eb::ReMOVE; end
         def description; return "Email rejected due to user's mailbox has moved and is not forwarded automatically"; end
 
         # Try to match that the given text and regular expressions
@@ -28,7 +29,7 @@ module Sisimai
         #                                   false: Has not moved
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true  if argvs['reason'] == 'hasmoved'
+          return true  if argvs['reason'] == Sisimai::Eb::ReMOVE
           return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end

data/lib/sisimai/reason/hostunknown.rb

@@ -2,28 +2,38 @@ module Sisimai
   module Reason
     # This is the error that a domain part ( Right hand side of @ sign ) of a recipient's email
     # address does not exist. In many case, the domain part is misspelled, or the domain name has
-    # been expired. Sisimai will set "hostunknown" to the reason of email bounce if the value of
+    # been expired. Sisimai will set "HostUnknown" to the reason of email bounce if the value of
     # Status: field in a bounce mail is "5.1.2".
     module HostUnknown
       class << self
+        require 'sisimai/eb'
         Index = [
+          "all host address lookups failed", # Exim/transports/smtp.c:3524
+          "couldn't find any host ",         # qmail-remote.c:78
+          "dns server returned answer with no data",
           "domain is not reachable",
           "domain mentioned in email address is unknown",
           "domain must exist",
+          "domain name not found",
           "host or domain name not found",
           "host unknown",
           "host unreachable",
+          "illegal host/domain name found",
+          "invalid domain name",                    # OpenSMTPD/smtpd/mta.c:976
+          "mx records point to non-existent hosts", # Exim/routers/dnslookup.c:331
           "name or service not known",
           "no such domain",
           "recipient address rejected: unknown domain name",
+          "responded with code nxdomain",
           "unknown host",
         ].freeze
         Pairs = [
           ["domain ", "not exist"],
+          ["host ", " not found"],
           ["unrout", "able ", "address"],
         ].freeze
 
-        def text; return 'hostunknown'; end
+        def text; return Sisimai::Eb::ReHOST; end
         def description; return "Delivery failed due to a domain part of a recipient's email address does not exist"; end
 
         # Try to match that the given text and regular expressions
@@ -43,13 +53,13 @@ module Sisimai
         #                                   false: is not unknown host.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true  if argvs['reason'] == 'hostunknown'
+          return true  if argvs['reason'] == Sisimai::Eb::ReHOST
           return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
           statuscode = argvs['deliverystatus'] || ''
 
-          if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
+          if Sisimai::SMTP::Status.name(statuscode) == Sisimai::Eb::ReHOST
             # To prevent classifying DNS errors as "HostUnknown"
             require 'sisimai/reason/networkerror'
             return true if Sisimai::Reason::NetworkError.match(issuedcode) == false

data/lib/sisimai/reason/mailboxfull.rb

@@ -1,18 +1,20 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::MailboxFull checks the bounce reason is "mailboxfull" or not. This class is
+    # Sisimai::Reason::MailboxFull checks the bounce reason is "MailboxFull" or not. This class is
     # called only Sisimai::Reason class.
     #
-    # This is the error that a recipient's mailbox is full. Sisimai will set "mailboxfull" to the
+    # This is the error that a recipient's mailbox is full. Sisimai will set "MailboxFull" to the
     # reason of email bounce if the value of Status: field in a bounce email is "4.2.2" or "5.2.2".
     module MailboxFull
       class << self
+        require 'sisimai/eb'
         Index = [
           "452 insufficient disk space",
           "account disabled temporarly for exceeding receiving limits",
           "boite du destinataire pleine",
           "exceeded storage allocation",
           "full mailbox",
+          "mailbox exceeds allowed size",
           "mailbox size limit exceeded",
           "mailbox would exceed maximum allowed storage",
           "mailfolder is full",
@@ -29,14 +31,14 @@ module Sisimai
           ["disk", "quota"],
           ["enough ", " space"],
           ["mailbox ", "exceeded", " limit"],
-          ["mailbox ", "full"],
+          ["mailbox ", "full"],   # Exim/transports/appendfile.c:2567
           ["mailbox ", "quota"],
           ["maildir ", "quota"],
           ["over ", "quota"],
-          ["quota ", "exceeded"],
+          ["quota ", "exceeded"], # Exim/transports/appendfile.c:3050
         ].freeze
 
-        def text; return 'mailboxfull'; end
+        def text; return Sisimai::Eb::ReFULL; end
         def description; return "Email rejected due to a recipient's mailbox is full"; end
 
         # Try to match that the given text and regular expressions
@@ -56,12 +58,12 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return false if argvs['deliverystatus'].empty?
-          return true  if argvs['reason'] == 'mailboxfull'
+          return true  if argvs['reason'] == Sisimai::Eb::ReFULL
 
-          # Delivery status code points "mailboxfull".
+          # Delivery status code points "MailboxFull".
           # Status: 4.2.2
           # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'mailboxfull'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReFULL
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/mailererror.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::MailerError checks the bounce reason is "mailererror" or not. This class is
+    # Sisimai::Reason::MailerError checks the bounce reason is "MailerError" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a mailer program has not exited successfully or exited unexpectedly on
@@ -10,6 +10,7 @@ module Sisimai
     #   Diagnostic-Code: X-Unix; 255
     module MailerError
       class << self
+        require 'sisimai/eb'
         Index = [
           ' || exit ',
           'procmail: ',
@@ -23,7 +24,7 @@ module Sisimai
           'x-unix; ',
         ].freeze
 
-        def text; return 'mailererror'; end
+        def text; return Sisimai::Eb::ReUNIX; end
         def description; return 'Email returned due to a mailer program has not exited successfully'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/networkerror.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::NetworkError checks the bounce reason is "networkerror" or not. This class is
+    # Sisimai::Reason::NetworkError checks the bounce reason is "NetworkError" or not. This class is
     # called only Sisimai::Reason class. This is the error that SMTP connection failed due to DNS
     # look up failure or other network problems.
     #
@@ -10,14 +10,26 @@ module Sisimai
     #   kijitora@neko.example.jp: Network error on destination MXs
     module NetworkError
       class << self
+        require 'sisimai/eb'
         Index = [
+          "address family mismatch on destination mxs", # OpenSMTPD/smtpd/mta.c
+          "all routes to destination blocked",          # OpenSMTPD/smtpd/mta.c
+          "bad dns lookup error code",                  # OpenSMTPD/smtpd/mta.c
           "could not connect and send the mail to",
+          "could not contact dns servers",
+          "could not retrieve source address",          # OpenSMTPD/smtpd/mta.c
           "dns records for the destination computer could not be found",
+          "establish an smtp connection",
+          "exceeded maximum hop count",                 # Courier
           "host is unreachable",
           "host name lookup failure",
           "host not found, try again",
+          "listed as a best-preference mx",
+          "loop detected",                              # OpenSMTPD/smtpd/mta.c
           "maximum forwarding loop count exceeded",
-          "no route to host",
+          "network error on destination mxs",           # OpenSMTPD/smtpd/mta.c
+          "no relevant answers",
+          "temporary failure in mx lookup",             # OpenSMTPD/smtpd/mta.c
           "too many hops",
           "unable to resolve route ",
           "unrouteable mail domain",
@@ -26,9 +38,10 @@ module Sisimai
           ["malformed", "name server reply"],
           ["mail ", "loop"],
           ["message ", "loop"],
+          ["no ", "route to"],
         ].freeze
 
-        def text; return 'networkerror'; end
+        def text; return Sisimai::Eb::ReINET; end
         def description; return 'SMTP connection failed due to DNS look up failure or other network problems'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/norelaying.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::NoRelaying checks the bounce reason is "norelaying" or not. This class is
+    # Sisimai::Reason::NoRelaying checks the bounce reason is "NoRelaying" or not. This class is
     # called only Sisimai::Reason class.
     #
     #    ... while talking to mailin-01.mx.example.com.:
@@ -9,6 +9,7 @@ module Sisimai
     #    554 5.0.0 Service unavailable
     module NoRelaying
       class << self
+        require 'sisimai/eb'
         Index = [
           "as a relay",
           "domain isn't in my list of allowed rcpthost",
@@ -16,9 +17,10 @@ module Sisimai
           "insecure mail relay",
           "no relaying",
           "not a gateway",
-          "not an open relay, so get lost",
           "not local host",
+          "open relay",
           "relay not permitted",
+          "relay prohibition",
           "relaying denied", # Sendmail
           "relaying mail to ",
           "send to a non-local e-mail address", # MailEnable
@@ -28,10 +30,10 @@ module Sisimai
         ].freeze
         Pairs = [
           ["relay ", "denied"],
-          [" not ", " to relay"],
+          ["n", "t ", "to relay"],
         ].freeze
 
-        def text; return 'norelaying'; end
+        def text; return Sisimai::Eb::RePASS; end
         def description; return 'Email rejected with error message "Relaying Denied"'; end
 
         # Try to match that the given text and regular expressions
@@ -51,8 +53,8 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           r = argvs['reason'] || ''
-          return false if r.start_with?('securityerror', 'systemerror', 'undefined')
-          return false if %w[CONN EHLO HELO].include?(argvs['command'])
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
+          return false if r.start_with?(Sisimai::Eb::ReSAFE, Sisimai::Eb::RePROC, Sisimai::Eb::Re___0)
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -1,24 +1,31 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::NotAccept checks the bounce reason is "notaccept" or not. This class is
+    # Sisimai::Reason::NotAccept checks the bounce reason is "NotAccept" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a destination mail server does ( or can ) not accept any email. In
-    # many case, the server is high load or under the maintenance. Sisimai will set "notaccept" to
+    # many case, the server is high load or under the maintenance. Sisimai will set "NotAccept" to
     # the reason of email bounce if the value of Status: field in a bounce email is "5.3.2" or the
     # value of SMTP reply code is 556.
     module NotAccept
+      require 'sisimai/eb'
       class << self
         # Destination mail server does not accept any message
         Index = [
-          "does not accept mail",             # Sendmail, iCloud
+          "destination seem to reject all mails", # OpenSMTPD/smtp/mta.c
+          "does not accept mail",                 # Sendmail, iCloud
           "mail receiving disabled",
-          "name server: .: host not found",   # Sendmail
-          "no mx record found for domain=",   # Oath(Yahoo!)
+          "mx or srv record indicated no smtp ",  # Exim/routers/dnslookup.c:328
+          "name server: .: host not found",       # Sendmail
+          "no host found for existing smtp ",     # Exim/transports/smtp.c:3502
           "no route for current request",
+          "null mx",
+        ].freeze
+        Pairs = [
+          ["no mx ", "found for "], # OpenSMTPD/smtp/mta.c
         ].freeze
 
-        def text; return 'notaccept'; end
+        def text; return Sisimai::Eb::Re00MX; end
         def description; return 'Delivery failed due to a destination mail server does not accept any email'; end
 
         # Try to match that the given text and regular expressions
@@ -27,6 +34,7 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
@@ -36,7 +44,7 @@ module Sisimai
         #                                   false: Accept
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true  if argvs['reason'] == 'notaccept'
+          return true  if argvs['reason'] == Sisimai::Eb::Re00MX
           return true  if [521, 556].index(argvs['replycode'].to_i) # SMTP Reply Code is 554 or 556
           return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -1,21 +1,23 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::NotCompliantRFC checks the bounce reason is "notcompliantrfc" or not. This
+    # Sisimai::Reason::NotCompliantRFC checks the bounce reason is "NotCompliantRFC" or not. This
     # class is called only from Sisimai::Reason class.
     #
     # This is the error that an email is not compliant RFC 5322 or other email related RFCs. For
     # example, there are multiple "Subject" headers in the email.
     module NotCompliantRFC
       class << self
+        require 'sisimai/eb'
         Index = [
           "duplicate header",
+          "duplicated message-id",
           "message is not rfc 5322 compliant",
           "multiple addresses in from: header are not accepted",
           "rfc 1035 violation",
           "https://support.google.com/mail/?p=rfcmessagenoncompliant",
         ].freeze
 
-        def text; return 'notcompliantrfc'; end
+        def text; return Sisimai::Eb::ReNRFC; end
         def description; return 'Email rejected due to non-compliance with RFC'; end
 
         # Try to match that the given text and regular expressions
@@ -33,7 +35,7 @@ module Sisimai
         #                                   false: Is not RFC compliant
         # @see http://www.ietf.org/rfc/rfc5322.txt
         def true(argvs)
-          return true if argvs['reason'] == 'notcompliantrfc'
+          return true if argvs['reason'] == Sisimai::Eb::ReNRFC
           return match(argvs['diagnosticcode'].downcase)
         end