ishapi 0.1.8.285 → 0.1.8.286

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76230270153711c6dff30ead344469cd8df42e084832e931351a291879ea3557
-  data.tar.gz: 361989859dd3015a7d93de1348301e4038b5709adac5736c22820e7d413fdaa4
+  metadata.gz: f5c0832ec3c2109607e7d612d9daf38dbff6e2b710879710f71e358ed5304ea3
+  data.tar.gz: e2ad530fe9863aa53e532b1e37ab628a179b49da40a5edb31fd4c0abe080e721
 SHA512:
-  metadata.gz: 60e0f42fa6405907798a1cd4d24633059768206fd26203101099cf3b1e8bba2f9bc089a318f7b2112fbfbe1432a88563a0e80126b1e17f97b9243d73d414dd1e
-  data.tar.gz: ccd7a99f503e51818998b2629bd7bd8f02b365db37a942550c9129bdf2c92e4b8bd8d9ebd54e085a3331f5fb292f57b1576f33cf785d141609a54e221d3e3487
+  metadata.gz: 15b2df35cdc3dde6cece928bdf20427f4603b82de04e52cb9ca901ba1ebade45d338487d80de8013f87fc3a9225158d6ee46dafdf041bcfdd0f003cee23fc46d
+  data.tar.gz: 6cdaba9a607c484cff7a481e2edbe50071a3ec3ea3881392487f8406f85a0bebacfda86842a2bb83ed6297692d9a509a64dcad54f66cc2ec338076e83e5b36c1

data/app/controllers/ishapi/galleries_controller.rb

@@ -7,7 +7,7 @@ module Ishapi
     before_action :check_jwt
 
     def index
-      @galleries = Gallery.all.public
+      @galleries = Gallery.all.published
       authorize! :index, Gallery
       if params[:domain]
         @site = Site.find_by( :domain => params[:domain], :lang => 'en' )

data/app/controllers/ishapi/videos_controller.rb

@@ -9,7 +9,7 @@ module Ishapi
 
     def index
       authorize! :index, Video
-      @videos = Video.all.public
+      @videos = Video.all.published
       @videos = @videos.page( params[:videos_page] ).per( 10 )
     end
 

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -1,15 +1,12 @@
 
 ##
 ## 2023-02-26 _vp_ Let's go
-## 2023-03-02 _vp_ Continue
 ## 2023-03-07 _vp_ Continue
 ##
 ## class name: EIJ
 ##
 class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
-  # include Sidekiq::Worker ## From: https://stackoverflow.com/questions/59114063/sidekiq-options-giving-sidekiqworker-cannot-be-included-in-an-activejob-for
-
   queue_as :default
 
   ## For recursive parts of type `related`.
@@ -59,7 +56,8 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     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] })
+      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)
@@ -71,7 +69,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       the_mail.to = [ 'NO-RECIPIENT' ]
     end
 
-    @message = ::Office::EmailMessage.where( message_id: message_id ).first
+    @message   = ::Office::EmailMessage.where( message_id: message_id ).first
     @message ||= ::Office::EmailMessage.new
     @message.assign_attributes({
       raw: _mail,
@@ -101,21 +99,11 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       @message.epilogue = the_mail.body.epilogue
     end
 
+    ## Parts
     the_mail.parts.each do |part|
       churn_subpart( @message, part )
     end
 
-    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
-      photo.save
-    end
-
     if the_mail.parts.length == 0
       body = the_mail.body.decoded.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
       if the_mail.content_type.include?('text/html')
@@ -127,6 +115,18 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       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
+      photo.save
+    end
+
     ## Leadset, Lead
     domain  = @message.from.split('@')[1]
     leadset = Leadset.find_or_create_by( company_url: domain )
@@ -154,9 +154,10 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     conv.update_attributes({
       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,
+      lead_ids:  conv.lead_ids.push( lead.id ).uniq, ## @TODO: change, this is an association now
+      # wp_term_ids: ( [ email_inbox_tag_id ] + conv.wp_term_ids + stub.wp_term_ids ).uniq,
     })
+    conv.add_tag( ::WpTag::INBOX )
 
     ## Actions & Filters
     email_filters = Office::EmailFilter.active
@@ -169,15 +170,15 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
         # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
 
-        @message.apply_filter( filter )
+        conv.apply_filter( filter )
       end
     end
 
     stub.update_attributes({ state: ::Office::EmailMessageStub::STATE_PROCESSED })
 
     ## Notification
-    conv.reload
-    if conv.wp_term_ids.include?( email_inbox_tag_id )
+    conv = Conv.find( conv.id )
+    if conv.in_emailtag? WpTag::INBOX
       out = ::Ishapi::ApplicationMailer.forwarder_notify( @message.id.to_s )
       Rails.env.production? ? out.deliver_later : out.deliver_now
     end

data/app/views/ishapi/application_mailer/forwarder_notify.html.erb

@@ -1,2 +1,15 @@
 
-FWD_Notify: No content
+<ul>
+  <li><b>From:</b> <%=          @msg.from %></li>
+  <li><b>To:</b> <%=            @msg.to %></li>
+  <li><b>Subject:</b> <%=       @msg.subject %></li>
+  <li><b>Date:</b> <%=          @msg.date %></li>
+  <li><b>N Attachments:</b> <%= @msg.attachments.length %></li>
+</ul>
+
+<%= raw @msg.part_html %>
+
+<hr />
+
+<%= raw @msg.part_txt %>
+

data/lib/ishapi.rb

@@ -1,8 +1,8 @@
 
-require "ishapi/engine"
 require 'cancancan'
-require 'kaminari/mongoid'
+require "ishapi/engine"
 require 'kaminari/actionview'
+require 'kaminari/mongoid'
 
 module Ishapi
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.285
+  version: 0.1.8.286
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails