ishapi 0.1.8.270 → 0.1.8.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e40debbf51442f7426b3fa9b4a700af10766bd23635a0116c78c85bbfcd6027
-  data.tar.gz: 23bce39fcda81bcb65fbec51cff028488156ad4ef6f9d33d30cf368604065c82
+  metadata.gz: 4a9b5821802e8c966adddf0709fd2ffc3e3bb45dd1530630498480b3a79fc542
+  data.tar.gz: 73c04826bb8d276cd691989bb12c2ff4254b53de47cc05eb08b340517fe75783
 SHA512:
-  metadata.gz: 8cc8ff05edd80990587fc0e7b001ba35d5e5af9b89fdc788b260ea67f9729e0e1556339f7ccb85c6c63650abd5a0c7e662b2ca62273cd34f16ca3b26fc07249b
-  data.tar.gz: 31a5b803706e621d22ac2afff46c6aefa14b4a0a5493a29f4c2765ff52c5c6449b3122665fedcbc83ba3560fa815f808b757e7c6d121189bb87c3927c4a4c9d3
+  metadata.gz: 84f98f56355046723fa4b7eb2d6d7737b9885647ec5f6f29bdf62ed9ff48c14418451c06096243ec57e0f9d8887a713b5276c07a1ba87a5ae1bae2a20042924f
+  data.tar.gz: c1bb78d47ccd0594eb8720fad830ea1f9c29e0d9f298ebc7753d3d47712bb09630832113fd51e76692322ef548bdc5e1a3e4c4da62093a3cdbcc6a490d31c2c9

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -127,6 +127,11 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       end
     end
 
+    ## Leadset, Lead
+    domain  = @message.from.split('@')[1]
+    leadset = Leadset.find_or_create_by( company_url: domain )
+    lead    = Lead.find_or_create_by( email: @message.from, m3_leadset_id: leadset.id )
+
     ## Conversation
     if in_reply_to_id
       in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
@@ -145,44 +150,33 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         subject: the_mail.subject,
       })
     end
-    @message.email_conversation_id = conv.id
+    @message.update_attributes({ email_conversation_id: conv.id })
     conv.update_attributes({
-      state: Conv::STATE_UNREAD,
+      state:     Conv::STATE_UNREAD,
       latest_at: the_mail.date || Time.now.to_datetime,
+      lead_ids:  conv.lead_ids.push( lead.id ).uniq,
       wp_term_ids: ( [ email_inbox_tag_id ] + conv.wp_term_ids + stub.wp_term_ids ).uniq,
     })
 
-    ## Leadset
-    domain = @message.from.split('@')[1]
-    leadset = Leadset.find_or_create_by( company_url: domain )
-
-    ## Lead
-    lead = Lead.find_or_create_by( email: @message.from, m3_leadset_id: leadset.id )
-    conv.lead_ids = conv.lead_ids.push( lead.id ).uniq
-
     ## Actions & Filters
     email_filters = Office::EmailFilter.active
     email_filters.each do |filter|
-      if ( filter.from_regex.blank? ||     @message.from.match(      filter.from_regex ) ) &&
-         ( filter.body_regex.blank? ||     @message.part_html.match( filter.body_regex ) ) &&
-         ( filter.subject_regex.blank? ||  @message.subject.match(   filter.subject_regex ) )
+      if ( filter.from_regex.blank? ||     @message.from.match(             filter.from_regex    ) ) &&
+         ( filter.from_exact.blank? ||     @message.from.downcase.include?( filter.from_exact    ) ) &&
+         ( filter.body_exact.blank? ||     @message.part_html.include?(     filter.body_exact    ) ) &&
+         ( filter.subject_regex.blank? ||  @message.subject.match(          filter.subject_regex ) ) &&
+         ( filter.subject_exact.blank? ||  @message.subject.include?(       filter.subject_exact ) )
+
         # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
 
         @message.apply_filter( filter )
       end
     end
 
-    ## Save to exit
-    flag = @message.save
-    # if flag
-    #   puts! @message.message_id, 'Saved this message'
-    # else
-    #   puts! @message.errors.full_messages.join(', '), 'Cannot save email_message'
-    # end
-    conv.save
     stub.update_attributes({ state: ::Office::EmailMessageStub::STATE_PROCESSED })
 
     ## Notification
+    conv.reload
     if conv.wp_term_ids.include?( email_inbox_tag_id )
       out = ::Ishapi::ApplicationMailer.forwarder_notify( @message.id.to_s )
       Rails.env.production? ? out.deliver_later : out.deliver_now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.270
+  version: 0.1.8.272
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails