sisimai 5.6.0-java → 5.7.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f44c6b808f8cc77c1b201c98e3c62326c8d5bbd32010ed17a1665abefc02413
-  data.tar.gz: d3071f7eb259a1fe59a4d1b4a0cead24888ef3d5a3fe130e469dbc48e82d2117
+  metadata.gz: 701bb8a21375a15d4189cc3a3f8929884ab3406483526d009bb1e257b610cf9b
+  data.tar.gz: 2c319b65b0f72c9351dc099877505b6176c3b980e813fc10e53e67be504cafe1
 SHA512:
-  metadata.gz: 5f71bc52c7f17d6a2a506e97e52fbf30bf42b95bd85deb4349e5ffe6eec16b1336e0b14a31afa7cab2714f2842bcda1656be1589f7eab7b5dc7d430314b75f1a
-  data.tar.gz: 1fead139305581fcee22a5ea4bb906612fb5fcd5c214d07df34772d88f425b9dca474f48c5fb45c410110967b08249a506c615c711cf7b115b0c16a9d1e33488
+  metadata.gz: a9458959a372839a8626a31bf487718338a4942c5a27e9d99e4b7efac8e340263c4dab88c8988a197e3b1e72be15b50cf69fcc07c41b6c2f007d03fba33854b1
+  data.tar.gz: 5b3c330b2297749b8d4a91d68e8ef898993457129b87fab8e7222efc0c6b0a4251742bc5330ab22077dc915fc786e96acf511e41ac3bf74775ae8664da3aeabf

data/.github/workflows/rake-test.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout the repository(CRuby)
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
       - name: Setup CRuby
         uses: ruby/setup-ruby@v1
         with:
@@ -41,8 +39,6 @@ jobs:
     steps:
       - name: Checkout the repository(JRuby)
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
       - name: Setup JRuby 
         uses: ruby/setup-ruby@v1
         with:

data/ChangeLog.md

@@ -4,6 +4,38 @@ RELEASE NOTES for Ruby version of Sisimai
 - download: "https://rubygems.org/gems/sisimai"
 - document: "https://libsisimai.org/"
 
+v5.7.0
+---------------------------------------------------------------------------------------------------
+- release: "Mon, 22 Jun 2026 16:22:22 +0900 (JST)"
+- version: "5.7.0"
+- changes:
+  - **Bug fixes**
+    - #414 Bug fix: The value of command should be `RCPT` when `RCPT first` in the error message.
+    - #433 Check whether `lowerchunk` is nil or not to avoid `NoMethodError`, `SystemStackError`
+      in `haircut` method of `Sisimai::RFC2045`. #434 #436 Thanks to @SAY-5.
+  - **MTA modules and error message patterns**
+    - #410 #412 Improvement in error message patterns.
+      - Update error message patterns in `AuthFailure`, `ContentError`, `NoRelaying`, `Rejected`,
+        `UserUnknown`, `SystemError`, `Suspend`, and `Sisimai::Rhost::Microsoft`.
+      - Remove error message patterns already defined in `Sisimai::Reason` from some MTA moudles of
+        `Sisimai::Lhost`.
+      - Move error message patterns from some MTA modules of `Sisimai::Lhost` to `Sisimai::Reason`.
+    - #413 List all the Zoho domains.
+    - Update the order of `ClassOrder` in `Sisimai::Reason`.
+    - #421 Code improvement for detecting bounce messages returned from Google Groups.
+    - #437 Implement `Sisimai::Lhost::DeutscheTelekom` to decode bounce messages generated by Smail
+      3 or Deutsche Telekom.
+  - **Code improvements and Environment**
+    - **#430 Sisimai does not support Ruby 4.0.0 until the end of 2027.**
+    - #417 Use a switch statement instead of if-else for better readability.
+    - #423 Fix and update comments in `Sisimai::SMTP::Status`.
+    - #428 Remove useless code blocks.
+  - **EXPERIMENTAL Features**
+    - #424 #425 Change the data type of `Toxic` field implemented at v5.5.0 from Boolean to Integer
+      with `-1` as the default value to allow score-based evaluation of recipient address toxicity.
+    - #426 #427 Implement `Bogus` field as an Integer with `-1` as the default value to record the
+      unreliability score of a bounce message.
+
 v5.6.0
 ---------------------------------------------------------------------------------------------------
 - release: "Mon,  2 Feb 2026 18:30:22 +0900 (JST)"

data/README-JA.md

@@ -1,5 +1,5 @@
 ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
-[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/5-stable/LICENSE)
 [![Ruby](https://img.shields.io/badge/ruby-v2.5.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
@@ -65,14 +65,15 @@ Sisimai(シシマイ)は複雑で多種多様なバウンスメールを解析
 The key features of Sisimai
 ---------------------------------------------------------------------------------------------------
 * __バウンスメールを構造化したデータに変換__
-  * 以下27項目の情報を含むデータ構造[^2]
+  * 以下28項目の情報を含むデータ構造[^2]
     * __基本的情報__: `timestamp`, `origin`
     * __発信者情報__: `addresser`, `senderdomain`, 
     * __受信者情報__: `recipient`, `destination`, `alias`
     * __配信の情報__: `action`, `replycode`, `deliverystatus`, `command`
     * __エラー情報__: `reason`, `diagnosticcode`, `diagnostictype`, `feedbacktype`, `hardbounce`
     * __メール情報__: `subject`, `messageid`, `listid`,
-    * __その他情報__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`
+    * __評価用項目__: `toxic`, `bogus`, `catch`
+    * __その他情報__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`
   * __出力可能な形式__
     * Ruby (Hash, Array)
     * JSON 
@@ -83,9 +84,9 @@ The key features of Sisimai
     * `gem install`
     * `git clone && make`
   * __高い解析精度__
-    * [60種類のMTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)に対応
+    * [61種類のMTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)に対応
     * Feedback Loop(ARF)にも対応
-    * [36種類のバウンス理由](https://libsisimai.org/en/reason/)を検出
+    * [34種類のバウンス理由](https://libsisimai.org/en/reason/)を検出
 
 [^2]: コールバック機能を使用すると`catch`アクセサの下に独自のデータを追加できます
 
@@ -115,10 +116,10 @@ Install
 ### From RubyGems.org
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-5.6.0.gem (100%)
-Successfully installed sisimai-5.6.0
-Parsing documentation for sisimai-5.6.0
-Installing ri documentation for sisimai-5.6.0
+Fetching: sisimai-5.7.0.gem (100%)
+Successfully installed sisimai-5.7.0
+Parsing documentation for sisimai-5.7.0
+Installing ri documentation for sisimai-5.7.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -146,13 +147,13 @@ if [ -d "/usr/local/jr" ]; then \
 ...
 3 gems installed
 /opt/local/bin/rake install
-sisimai 5.6.0 built to pkg/sisimai-5.6.0.gem.
-sisimai (5.6.0) installed.
+sisimai 5.7.0 built to pkg/sisimai-5.7.0.gem.
+sisimai (5.7.0) installed.
 if [ -d "/usr/local/jr" ]; then \
 		PATH="/usr/local/jr/bin:$PATH" /usr/local/jr/bin/rake install; \
 	fi
-sisimai 5.6.0 built to pkg/sisimai-5.6.0-java.gem.
-sisimai (5.6.0) installed.
+sisimai 5.7.0 built to pkg/sisimai-5.7.0-java.gem.
+sisimai (5.7.0) installed.
 ```
 
 Usage
@@ -333,7 +334,8 @@ Output example
     "timezoneoffset": "+0900",
     "replycode": 550,
     "token": "84656774898baa90660be3e12fe0526e108d4473",
-    "toxic": false,
+    "bogus": -1,
+    "toxic": -1,
     "diagnostictype": "SMTP",
     "timestamp": 1650119685,
     "diagnosticcode": "host gmail-smtp-in.l.google.com[64.233.187.27] said: This mail has been blocked because the sender is unauthenticated. Gmail requires all senders to authenticate with either SPF or DKIM. Authentication results: DKIM = did not pass SPF [relay3.example.com] with ip: [192.0.2.22] = did not pass For instructions on setting up authentication, go to https://support.google.com/mail/answer/81126#authentication c2-202200202020202020222222cat.127 - gsmtp (in reply to end of DATA command)",
@@ -405,6 +407,7 @@ Sisimai 5で3個のESPモジュール名(解析エンジン)が変更になり
 | Zoho (added at v5.5.0)                          | なし                    | `Rhost::Zoho`       |
 | DragonFly Mail Agent (added at v5.1.0)          | なし                    | `Lhost::DragonFly`  |
 | Mimecast (added at v5.5.0)                      | なし                    | `Lhost::Mimecast`   |
+| DeutscheTelekom (added at v5.7.0)               | なし               | `Lhost::DeutscheTelekom` |
 
 Bounce Reasons
 ---------------------------------------------------------------------------------------------------
@@ -436,7 +439,7 @@ Bug report
 Emails could not be decoded
 ---------------------------------------------------------------------------------------------------
 Sisimaiで解析できないバウンスメールは
-[set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet](https://github.com/sisimai/set-of-emails/tree/master/to-be-debugged-because/sisimai-cannot-parse-yet)リポジトリに追加してPull-Requestを送ってください。
+[set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet](https://github.com/sisimai/rb-sisimai/tree/5-stable/set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet)ディレクトリに追加してPull-Requestを送ってください。
 
 Other Information
 ===================================================================================================
@@ -453,7 +456,7 @@ Related sites
 
 See also
 ---------------------------------------------------------------------------------------------------
-* [README.md - README.md in English(🇬🇧)](https://github.com/sisimai/rb-sisimai/blob/master/README.md)
+* [README.md - README.md in English(🇬🇧)](https://github.com/sisimai/rb-sisimai/blob/5-stable/README.md)
 * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
 * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
 * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)

data/README.md

@@ -1,5 +1,5 @@
 ![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
-[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-sisimai/blob/5-stable/LICENSE)
 [![Ruby](https://img.shields.io/badge/ruby-v2.5.0--v3.4.0-red.svg)](https://www.ruby-lang.org/)
 [![Gem Version](https://badge.fury.io/rb/sisimai.svg)](https://badge.fury.io/rb/sisimai)
 [![codecov](https://codecov.io/github/sisimai/rb-sisimai/graph/badge.svg?token=YGkyluNWiZ)](https://codecov.io/github/sisimai/rb-sisimai)
@@ -67,14 +67,15 @@ of Sisimai is ported from [the Perl version of Sisimai](https://github.com/sisim
 The key features of Sisimai
 ---------------------------------------------------------------------------------------------------
 * __Decode email bounces to structured data__
-  * Sisimai provides detailed insights into bounce emails by extracting 27 key data points.[^2]
+  * Sisimai provides detailed insights into bounce emails by extracting 28 key data points.[^2]
     * __Essential information__: `timestamp`, `origin`
     * __Sender information__: `addresser`, `senderdomain`, 
     * __Recipient information__: `recipient`, `destination`, `alias`
     * __Delivery information__: `action`, `replycode`, `deliverystatus`, `command`
     * __Bounce details__: `reason`, `diagnosticcode`, `diagnostictype`, `feedbacktype`, `feedbackid`, `hardbounce`
     * __Message details__: `subject`, `messageid`, `listid`,
-    * __Additional information__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`, `catch`, `toxic`
+    * __Evaluation metrics (User-calculated)__: `toxic`, `bogus`, `catch`
+    * __Additional information__: `decodedby`, `timezoneoffset`, `lhost`, `rhost`, `token`
   * Output formats
     * Ruby (Hash, Array)
     * JSON 
@@ -85,7 +86,7 @@ The key features of Sisimai
     * `gem install`
     * `git clone && make`
   * __High Precision of Analysis__
-    * Support [60 MTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)
+    * Support [61 MTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)
     * Support Feedback Loop Message(ARF)
     * Can detect [34 bounce reasons](https://libsisimai.org/en/reason/)
 
@@ -114,10 +115,10 @@ Install
 ### From RubyGems
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-5.6.0.gem (100%)
-Successfully installed sisimai-5.6.0
-Parsing documentation for sisimai-5.6.0
-Installing ri documentation for sisimai-5.6.0
+Fetching: sisimai-5.7.0.gem (100%)
+Successfully installed sisimai-5.7.0
+Parsing documentation for sisimai-5.7.0
+Installing ri documentation for sisimai-5.7.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -145,13 +146,13 @@ if [ -d "/usr/local/jr" ]; then \
 ...
 3 gems installed
 /opt/local/bin/rake install
-sisimai 5.6.0 built to pkg/sisimai-5.6.0.gem.
-sisimai (5.6.0) installed.
+sisimai 5.7.0 built to pkg/sisimai-5.7.0.gem.
+sisimai (5.7.0) installed.
 if [ -d "/usr/local/jr" ]; then \
 		PATH="/usr/local/jr/bin:$PATH" /usr/local/jr/bin/rake install; \
 	fi
-sisimai 5.6.0 built to pkg/sisimai-5.6.0-java.gem.
-sisimai (5.6.0) installed.
+sisimai 5.7.0 built to pkg/sisimai-5.7.0-java.gem.
+sisimai (5.7.0) installed.
 ```
 
 Usage
@@ -332,7 +333,8 @@ Output example
     "timezoneoffset": "+0900",
     "replycode": 550,
     "token": "84656774898baa90660be3e12fe0526e108d4473",
-    "toxic": false,
+    "bogus": -1,
+    "toxic": -1,
     "diagnostictype": "SMTP",
     "timestamp": 1650119685,
     "diagnosticcode": "host gmail-smtp-in.l.google.com[64.233.187.27] said: This mail has been blocked because the sender is unauthenticated. Gmail requires all senders to authenticate with either SPF or DKIM. Authentication results: DKIM = did not pass SPF [relay3.example.com] with ip: [192.0.2.22] = did not pass For instructions on setting up authentication, go to https://support.google.com/mail/answer/81126#authentication c2-202200202020202020222222cat.127 - gsmtp (in reply to end of DATA command)",
@@ -356,12 +358,12 @@ Beginning with v5.5.0, Sisimai requires **Ruby 2.5.0 or later.**
 | System requirements (CRuby)                          | 2.1 - 3.3.0        | **2.5** or later    |
 | System requirements (JRuby)                          | 9.0.4.0 - 9.1.17.0 | **9.2** or later    |
 | Callback feature for the original email file         | N/A                | Available[^3]       |
-| The number of MTA/ESP modules                        | 68                 | 60                  |
+| The number of MTA/ESP modules                        | 68                 | 61                  |
 | The number of detectable bounce reasons              | 29                 | 34                  |
 | Dependencies (Except Ruby Standard Gems)             | 1 gem              | 1 gem               |
-| Source lines of code                                 | 10,300 lines       | 9,700 lines         |
+| Source lines of code                                 | 10,300 lines       | 9,500 lines         |
 | Test frameworks                                      | rspec              | minitest            |
-| The number of tests in spec/ or test/ directory      | 311,000 tests      | 240,000 tests       | 
+| The number of tests in spec/ or test/ directory      | 311,000 tests      | 255,000 tests       | 
 | The number of bounce emails decoded/sec (CRuby)[^4]  | 620 emails         | 620 emails          |
 | License                                              | 2 Clause BSD       | 2 Caluse BSD        |
 | Commercial support                                   | Available          | Available           |
@@ -406,6 +408,7 @@ available at [LIBSISIMAI.ORG/EN/ENGINE](https://libsisimai.org/en/engine/)
 | Zoho (added at v5.5.0)                          | None                    | `Rhost::Zoho`       |
 | DragonFly Mail Agent (added at v5.1.0)          | None                    | `Lhost::DragonFly`  |
 | Mimecast (added at v5.5.0)                      | None                    | `Lhost::Mimecast`   |
+| DeutscheTelekom (added at v5.7.0)               | None               | `Lhost::DeutscheTelekom` |
 
 Bounce Reasons
 ---------------------------------------------------------------------------------------------------
@@ -436,10 +439,9 @@ Please use the [issue tracker](https://github.com/sisimai/rb-sisimai/issues) to
 
 Emails could not be decoded
 ---------------------------------------------------------------------------------------------------
-Bounce mails which could not be decoded by Sisimai are saved in the repository
-[set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet](https://github.com/sisimai/set-of-emails/tree/master/to-be-debugged-because/sisimai-cannot-parse-yet). 
-If you have found any bounce email cannot be decoded using Sisimai, please add the email into the
-directory and send Pull-Request to this repository.
+Bounce mails which could not be decoded by Sisimai are saved in
+[set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet](https://github.com/sisimai/rb-sisimai/tree/5-stable/set-of-emails/to-be-debugged-because/sisimai-cannot-parse-yet) directory. If you have found any bounce email cannot be decoded
+using Sisimai, please add the email into the directory and send Pull-Request to this repository.
 
 Other Information
 ===================================================================================================
@@ -456,7 +458,7 @@ Related Sites
 
 See also
 ---------------------------------------------------------------------------------------------------
-* [README-JA.md - README.md in Japanese(🇯🇵)](https://github.com/sisimai/rb-sisimai/blob/master/README-JA.md)
+* [README-JA.md - README.md in Japanese(🇯🇵)](https://github.com/sisimai/rb-sisimai/blob/5-stable/README-JA.md)
 * [RFC3463 - Enhanced Mail System Status Codes](https://tools.ietf.org/html/rfc3463)
 * [RFC3464 - An Extensible Message Format for Delivery Status Notifications](https://tools.ietf.org/html/rfc3464)
 * [RFC3834 - Recommendations for Automatic Responses to Electronic Mail](https://tools.ietf.org/html/rfc3834)

data/lib/sisimai/address.rb

@@ -147,8 +147,8 @@ module Sisimai
         # Check each characters
         if Delimiters[e]
           # The character is a delimiter character
-          if e == ','
-            # Separator of email addresses or not
+          case e
+          when "," # Separator of email addresses or not
             if v[:address].start_with?('<') && v[:address].end_with?('>') && v[:address].include?('@')
               # An email address has already been picked
               if readcursor & Indicators[:'comment-block'] > 0
@@ -168,11 +168,7 @@ module Sisimai
               # "Neko, Nyaan" <neko@nyaan.example.org> OR <"neko,nyaan"@example.org>
               p.empty? ? (v[:name] += e) : (v[p] += e)
             end
-            next
-          end # End of if(',')
-
-          if e == '<'
-            # <: The beginning of an email address or not
+          when "<" # <: The beginning of an email address or not
             if v[:address].size > 0
               p.empty? ? (v[:name] += e) : (v[p] += e)
             else
@@ -181,12 +177,7 @@ module Sisimai
               v[:address] += e
               p = :address
             end
-            next
-          end
-          # End of if('<')
-
-          if e == '>'
-            # >: The end of an email address or not
+          when ">" # >: The end of an email address or not
             if readcursor & Indicators[:'email-address'] > 0
               # <neko@example.org>
               readcursor &= ~Indicators[:'email-address']
@@ -196,11 +187,7 @@ module Sisimai
               # a comment block or a display name
               p.empty? ? (v[:name] == e) : (v[:comment] -= e)
             end
-            next
-          end # End of if('>')
-
-          if e == '('
-            # The beginning of a comment block or not
+          when "(" # The beginning of a comment block or not
             if readcursor & Indicators[:'email-address'] > 0
               # <"neko(nyaan)"@example.org> or <neko(nyaan)@example.org>
               if v[:address].include?('"')
@@ -228,11 +215,7 @@ module Sisimai
               v[:comment] += e
               p = :comment
             end
-            next
-          end # End of if('(')
-
-          if e == ')'
-            # The end of a comment block or not
+          when ")" # The end of a comment block or not
             if readcursor & Indicators[:'email-address'] > 0
               # <"neko(nyaan)"@example.org> OR <neko(nyaan)@example.org>
               if v[:address].include?('"')
@@ -255,11 +238,7 @@ module Sisimai
               v[:name] += e
               p = ''
             end
-            next
-          end # End of if(')')
-
-          if e == '"'
-            # The beginning or the end of a quoted-string
+          when '"' # The beginning or the end of a quoted-string
             if p.size > 0
               # email-address or comment-block
               v[p] += e
@@ -271,12 +250,10 @@ module Sisimai
               readcursor &= ~Indicators[:'quoted-string']
               p = ''
             end
-            next
-          end # End of if('"')
+          end # End of case-when
         else
           # The character is not a delimiter
           p.empty? ? (v[:name] += e) : (v[p] += e)
-          next
         end
       end
 

data/lib/sisimai/arf.rb

@@ -193,7 +193,7 @@ module Sisimai
               # X-Apple-Unsubscribe: true
               last if mhead["x-apple-unsubscribe"] != "true" || mhead["from"].include?('@') == false
               dscontents[0]["recipient"]    = mhead["from"]
-              dscontents[0]["diagnosis"]    = Sisimai::String.sweep(emailparts[0])
+              dscontents[0]["diagnosis"]    = emailparts[0]
               dscontents[0]["feedbacktype"] = "opt-out"
 
               # Addpend To: field as a pseudo header
@@ -214,14 +214,12 @@ module Sisimai
           end
           return nil if recipients == 0
 
-          anotherone = ": #{Sisimai::String.sweep(anotherone)}" if anotherone != ""
-          anotherone = anotherone.chop if anotherone[-1, 1] == ","
-
+          anotherone = ": #{anotherone.chop}" if anotherone != ""
           j = -1
           dscontents.each do |e|
             # Tidy up the error message in e.Diagnosis, Try to detect the bounce reason.
             j += 1
-            e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"] + anotherone)
+            e["diagnosis"] = e["diagnosis"] + anotherone
             e["reason"]    = "feedback"
             e["rhost"]     = remotehost
             e["lhost"]     = reportedby

data/lib/sisimai/fact.rb

@@ -20,6 +20,7 @@ module Sisimai
       :action,          # [String] The value of Action: header
       :addresser,       # [Sisimai::Address] From address
       :alias,           # [String] Alias of the recipient address
+      :bogus,           # [Integer] EXPERIMENTAL
       :catch,           # [?] Results generated by hook method
       :command,         # [String] The last SMTP command
       :decodedby,       # [String] MTA module name since v5.2.0
@@ -43,7 +44,7 @@ module Sisimai
       :timestamp,       # [Sisimai::Time] Date: header in the original message
       :timezoneoffset,  # [Integer] Time zone offset(seconds)
       :token,           # [String] Message token/MD5 Hex digest value
-      :toxic,           # [Boolean] EXPERIMENTAL
+      :toxic,           # [Integer] EXPERIMENTAL
     ]
     attr_accessor(*@@rwaccessors)
 
@@ -71,6 +72,7 @@ module Sisimai
       @alias          = argvs['alias'] || ''
       @addresser      = argvs['addresser']
       @action         = argvs['action']
+      @bogus          = argvs['bogus']
       @catch          = argvs['catch']
       @command        = argvs['command']
       @decodedby      = argvs['decodedby']
@@ -141,7 +143,6 @@ module Sisimai
           "replycode"      => e["replycode"],
           "rhost"          => e["rhost"],
           "decodedby"      => e["agent"],
-          "toxic"          => e["toxic"],
         }
 
         # EMAILADDRESS: Detect an email address from message/rfc822 part
@@ -344,7 +345,7 @@ module Sisimai
           p1 = dc.index('<html>')
           p2 = dc.index('</html>')
           piece['diagnosticcode'][p1, p2 + 7 - p1] = '' if p1 && p2
-          piece['diagnosticcode'] = Sisimai::String.sweep(piece['diagnosticcode'])
+          piece['diagnosticcode'] = piece['diagnosticcode'].split.join(" ")
         end
 
         if Sisimai::String.is_8bit(piece['diagnosticcode'])
@@ -357,8 +358,12 @@ module Sisimai
           piece["diagnostictype"] = "SMTP" if %w[feedback vacation].include?(piece["reason"]) == false
         end
 
-        # Check the value of SMTP command
+        # When "RCPT first" in the error message, set "RCPT" as the last command.
+        # - <<< 503 RCPT first (#5.5.1)
+        # - <<< 503-5.5.1 RCPT first. A mail transaction protocol command was issued ...
+        # -   RCPT first (in reply to DATA command)
         piece['command'] = '' if Sisimai::SMTP::Command.test(piece['command']) == false
+        piece['command'] = 'RCPT' if piece['diagnosticcode'].include?('RCPT first')
 
         # Create parameters for the constructor
         as = Sisimai::Address.new(piece['addresser'])          || next; next if as.void
@@ -379,13 +384,14 @@ module Sisimai
         ea.each { |q| thing[q] = piece[q] if thing[q].nil? || thing[q].empty? }
 
         # Other accessors
+        thing['bogus']          = 0
         thing['catch']          = piece['catch'] || nil
         thing["feedbackid"]     = ""
         thing['hardbounce']     = piece['hardbounce']
-        thing['toxic']          = piece['toxic']
         thing['replycode']      = Sisimai::SMTP::Reply.find(piece['diagnosticcode']) if thing['replycode'].empty?
         thing['timestamp']      = TimeModule.parse(::Time.at(piece['timestamp']).to_s)
         thing['timezoneoffset'] = piece['timezoneoffset'] || '+0000'
+        thing['toxic']          = 0
         ea.each { |q| thing[q] = piece[q] if thing[q].empty? }
 
         # ALIAS
@@ -483,44 +489,12 @@ module Sisimai
 
         # Feedback-ID: 1.us-west-2.QHuyeCQrGtIIMGKQfVdUhP9hCQR2LglVOrRamBc+Prk=:AmazonSES
         thing["feedbackid"] = rfc822data["feedback-id"] || ""
-        thing["toxic"]    ||= is_toxic(thing)
 
         listoffact << Sisimai::Fact.new(thing)
       end
       return listoffact
     end
 
-    def self.is_toxic(thing = nil)
-      return false unless thing
-      cr = thing['reason']         || 'undefined'
-      cv = thing['replycode']      || ''
-      cw = thing['deliverystatus'] || ''
-
-      # 1. Hard bounces or some soft bounces with a permanent error.
-      #   1-1. Hard bounce: UserUnknown, HostUnknown, HasMoved, NotAccept
-      #   1-2. Almost hard bounce: Suspend, Suppressed
-      return false if cv.start_with?('4') || cw.start_with?('4')
-      return true  if %w[userunknown hostunknown hasmoved notaccept suspend suppressed].any? { |a| cr == a }
-
-      if %w[mailboxfull filtered norelaying].any? { |a| cr == a }
-        # 2. Several softbounces: MailboxFull, Filtered, NoRelaying
-        #   2-1. The SMTP command is "RCPT" except "MailboxFull".
-        #   2-2. The SMTP reply code begins with "5" such as "550".
-        #   2-3. The SMTP status code is explicit code (not empty, not 5.9.***).
-        #   2-4. The SMTP status code begins with "5." such as "5.1.1".
-        return true  if cr != 'mailboxfull' && thing['command'] == "RCPT"
-        return true  if cv.start_with?('5')
-        return false if Sisimai::SMTP::Status.is_explicit(cw) == false
-        return true  if cw.start_with?('5.')
-
-      elsif cr == 'feedback'
-        # 3. Feedback Loop
-        #   3-1. The Feedback Type is any of "abuse", "fraud", "opt-out"
-        return true  if %w[abuse fraud opt-out].any? { |a| thing['feedbacktype'] == a }
-      end
-      return false
-    end
-
     # Create message token from addresser and recipient
     # @param  [String]  addr1 Sender address
     # @param  [String]  addr2 Recipient address
@@ -551,6 +525,7 @@ module Sisimai
         stringdata.each { |e| v[e] = self.send(e.to_sym) || '' }
         v['hardbounce'] = self.hardbounce
         v['toxic']      = self.toxic
+        v['bogus']      = self.bogus
         v['addresser']  = self.addresser.address
         v['recipient']  = self.recipient.address
         v['timestamp']  = self.timestamp.to_time.to_i

data/lib/sisimai/lhost/activehunter.rb

@@ -63,8 +63,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'TransWARE Active!hunter'; end

data/lib/sisimai/lhost/amazonses.rb

@@ -124,7 +124,8 @@ module Sisimai::Lhost
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
         whatnotify = jsonobject["notificationType"][0, 1] || ""
 
-        if whatnotify == "B"
+        case whatnotify
+        when "B"
           # "notificationType":"Bounce"
           p = jsonobject["bounce"]
           r = p["bounceType"] == "Permanent" ? "5" : "4"
@@ -137,7 +138,7 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
             v["recipient"] = e["emailAddress"]
-            v["diagnosis"] = Sisimai::String.sweep(e["diagnosticCode"])
+            v["diagnosis"] = e["diagnosticCode"]
             v["command"]   = Sisimai::SMTP::Command.find(v["diagnosis"])
             v["action"]    = e["action"]
             v["status"]    = Sisimai::SMTP::Status.find(v["diagnosis"], r)
@@ -152,8 +153,7 @@ module Sisimai::Lhost
             next if ReasonPair[f] != p["bounceSubType"]
             v["reason"] = f; break
           end
-
-        elsif whatnotify == "C"
+        when "C"
           # "notificationType":"Complaint"
           p = jsonobject["complaint"]
           p["complainedRecipients"].each do |e|
@@ -170,8 +170,7 @@ module Sisimai::Lhost
             v["diagnosis"]    = sprintf('"feedbackid":"%s", "useragent":"%s"}', p["feedbackId"], p["userAgent"])
             recipients += 1
           end
-
-        elsif whatnotify == "D"
+        when "D"
           # "notificationType":"Delivery"
           p = jsonobject["delivery"]
           p["recipients"].each do |e|
@@ -186,13 +185,12 @@ module Sisimai::Lhost
             v["action"]    = "delivered"
             v["date"]      = p["timestamp"]
             v["lhost"]     = Sisimai::RFC1123.find(p["reportingMTA"])
-            v["diagnosis"] = Sisimai::String.sweep(p["smtpResponse"])
+            v["diagnosis"] = p["smtpResponse"]
             v["command"]   = Sisimai::SMTP::Command.find(v["diagnosis"])
             v["status"]    = Sisimai::SMTP::Status.find(v["diagnosis"], "2")
             v["replycode"] = Sisimai::SMTP::Reply.find(v["diagnosis"], "2")
             recipients += 1
           end
-
         else
           # Unknown "notificationType" value
           warn sprintf(" ***warning: There is no notificationType field or unknown type of notificationType field")

data/lib/sisimai/lhost/apachejames.rb

@@ -103,7 +103,6 @@ module Sisimai::Lhost
           emailparts[1] += sprintf("Subject: %s\n", alternates[3]) if alternates[3] != ""
         end
 
-        dscontents.each { |e| e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"]) }
         return { "ds" => dscontents, "rfc822" => emailparts[1] }
       end
       def description; return 'Java Apache Mail Enterprise Server'; end

data/lib/sisimai/lhost/biglobe.rb

@@ -11,10 +11,6 @@ module Sisimai::Lhost
         message: ['   ----- The following addresses had delivery problems -----'],
         error:   ['   ----- Non-delivered information -----'],
       }.freeze
-      MessagesOf = {
-        'filtered'    => ['Mail Delivery Failed... User unknown'],
-        'mailboxfull' => ["The number of messages in recipient's mailbox exceeded the local limit."],
-      }.freeze
 
       # @asbtract Decodes the bounce message from Biglobe
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -76,18 +72,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
-
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'BIGLOBE: https://www.biglobe.ne.jp'; end