ishapi 0.1.8.212 → 0.1.8.214

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c3500f2e50223b7bc089de1bf280c53b6cd968102cb61ea0bcedd2bf0f648a6
-  data.tar.gz: 75add24a2036cc8914de62d640de0138078cfb8f7915fdbc41d5b2fa446f2af5
+  metadata.gz: 58df7355b06e137c32c5c076108df226222315a82816ee0ffa2db20014eb93af
+  data.tar.gz: 5d901f1a635f0756cdc49e8113faa20c84374f5d6d2d4e545979e7f99fb53399
 SHA512:
-  metadata.gz: b33e86d8941cedb14780cfe3ae24f15b7648f0f7a5750789e4d2dcd3fa903b553f1d49bd7cf0bf79243ebbed5f3eedfcb1dd200835a2ad1db2419409f93e42d9
-  data.tar.gz: 3c085cd337ecd508f64e7633eb2eb878386889f90cef51415f3fef68d2c81fa910d6b4a5d5fa81b248054a66751b5a331f500bd007d9b437a45e7035139ab3e7
+  metadata.gz: 64f74a5d1fa78d4a6581fa023dfc8a9918423870659a2ffdbd1e8978c5346a0a2f78ac525ecd023f0bc9e6776cda06eefecaf042d6810f6c07f1dbbc786aefb1
+  data.tar.gz: f4201ad33e8703999bc6bf96e8b5f31cf16c6d2993065b1287d73075a5e56100f98715ef220e2dc06c0ff115414bc8e5613081b3203c0544fd0b3bb711024f3a

data/app/assets/javascripts/ishapi/application.js

@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+// require_tree . // nothing
+//

data/app/controllers/ishapi/email_conversations_controller.rb

@@ -0,0 +1,20 @@
+
+require_dependency "ishapi/application_controller"
+
+# gem_dir = Gem::Specification.find_by_name("ish_models").gem_dir
+# require "#{gem_dir}/lib/office/email_conversation"
+
+module Ishapi
+  class EmailConversationsController < ApplicationController
+
+    before_action :check_jwt
+
+    def delete
+      puts! params, 'deleting email conversations'
+      authorize! :email_conversations_delete, ::Ishapi
+      convos = Office::EmailConversation.find params[:ids]
+      convos.map &:destroy
+    end
+
+  end
+end

data/app/controllers/ishapi/email_messages_controller.rb

@@ -4,17 +4,29 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class EmailMessagesController < ApplicationController
 
+    before_action :check_jwt, only: [ :show ]
+
+    def show
+      msg = Office::EmailMessage.find( params[:id] )
+      authorize! :email_messages_show, ::Ishapi
+      render json: {
+        item: msg,
+      }
+    end
+
+    ## From lambda, ses
     def receive
       if params[:secret] != AWS_SES_LAMBDA_SECRET
         render status: 400, json: { status: 400 }
         return
       end
 
-      msg = Office::EmailMessage.new({
+      msg = Office::EmailMessageStub.new({
         object_path: params[:object_path],
-        object_key: params[:object_key],
+        object_key:  params[:object_key],
       })
       if msg.save
+        ::Ishapi::EmailMessageIntakeJob.perform_later( msg.id.to_s )
         render status: :ok, json: { status: :ok }
       else
         render status: 400, json: { status: 400 }

data/app/controllers/ishapi/leadsets_controller.rb

@@ -3,9 +3,11 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class LeadsetsController < ApplicationController
 
+    load_and_authorize_resource
 
     def destroy
       puts! params, 'params'
+      authorize! :leadsets_destroy, ::Ishapi
 
       leadsets = Leadset.find( params[:leadset_ids] )
       @results = []

data/app/controllers/ishapi/users/sessions_controller.rb

@@ -7,7 +7,7 @@ class Ishapi::Users::SessionsController < Devise::SessionsController
     set_flash_message!(:notice, :signed_in)
     sign_in(resource_name, resource)
     yield resource if block_given?
-    # respond_with resource, location: after_sign_in_path_for(resource)
+
 
     ## Send the jwt to client
     @current_user = resource

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -0,0 +1,170 @@
+
+=begin
+
+m_id_2 = "2021-07-12T19_17_26Fpedidos_jmc2_gmail_com"
+stub = Stub.new( object_key: m_id_2 )
+stub = Stub.find_by( object_key: m_id_2 )
+stub.update_attribute(:state, 'state_pending')
+Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
+
+
+=end
+##
+## 2023-02-26 _vp_ let's go
+## 2023-03-02 _vp_ Continue
+## 2023-03-07 _vp_ Continue
+##
+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`.
+  ## Content Types:
+  # "text/html; charset=utf-8"
+  # "application/pdf; name=\"Securities Forward Agreement -- HaulHub Inc -- Victor Pudeyev -- 2021-10-26.docx.pdf\""
+  # "image/jpeg; name=TX_DL_2.jpg"
+  # "text/plain; charset=UTF-8"
+  def churn_subpart message, part
+    if part.content_type.include?("multipart/related")
+
+      part.parts.each do |subpart|
+        churn_subpart( message, subpart )
+      end
+
+    elsif part.content_type.include?('text/html')
+      message.part_html = part.decoded
+
+    elsif part.content_type.include?("text/plain")
+      message.part_txt = part.decoded
+
+    else
+      ## @TODO: attachments !
+      puts! part.content_type, '444 No action for a part with this content_type'
+    end
+
+    return nil
+  end
+
+  def perform id
+    stub = ::Office::EmailMessageStub.find id
+    puts "Performing EmailMessageIntakeJob for message_id #{stub.object_key}"
+    if stub.state != ::Office::EmailMessageStub::STATE_PENDING
+      raise "This stub has already been processed: #{stub.id.to_s}."
+      return
+    end
+    client = Aws::S3::Client.new({
+      region:            ::S3_CREDENTIALS[:region],
+      access_key_id:     ::S3_CREDENTIALS[:access_key_id],
+      secret_access_key: ::S3_CREDENTIALS[:secret_access_key] })
+
+    _mail          = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
+    the_mail       = Mail.new(_mail)
+    message_id     = the_mail.header['message-id'].decoded ## == stub.object_key
+    in_reply_to_id = the_mail.header['in-reply-to']&.to_s
+
+    @message = ::Office::EmailMessage.where( message_id: message_id ).first
+    @message ||= ::Office::EmailMessage.new
+    @message.assign_attributes({
+      raw: _mail,
+
+      message_id:     message_id,
+      in_reply_to_id: in_reply_to_id,
+
+      object_key:  stub.object_key,
+      object_path: stub.object_path,
+
+      subject: the_mail.subject,
+      date:    the_mail.date,
+
+      from:  the_mail.from[0],
+      froms: the_mail.from,
+
+      to:  the_mail.to[0],
+      tos: the_mail.to,
+
+      ccs:  the_mail.cc,
+      bccs: the_mail.bcc,
+    })
+
+    the_mail.parts.each do |part|
+      churn_subpart( @message, part )
+    end
+
+    ## Conversation
+    if in_reply_to_id
+      in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
+      if !in_reply_to_msg
+        conv = ::Office::EmailConversation.create!({
+          subject: the_mail.subject,
+          latest_at: the_mail.date,
+        })
+        in_reply_to_msg = ::Office::EmailMessage.create!({
+          message_id: in_reply_to_id,
+          email_conversation_id: conv.id,
+        })
+      end
+      conv = in_reply_to_msg.email_conversation
+    else
+      conv = ::Office::EmailConversation.create!({
+        subject: the_mail.subject,
+        latest_at: the_mail.date,
+      })
+    end
+    @message.email_conversation_id = conv.id
+    conv.update_attributes({
+      state: Conv::STATE_UNREAD,
+      latest_at: the_mail.date,
+      term_ids: (conv.term_ids + stub.term_ids).uniq,
+    })
+
+    ## Leadset
+    domain = @message.from.split('@')[1]
+    leadset = Leadset.where( company_url: domain ).first
+    if !leadset
+      leadset = Leadset.create!( company_url: domain, name: domain )
+    end
+
+    ## Lead
+    lead = Lead.where( email: @message.from ).first
+    if !lead
+      lead = Lead.new( email: @message.from )
+      lead.leadsets.push( leadset )
+      lead.save!
+    end
+    conv.lead_ids = conv.lead_ids.push( lead.id ).uniq
+
+    ## Actions & Filters
+    inbox_tag = WpTag.email_inbox_tag
+    @message.add_tag( inbox_tag )
+    conv.add_tag( inbox_tag )
+
+    email_filters = Office::EmailFilter.active
+    email_filters.each do |filter|
+      if @message.from.match( filter.from_regex ) # || @message.part_html.match( filter.body_regex ) ) # || 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
+    if @message.wp_term_ids.include?( inbox_tag.id )
+      # @TODO: send android notification _vp_ 2023-03-01
+      ::Ishapi::ApplicationMailer.forwarder_notify( @message.id.to_s ).deliver_later
+    end
+
+  end
+
+end
+EIJ = Ishapi::EmailMessageIntakeJob

data/app/mailers/ishapi/application_mailer.rb

@@ -1,6 +1,13 @@
 
 class Ishapi::ApplicationMailer < ActionMailer::Base
-  default from: '314658@gmail.com'
+  default from: 'no-reply@wasya.co'
   layout 'mailer'
+
+  def forwarder_notify msg_id
+    @msg = ::Office::EmailMessage.find msg_id
+    mail( to: 'piousbox@gmail.com',
+          subject: "FWD_Notify: #{@msg.subject}" )
+  end
+
 end
 

data/app/models/ishapi/ability.rb

@@ -3,6 +3,7 @@ class Ishapi::Ability
   include ::CanCan::Ability
 
   def initialize user_profile
+
     #
     # signed in user_profile
     #
@@ -28,6 +29,15 @@ class Ishapi::Ability
 
       can [ :buy_stars ], ::Ish::UserProfile
 
+      #
+      # superuser
+      #
+      if %w| victor@wasya.co victor@piousbox.com piousbox@gmail.com |.include?( user_profile.email )
+        can [ :email_conversations_delete ], ::Ishapi
+
+        can [ :email_messages_show ], ::Ishapi
+      end
+
     end
     #
     # anonymous user

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

@@ -0,0 +1,2 @@
+
+FWD_Notify: No content

data/config/routes.rb

@@ -24,7 +24,6 @@ Ishapi::Engine.routes.draw do
   namespace :my do
     get  'galleries', to: 'galleries#index'
     get  'newsitems', to: 'newsitems#index'
-    get  'reports',   to: 'reports#index'
     get  'videos',    to: 'videos#index'
     post 'videos',    to: 'videos#index'
   end
@@ -33,6 +32,9 @@ Ishapi::Engine.routes.draw do
   delete 'newsitems/:id', to: 'newsitems#destroy'
 
   post 'email_messages', to: 'email_messages#receive'
+  get 'email_messages/:id', to: 'email_messages#show'
+
+  delete 'email_conversations', to: 'email_conversations#delete'
 
   post 'do_purchase', to: 'gameui#do_purchase' # @TODO: rename to just purchase, or destroy endpoint
   post 'payments', :to => 'payments#create'
@@ -44,9 +46,6 @@ Ishapi::Engine.routes.draw do
   get 'photos/view/:id', to: 'photos#show'
   get 'profiles/view/:username', :to => 'user_profiles#show'
 
-  get 'reports', :to => 'reports#index'
-  get 'reports/view/:slug', :to => 'reports#show'
-
   post 'stars/buy', to: 'gameui#buy_stars'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.212
+  version: 0.1.8.214
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,12 +204,12 @@ files:
 - Rakefile
 - app/assets/config/ishapi_manifest.js
 - app/assets/javascripts/ishapi/application.js
-- app/assets/javascripts/ishapi/articles.js
 - app/assets/stylesheets/ishapi/application.css
 - app/assets/stylesheets/ishapi/articles.css
 - app/assets/stylesheets/scaffold.css
 - app/controllers/ishapi/addresses_controller.rb
 - app/controllers/ishapi/application_controller.rb
+- app/controllers/ishapi/email_conversations_controller.rb
 - app/controllers/ishapi/email_messages_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/gameui_controller.rb
@@ -225,7 +225,6 @@ files:
 - app/controllers/ishapi/orders_controller.rb
 - app/controllers/ishapi/payments_controller.rb
 - app/controllers/ishapi/photos_controller.rb
-- app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/stock_watches_controller.rb
 - app/controllers/ishapi/user_profiles_controller.rb
 - app/controllers/ishapi/users/registrations_controller.rb
@@ -234,12 +233,14 @@ files:
 - app/controllers/ishapi/videos_controller.rb
 - app/helpers/ishapi/application_helper.rb
 - app/jobs/ishapi/application_job.rb
+- app/jobs/ishapi/email_message_intake_job.rb
 - app/mailers/ishapi/application_mailer.rb
 - app/mailers/ishapi/confirmations_mailer.rb
 - app/models/ishapi/ability.rb
 - app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/application/_pagination.jbuilder
+- app/views/ishapi/application_mailer/forwarder_notify.html.erb
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder

data/app/assets/javascripts/ishapi/articles.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/controllers/ishapi/reports_controller.rb

@@ -1,31 +0,0 @@
-require_dependency "ishapi/application_controller"
-module Ishapi
-  class ReportsController < ApplicationController
-
-    def show
-      @report = Report.unscoped.find_by :slug => params[:slug]
-      authorize! :show, @report
-    end
-
-    def index
-      authorize! :index, Report
-      @reports = Report.all
-      if params[:cityname]
-        city = City.find_by :cityname => params[:cityname]
-        @reports = @reports.where( :city_id => city.id )
-      end
-      if params[:domain]
-        site = Site.find_by :domain => params[:domain], :lang => :en
-        @reports = @reports.where( :site_id => site.id )
-      end
-
-      if params[:tag]
-        tag = Tag.find_by(:name => params[:tag])
-        @reports = @reports.where(:tag_ids => tag)
-      end
-
-      @reports = @reports.page( params[:reports_page] ).per( 10 )
-    end
-
-  end
-end