ishapi 0.1.8.303 → 0.1.8.305

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb042effc76a3bac981e7d95c5ccbac9c1fe067b5afb6799f273a2fb061ba67
-  data.tar.gz: a497b8b725895391c965abe2680adb51d739958ca36172615263aa3fd6b83703
+  metadata.gz: fc372746027421f9ac7c60e85da6d38c0032e9a8070a8ae3d43e360406896fba
+  data.tar.gz: c55c1545c1f1dd9fb02933362c60129c3856831250e8855042edb3a1eb9260b2
 SHA512:
-  metadata.gz: 206d685ea05a79c226a49d888e1ba2ced49e5ff32343999fe1a00e42c65eb8f139e17cc1dcb2bd6d0e7acbb83c257ef55205d75f318631c353a3aef22b6db143
-  data.tar.gz: ceebf0b9f54feb97eeac59cc655d65c12fc10957431d4821bf472e18822d97d80be31b0407f914a2a94e63119c62a5cf8a743e9f96556f088c481e90fbad3eff
+  metadata.gz: cd966429e4ddadd59d1464c3fb93161d5f232db3045a3af8b474bf8d56275f689745c509360b6ab42e5a11ac50d693c73ea4c99b21b0acd07b8723b05b4d2bdb
+  data.tar.gz: 108f40bb94ade6afededba38d9c0e9edef891b2e746bb16108a8719669d056e1b6b40d5bb3a21289ed8dac022c73c3015a7bc796596678b8c1db105e4948750b

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -10,11 +10,15 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
   queue_as :default
 
 =begin
-  object_key = 'bg57j6u0j38b5ts86635fkqtjlucn5tvrm2hea81'
+
+  object_key = 'n0v5mg6q1t4fjjnfh8vj8a96t85rp9la2ud0gdg1'
   MsgStub.where({ object_key: object_key }).delete
 
-  stub = MsgStub.create({ object_key: object_key })
+  stub = MsgStub.create!({ object_key: object_key })
   id = stub.id
+
+  Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
+
 =end
   def perform id
       stub = ::Office::EmailMessageStub.find id
@@ -25,14 +29,15 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         raise "This stub has already been processed: #{stub.id.to_s}."
         return
       end
+
       client = Aws::S3::Client.new({
         region:            ::S3_CREDENTIALS[:region_ses],
         access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
         secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
       })
 
-      _mail              = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
-      the_mail           = Mail.new(_mail)
+      raw                = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
+      the_mail           = Mail.new( raw )
       message_id         = the_mail.header['message-id'].decoded
       in_reply_to_id     = the_mail.header['in-reply-to']&.to_s
       email_inbox_tag_id = WpTag.emailtag(WpTag::INBOX).id
@@ -47,7 +52,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
       @message   = ::Office::EmailMessage.where( message_id: message_id ).first
       @message ||= ::Office::EmailMessage.create({
-        raw: _mail,
+        raw: raw,
 
         message_id:     message_id,
         in_reply_to_id: in_reply_to_id,
@@ -70,13 +75,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         # bccs: the_mail.bcc,
       })
       if !@message.persisted?
-        puts! @message.errors.full_messages, "Could not create email_message"
-      end
-      if the_mail.body.preamble.present?
-        @message.preamble = the_mail.body.preamble
-      end
-      if the_mail.body.epilogue.present?
-        @message.epilogue = the_mail.body.epilogue
+        throw "Could not create email_message: #{@message.errors.full_messages.join(', ')} ."
       end
 
       ## Parts
@@ -93,29 +92,32 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         elsif the_mail.content_type.blank?
           @message.part_txt = body
         else
-          throw "mail body of unknown type: #{the_mail.content_type}"
+          @message.logs.push "mail body of unknown type: #{the_mail.content_type}"
         end
       end
 
       ## Attachments
       the_mail.attachments.each do |att|
-        photo = Photo.new({
-          content_type:      att.content_type.split(';')[0],
-          original_filename: att.content_type_parameters[:name],
-          image_data:        att.body.encoded,
-          email_message_id: @message.id,
-        })
-        photo.decode_base64_image
-        if photo.save
-          ;
-        else
+        content_type = att.content_type.split(';')[0]
+        if content_type.include? 'image'
+          photo = Photo.new({
+            content_type:      content_type,
+            original_filename: att.content_type_parameters[:name],
+            image_data:        att.body.encoded,
+            email_message_id: @message.id,
+          })
+          photo.decode_base64_image
+          photo.save
+        elsif att.filename
           attachment = Office::EmailAttachment.new({
-            content:       att.decoded,
+            content:       att.body.decoded,
             content_type:  att.content_type,
             email_message: @message,
             filename:      att.filename,
           })
           attachment.save
+        else
+          @message.logs.push "Could not save an attachment!"
         end
       end
 
@@ -152,6 +154,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         state:       Conv::STATE_UNREAD,
         latest_at:   the_mail.date || Time.now.to_datetime,
         from_emails: ( conv.from_emails + the_mail.from ).uniq,
+        preview: @message.body_sanitized[0...200],
       })
       conv.add_tag( ::WpTag::INBOX )
       conv_lead_tie = Office::EmailConversationLead.find_or_create_by({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.303
+  version: 0.1.8.305
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails