Mime decode improvement for issue 130

lib/sisimai/bite/email/activehunter.rb

@@ -93,6 +93,7 @@ def scan(mhead, mbody)
               #  ----- Transcript of session follows -----
               # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
               next unless e =~ /\A[0-9A-Za-z]+/
+              next unless v['diagnosis'].empty?
               v['diagnosis'] = e
             end
           end

lib/sisimai/bite/email/apachejames.rb

@@ -11,7 +11,7 @@ class << self
         # apache-james-2.3.2/src/java/org/apache/james/transport/mailets/
         #   AbstractNotify.java|124:  out.println("Error message below:");
         #   AbstractNotify.java|128:  out.println("Message details:");
-        message: ['Content-Disposition: inline'],
+        message: [''],
         rfc822:  ['Content-Type: message/rfc822'],
         error:   ['Error message below:'],
       }.freeze
@@ -46,7 +46,7 @@ def scan(mhead, mbody)
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         diagnostic = ''     # (String) Alternative diagnostic message
         subjecttxt = nil    # (String) Alternative Subject text
-        gotmessage = -1     # (Integer) Flag for error message
+        gotmessage = nil    # (Boolean) Flag for error message
         v = nil
 
         while e = hasdivided.shift do
@@ -108,14 +108,14 @@ def scan(mhead, mbody)
               #   Subject: Nyaaan
               subjecttxt = cv[1]
             else
-              next if gotmessage == 1
+              next if gotmessage
               if v['diagnosis']
                 # Get an error message text
                 if e.start_with?('Message details:')
                   # Message details:
                   #   Subject: nyaan
                   #   ...
-                  gotmessage = 1
+                  gotmessage = true
                 else
                   # Append error message text like the followng:
                   #   Error message below:
@@ -126,6 +126,10 @@ def scan(mhead, mbody)
                 # Error message below:
                 # 550 - Requested action not taken: no such user here
                 v['diagnosis'] = e if e == StartingOf[:error][0]
+                unless gotmessage
+                  v['diagnosis'] ||= ''
+                  v['diagnosis'] << ' ' + e
+                end
               end
             end
           end

lib/sisimai/bite/email/gsuite.rb

@@ -167,6 +167,7 @@ def scan(mhead, mbody)
                   if anotherset['diagnosis']
                     # Continued error messages from the previous line like
                     # "550 #5.1.0 Address rejected."
+                    next if e =~ /\AContent-Type:/
                     next if emptylines > 5
                     if e.empty?
                       # Count and next()

lib/sisimai/bite/email/interscanmss.rb

@@ -9,7 +9,7 @@ class << self
 
       Indicators = Sisimai::Bite::Email.INDICATORS
       StartingOf = {
-        message: ['Content-type: text/plain'],
+        message: [''],
         rfc822:  ['Content-type: message/rfc822'],
       }.freeze
 

lib/sisimai/data.rb

@@ -94,7 +94,6 @@ def self.make(data: nil, **argvs)
       return nil unless data.is_a? Sisimai::Message
 
       messageobj = data
-      mailheader = data.header
       rfc822data = messageobj.rfc822
       fieldorder = { :recipient => [], :addresser => [] }
       objectlist = []
@@ -218,7 +217,7 @@ def self.make(data: nil, **argvs)
         next unless p['timestamp']
 
         # OTHER_TEXT_HEADERS:
-        recvheader = mailheader['received'] || []
+        recvheader = data.header['received'] || []
         unless recvheader.empty?
           # Get localhost and remote host name from Received header.
           %w[lhost rhost].each { |a| e[a] ||= '' }

lib/sisimai/message/email.rb

@@ -29,7 +29,6 @@ class Email
       DefaultSet = Sisimai::Order::Email.another
       SubjectTab = Sisimai::Order::Email.by('subject')
       ExtHeaders = Sisimai::Order::Email.headers
-      ReEncoding = Sisimai::MIME.patterns
 
       # Make data structure from the email message(a body part and headers)
       # @param         [Hash] argvs   Email data
@@ -416,19 +415,10 @@ def self.parse(argvs)
           end
         else
           # NOT text/plain
-          lowercased = bodystring.downcase
-          if lowercased =~ ReEncoding[:'quoted-print']
-            # Content-Transfer-Encoding: quoted-printable
-            bodystring = Sisimai::MIME.qprintd(bodystring, mailheader)
-          end
-
-          if lowercased =~ ReEncoding[:'7bit-encoded'] &&
-             cv = lowercased.match(ReEncoding[:'some-iso2022'])
-            # Content-Transfer-Encoding: 7bit
-            # Content-Type: text/plain; charset=ISO-2022-JP
-            if ! cv[1].include?('us-ascii') && ! cv[1].include?('utf-8')
-              bodystring = Sisimai::String.to_utf8(bodystring, cv[1])
-            end
+          if mesgformat.start_with?('multipart/')
+            # In case of Content-Type: multipart/*
+            p = Sisimai::MIME.makeflat(mailheader['content-type'], bodystring)
+            bodystring = p unless p.empty?
           end
         end