ishapi 0.1.8.284 → 0.1.8.286

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c411df0109381820514d8f44a8103db30655c37d7d05127e4d21964f11ea3a6e
-  data.tar.gz: 400b2dbad6623b0d540ab1f028aa3bbdc9cc8c7275932b1d93fde792118aae84
+  metadata.gz: f5c0832ec3c2109607e7d612d9daf38dbff6e2b710879710f71e358ed5304ea3
+  data.tar.gz: e2ad530fe9863aa53e532b1e37ab628a179b49da40a5edb31fd4c0abe080e721
 SHA512:
-  metadata.gz: 7991ffd5133d13295ef165a51de877a251e58f2a8f10f4a7dada7daa9a5ac0c8fc2d0efeb67c065765f4c551175fc58a579d424b51fe4a1ad05afa8ee52ff4a9
-  data.tar.gz: 13f137ba7124972fa7644ea94ef4b036c90e40d06aa753628992ca430189f0a7829378c09af03f018f1b0587410e223b1a5eeebec27b7535b38f3be96000ac1e
+  metadata.gz: 15b2df35cdc3dde6cece928bdf20427f4603b82de04e52cb9ca901ba1ebade45d338487d80de8013f87fc3a9225158d6ee46dafdf041bcfdd0f003cee23fc46d
+  data.tar.gz: 6cdaba9a607c484cff7a481e2edbe50071a3ec3ea3881392487f8406f85a0bebacfda86842a2bb83ed6297692d9a509a64dcad54f66cc2ec338076e83e5b36c1

data/app/controllers/ishapi/application_controller.rb

@@ -60,6 +60,9 @@ class ::Ishapi::ApplicationController < ActionController::Base
 
   end
 
+  ##
+  ## private
+  ##
   private
 
   ## This returns an empty profile if not logged in

data/app/controllers/ishapi/email_unsubscribes_controller.rb

@@ -0,0 +1,29 @@
+require_dependency "ishapi/application_controller"
+
+module ::Ishapi
+  class EmailUnsubscribesController < ApplicationController
+
+    layout false
+
+    def create
+      authorize! :open_permission, ::Ishapi
+      @lead = Lead.find params[:lead_id]
+
+      if( !params[:token] ||
+          @lead.unsubscribe_token != params[:token] )
+        render code: 400, message: "We're sorry, but something went wrong. Please try again later."
+        return
+      end
+
+      @unsubscribe = ::Ish::EmailUnsubscribe.find_or_create_by({
+        lead_id:     params[:lead_id],
+        template_id: params[:template_id],
+        campaign_id: params[:campaign_id],
+      })
+      @unsubscribe.update_attributes({
+        unsubscribed_at: Time.now,
+      })
+    end
+  end
+
+end

data/app/controllers/ishapi/galleries_controller.rb

@@ -7,7 +7,7 @@ module Ishapi
     before_action :check_jwt
 
     def index
-      @galleries = Gallery.all
+      @galleries = Gallery.all.published
       authorize! :index, Gallery
       if params[:domain]
         @site = Site.find_by( :domain => params[:domain], :lang => 'en' )
@@ -17,8 +17,8 @@ module Ishapi
     end
 
     def show
-      @gallery = ::Gallery.unscoped.where( slug: params[:slug] ).first
-      @gallery ||= ::Gallery.unscoped.where( id: params[:slug] ).first
+      @gallery   = ::Gallery.unscoped.where( slug: params[:slug] ).first
+      @gallery ||= ::Gallery.unscoped.where( id: params[:slug]   ).first
       authorize! :show, @gallery
 
       @photos = @gallery.photos.order_by( ordering: :asc )

data/app/controllers/ishapi/lead_actions_controller.rb

@@ -0,0 +1,23 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class LeadActionsController < ApplicationController
+
+    def create
+      if !params[:lead_id]
+        render json: { status: :ok }
+        return
+      end
+      tmpl = Office::LeadActionTemplate.find( params[:tmpl_id] )
+      puts! tmpl, 'tmpl'
+      lead_action = Office::LeadAction.find_or_create_by({
+        lead_id: params[:lead_id],
+        tmpl_id: params[:tmpl_id],
+      })
+      lead_action.params = params.to_json
+      lead_action.save
+      render json: { status: :ok, message: 'saved' }
+    end
+
+  end
+end

data/app/controllers/ishapi/obfuscated_redirects_controller.rb

@@ -0,0 +1,27 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class ObfuscatedRedirectsController < ApplicationController
+
+    def show
+      @obf = Office::ObfuscatedRedirect.find params[:id]
+      puts! @obf, '@obf'
+      authorize! :show, @obf
+
+      visit_time = Time.now
+      @obf.update_attributes({
+        visited_at: visit_time,
+        visits: @obf.visits + [ visit_time ],
+      })
+
+      if Rails.application.config.debug
+        render and return
+      end
+
+      redirect_to @obf.to
+
+    end
+
+  end
+end
+

data/app/controllers/ishapi/videos_controller.rb

@@ -9,7 +9,7 @@ module Ishapi
 
     def index
       authorize! :index, Video
-      @videos = Video.all
+      @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/models/ishapi/ability.rb

@@ -7,7 +7,7 @@ class Ishapi::Ability
     ##
     ## super user
     ##
-    if %w| piousbox@gmail.com |.include?( user_profile.email )
+    if %w| piousbox@gmail.com |.include?( user_profile&.email )
       can [ :manage ], :all
     end
 
@@ -18,9 +18,9 @@ class Ishapi::Ability
 
       can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
-        gallery.user_profile == user_profile || # my own
-        (!gallery.is_trash && gallery.is_public ) || # public
-        (!gallery.is_trash && gallery.shared_profiles.include?( user_profile ) ) # shared with me
+        ( gallery.user_profile == user_profile                                 ) || # my own
+        (!gallery.is_trash && gallery.is_public                                ) || # public
+        (!gallery.is_trash && gallery.shared_profiles.include?( user_profile ) )    # shared with me
       end
 
       can [ :do_purchase ], ::Gameui
@@ -29,7 +29,7 @@ class Ishapi::Ability
       end
 
       can [ :destroy ], Newsitem do |n|
-        n.map.creator_profile.id == user_profile.id
+        n.map.creator_profile.id.to_s == user_profile.id.to_s
       end
 
       can [ :create, :unlock ], ::Ish::Payment
@@ -58,10 +58,16 @@ class Ishapi::Ability
       p.user.id.to_s == user.id.to_s
     end
 
+
+    ##
+    ## E
+    ##
+    can [ :create ], Ish::EmailUnsubscribe
+
     #
     # G
     #
-    can [ :index ], Gallery
+    # can [ :index ], Gallery
     can [ :show ], Gallery do |gallery|
       gallery.is_public && !gallery.is_trash
     end
@@ -85,8 +91,12 @@ class Ishapi::Ability
     #
     # O
     #
+
+    can [ :show ], ::Office::ObfuscatedRedirect
+
     can [ :view_chain ], ::Iro::OptionPriceItem
 
+
     #
     # P
     #
@@ -111,7 +121,7 @@ class Ishapi::Ability
     #
     # V
     #
-    can [ :index, :my_index ], Video
+    # can [ :index, :my_index ], Video
     can [ :show ], Video do |video|
       video.is_public
     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/app/views/ishapi/email_unsubscribes/create.haml

@@ -0,0 +1,2 @@
+
+Thanks! You have been unsubscribed.

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

@@ -0,0 +1,4 @@
+
+= link_to @obf.to, @obf.to
+%br
+= @obf.inspect

data/config/routes.rb

@@ -1,10 +1,11 @@
 
 Ishapi::Engine.routes.draw do
 
-  root :to => 'application#home'
-  post 'home', :to => 'application#home'
+  root         to: 'application#home'
+  post 'home', to: 'application#home'
+
+  ## E
 
-  # E
   post 'email_messages',    to: 'email_messages#receive'
   get 'email_messages/:id', to: 'email_messages#show', as: :email_message
 
@@ -13,7 +14,10 @@ Ishapi::Engine.routes.draw do
   delete 'email_conversations',                 to: 'email_conversations#delete'
   post   'email_conversations/rmtag/:emailtag', to: 'email_conversations#rmtag'
 
-  # G
+  get 'email_unsubscribes', to: 'email_unsubscribes#create'
+
+  ## G
+
   get  'galleries',                   :to => 'galleries#index'
   post 'galleries',                   :to => 'galleries#index'
   get  'galleries/view/:slug', :to => 'galleries#show'
@@ -28,9 +32,12 @@ Ishapi::Engine.routes.draw do
   get 'leadsets',    to: 'leadsets#index'
   delete 'leadsets', to: 'leadsets#destroy'
 
+  get 'lead_actions', to: 'lead_actions#create', as: :lead_actions
   get 'locations/show/:slug', to: 'locations#show'
   resources :locations
 
+  ## M
+
   get 'maps', to: 'maps#index'
   get 'maps/view/:slug', to: 'maps#show'
   get 'markers/view/:slug', to: 'maps#show_marker'
@@ -47,6 +54,8 @@ Ishapi::Engine.routes.draw do
 
   ## O
 
+  get '/obf/:id', to: 'obfuscated_redirects#show', as: :obf
+
   # resources :option_price_items
   get 'option_price_items/view-by/symbol/:symbol', to: 'option_price_items#view_by_symbol', :constraints => { :symbol => /[^\/]+/ } ## the symbol is detailed eg 'GME_011924P30'
   get 'option_price_items/index1', to: 'option_price_items#index', defaults: { kind: 'kind-1' }
@@ -74,7 +83,7 @@ Ishapi::Engine.routes.draw do
   get 'exception', to: 'application#exception'
 
   post  'users/fb_sign_in',      to: 'users#fb_sign_in'
-  get   'users/me',              to: 'users#account'
+  get   'users/me',              to: 'users#account', as: :users_dashboard
   post  'users/profile',         to: 'users#show' ## @TODO: change, this makes no sense
   post  'users/profile/update',  to: 'user_profiles#update'
   get   'users/profile',         to: 'users#show' # @TODO: only for testing! accessToken must be hidden

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.284
+  version: 0.1.8.286
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-16 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,9 +212,11 @@ files:
 - app/controllers/ishapi/email_contexts_controller.rb
 - app/controllers/ishapi/email_conversations_controller.rb
 - app/controllers/ishapi/email_messages_controller.rb
+- app/controllers/ishapi/email_unsubscribes_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/gameui_controller.rb
 - app/controllers/ishapi/invoices_controller.rb
+- app/controllers/ishapi/lead_actions_controller.rb
 - app/controllers/ishapi/leads_controller.rb
 - app/controllers/ishapi/leadsets_controller.rb
 - app/controllers/ishapi/locations_controller.rb
@@ -223,6 +225,7 @@ files:
 - app/controllers/ishapi/my/reports_controller.rb
 - app/controllers/ishapi/my/videos_controller.rb
 - app/controllers/ishapi/newsitems_controller.rb
+- app/controllers/ishapi/obfuscated_redirects_controller.rb
 - app/controllers/ishapi/option_price_items_controller.rb
 - app/controllers/ishapi/order_items_controller.rb
 - app/controllers/ishapi/orders_controller.rb
@@ -248,6 +251,7 @@ files:
 - app/views/ishapi/application_mailer/forwarder_notify.html.erb
 - app/views/ishapi/email_contexts/summary.csv.erb
 - app/views/ishapi/email_messages/show.haml
+- app/views/ishapi/email_unsubscribes/create.haml
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder
@@ -274,6 +278,7 @@ files:
 - app/views/ishapi/newsitems/_show.haml
 - app/views/ishapi/newsitems/_show.haml-trash
 - app/views/ishapi/newsitems/index.jbuilder
+- app/views/ishapi/obfuscated_redirects/show.haml
 - app/views/ishapi/option_price_items/index.jbuilder
 - app/views/ishapi/option_price_items/view.jbuilder
 - app/views/ishapi/orders/_item.jbuilder