ishapi 0.1.8.216 → 0.1.8.218

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4e60c93d07bd13c28c340d6b51321777dcac330990a03c82bb99d688a739a5
-  data.tar.gz: 8373154c3f3585cfb9f67ed53d0333f17ae6f2334ebe7942eb3de677ca8e9776
+  metadata.gz: d34073871c3d975fddb03705694ead82dbc7878f7451f2dff162e1f2b3a9bd80
+  data.tar.gz: b3d45298dd10f4ce2a5a69acfeb966048a58e37a7dd24c8456d3033dbe6bbe6d
 SHA512:
-  metadata.gz: ec07c25202e7d248111642c1761d0e1a7f89fcb376edf8ffec62f0816748773a6e2e82ccc0d60df5c367da3bc422abcb4a6c257073f4a861eb72026388e9128b
-  data.tar.gz: baa34823abceb222b632f5295322aacedc61d0a72cd46f03aa4eec64fdcd19f8a0215444ccdfd503ead825d4d90e9a8fe35232b7633ac6cf6a993a76a85bad15
+  metadata.gz: 25409ffc536c75af09a39921f3658751fce427e7a5427873f2489b084a8873485bfb5ffac7c67bc219d914b07013aa3b8be955d3c6e53292f9022c1a1fd00372
+  data.tar.gz: 7f9014268bedac0980a9930c9bf16be3289097d21dc1ce8286295ca988f1181ddfc40345da8e78b46ad3755ae6e3ad49b508cd7930dab08ef358b8dc4a443e11

data/app/controllers/ishapi/email_messages_controller.rb

@@ -4,13 +4,30 @@ require_dependency "ishapi/application_controller"
 class ::Ishapi::EmailMessagesController < ::Ishapi::ApplicationController
 
   before_action :check_jwt, only: [ :show ]
+  layout false
 
   def show
-    msg = Office::EmailMessage.find( params[:id] )
-    authorize! :show, msg
-    render json: {
-      item: msg,
-    }
+    @msg = Office::EmailMessage.find( params[:id] )
+    authorize! :show, @msg
+
+    if params[:load_images]
+      ;
+    else
+      doc = Nokogiri::HTML(@msg.part_html)
+      images = doc.search('img')
+      images.each do |img|
+        img['src'] = 'missing'
+      end
+      @msg.part_html = doc
+    end
+
+    respond_to do |format|
+      format.json do
+        render json: { item: @msg, }
+      end
+      format.html do
+      end
+    end
   end
 
   ## From lambda, ses
@@ -21,7 +38,7 @@ class ::Ishapi::EmailMessagesController < ::Ishapi::ApplicationController
     end
 
     msg = Office::EmailMessageStub.new({
-      object_path: params[:object_path],
+      # object_path: params[:object_path],
       object_key:  params[:object_key],
     })
     if msg.save

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -7,8 +7,10 @@ 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
@@ -49,7 +51,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
   def perform id
     stub = ::Office::EmailMessageStub.find id
-    puts "Performing EmailMessageIntakeJob for message_id #{stub.object_key}"
+    puts "Performing EmailMessageIntakeJob for object_key #{stub.object_key}"
     if stub.state != ::Office::EmailMessageStub::STATE_PENDING
       raise "This stub has already been processed: #{stub.id.to_s}."
       return
@@ -61,7 +63,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
     _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
+    message_id     = the_mail.header['message-id'].decoded
     in_reply_to_id = the_mail.header['in-reply-to']&.to_s
 
     @message = ::Office::EmailMessage.where( message_id: message_id ).first
@@ -73,7 +75,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       in_reply_to_id: in_reply_to_id,
 
       object_key:  stub.object_key,
-      object_path: stub.object_path,
+      # object_path: stub.object_path,
 
       subject: the_mail.subject,
       date:    the_mail.date,

data/app/views/ishapi/email_messages/show.haml

@@ -0,0 +1,3 @@
+
+%html
+  %body{ style: 'background: white' }= raw @msg.part_html

data/config/routes.rb

@@ -4,14 +4,23 @@ Ishapi::Engine.routes.draw do
   root :to => 'application#home'
   post 'home', :to => 'application#home'
 
-
+  # A
   resources :addresses
 
+  # E
+  post 'email_messages', to: 'email_messages#receive'
+  get 'email_messages/:id', to: 'email_messages#show', as: :email_message
+
+  delete 'email_conversations', to: 'email_conversations#delete'
+
+  # G
   get  'galleries',                   :to => 'galleries#index'
   post 'galleries',                   :to => 'galleries#index'
   get  'galleries/view/:slug', :to => 'galleries#show'
   post 'galleries/view/:slug', :to => 'galleries#show'
 
+  # H
+  # I
   post 'invoices/search', :to => 'invoices#search'
 
   # L
@@ -32,11 +41,6 @@ Ishapi::Engine.routes.draw do
   # N
   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'
   post 'payments2', :to => 'payments#create2' # @TODO: change

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.216
+  version: 0.1.8.218
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,6 +241,7 @@ files:
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/application/_pagination.jbuilder
 - app/views/ishapi/application_mailer/forwarder_notify.html.erb
+- app/views/ishapi/email_messages/show.haml
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder