ishapi 0.1.8.298 → 0.1.8.301

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c64b331e6a7707a42488a92ee911239c17f4d4d161ef0c416e77d6a2e5ae345
-  data.tar.gz: 64b8e6bf17bdb026194be3b3018d1eb3d53288b8574da59687db21ca8c0907c2
+  metadata.gz: e6229aa67b706172dea159f73ff6f5e45d9281c8cb64b9de70e384995f1a869c
+  data.tar.gz: af1216cc0d2d17bcb6a6e6b00e977e7b8ebca3768c6db71c7cd2568a3c21a4cf
 SHA512:
-  metadata.gz: 370a87f0676d5ecc97008db8973602faf0f5a20558fe97f51d30c525efea99d859e506ce5d8ebb1c61422c1f2b8b02b45cab0ef95314354485bef95fa1f2b732
-  data.tar.gz: 3a30529de7eee80030dde9274b7a738c1445b45571e1976dc84502d9d7771b1994bca04356482511d25e16c9148b512b9ed657a287ee72425bac078f288ee3eb
+  metadata.gz: d16c460663a76a261be7a0ad5b29483cd71c800632bc990b5590206c8315aafea77abbb9b2ba65b8916ad3483e250cb019eeb6d3e22762a19389f1b4be775237
+  data.tar.gz: 9580c4aea9c855f492087492bbc266eb5db78344d6d966fdb929bd45157d5bbfe868d0f473594f579eed7cee33dd47eebd1c04d26a3c025ea75dc6c9ae7f56b2

data/app/controllers/ishapi/email_conversations_controller.rb

@@ -14,6 +14,7 @@ module Ishapi
       convos = Office::EmailConversation.find params[:ids]
       outs = convos.map do |convo|
         convo.add_tag( params[:emailtag] )
+        convo.remove_tag( WpTag::INBOX ) if params[:is_move]
       end
       flash[:notice] = "outcome: #{outs}"
       render json: { status: :ok }

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -20,6 +20,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
   # "multipart/alternative; boundary=_000_BL0PR10MB2913C560ADE059F0AB3A6D11829A9BL0PR10MB2913namp_",
   # "text/html; charset=utf-8"
   # "text/plain; charset=UTF-8"
+  # "text/calendar; charset=utf-8; method=REQUEST"
   def churn_subpart message, part
     if part.content_disposition&.include?('attachment')
       ## @TODO: attachments !
@@ -31,15 +32,33 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         part.parts.each do |subpart|
           churn_subpart( message, subpart )
         end
+      else
+        attachment = Office::EmailAttachment.new({
+          content:       part.decoded,
+          content_type:  part.content_type,
+          email_message: message,
+        })
+        attachment.save
 
-      elsif part.content_type.include?('text/html')
-        message.part_html = part.decoded
+        if part.content_type.include?('text/html')
+          message.part_html = part.decoded
 
-      elsif part.content_type.include?("text/plain")
-        message.part_txt = part.decoded
+        elsif part.content_type.include?("text/plain")
+          message.part_txt = part.decoded
 
-      else
-        puts! part.content_type, '444 No action for a part with this content_type'
+        elsif part.content_type.include?("text/calendar")
+          ;
+        elsif part.content_type.include?("application/pdf")
+          ;
+        elsif part.content_type.include?("image/jpeg")
+          ;
+        elsif part.content_type.include?("image/png")
+          ;
+
+        else
+          puts! part.content_type, '444 No action for a part with this content_type'
+
+        end
       end
     end
   end
@@ -96,8 +115,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     subject ||= '(wco no subject)'
 
     @message   = ::Office::EmailMessage.where( message_id: message_id ).first
-    @message ||= ::Office::EmailMessage.new
-    @message.assign_attributes({
+    @message ||= ::Office::EmailMessage.create({
       raw: _mail,
 
       message_id:     message_id,
@@ -109,7 +127,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       subject: subject,
       date:    the_mail.date,
 
-      from:  the_mail.from ? the_mail.from[0] : "nobody@unknown.domain",
+      from:  the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in",
       froms: the_mail.from,
 
       to:  the_mail.to ? the_mail.to[0] : nil,
@@ -120,6 +138,9 @@ 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
@@ -161,6 +182,11 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     domain  = @message.from.split('@')[1] rescue 'unknown.domain'
     leadset = Leadset.find_or_create_by( company_url: domain )
     lead    = Lead.find_or_create_by( email: @message.from, m3_leadset_id: leadset.id )
+    the_mail.cc&.each do |cc|
+      domain  = cc.split('@')[1] rescue 'unknown.domain'
+      leadset = Leadset.find_or_create_by( company_url: domain )
+      Lead.find_or_create_by( email: cc, m3_leadset_id: leadset.id )
+    end
 
     ## Conversation
     if in_reply_to_id
@@ -182,9 +208,9 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     end
     @message.update_attributes({ email_conversation_id: conv.id })
     conv.update_attributes({
-      state:     Conv::STATE_UNREAD,
-      latest_at: the_mail.date || Time.now.to_datetime,
-      from_emails: conv.from_emails + the_mail.from,
+      state:       Conv::STATE_UNREAD,
+      latest_at:   the_mail.date || Time.now.to_datetime,
+      from_emails: ( conv.from_emails + the_mail.from ).uniq,
     })
     conv.add_tag( ::WpTag::INBOX )
     conv_lead_tie = Office::EmailConversationLead.find_or_create_by({

data/app/jobs/ishapi/email_message_intake_job.rb-todo

@@ -0,0 +1,6 @@
+
+    ## Lead
+    lead    = Lead.create( email: @message.from )
+    the_mail.cc&.each do |cc|
+      lead    = Lead.create( email: cc )
+    end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.298
+  version: 0.1.8.301
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,6 +241,7 @@ files:
 - app/helpers/ishapi/application_helper.rb
 - app/jobs/ishapi/application_job.rb
 - app/jobs/ishapi/email_message_intake_job.rb
+- app/jobs/ishapi/email_message_intake_job.rb-todo
 - app/mailers/ishapi/application_mailer.rb
 - app/mailers/ishapi/confirmations_mailer.rb
 - app/models/ishapi/ability.rb