ishapi 0.1.8.283 → 0.1.8.285

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8357d4a8928dc240bafa4f3d8b4afe79d2da6795ecf6eb1fba73f0f2ddd994e0
-  data.tar.gz: eec178fca47c33c6a894b6e2cb23e9b4b3cfeb27b4bb1ea4427619ef7462c9bb
+  metadata.gz: 76230270153711c6dff30ead344469cd8df42e084832e931351a291879ea3557
+  data.tar.gz: 361989859dd3015a7d93de1348301e4038b5709adac5736c22820e7d413fdaa4
 SHA512:
-  metadata.gz: d5970e4c295e327ed2a982e73228ae1cca0e7954f638e476e3913d78d819d267bd45aa8c7c6b7b2bba4484ab301ae698d53d69372772b288bebf900c8e62d9de
-  data.tar.gz: 1ecd89eda77ee86b8be3a54d7901a46675b0f2495f817344f76063483ac500bbd8dd1119ffc97ec249ae36f5deec65a1e3aba5a3de9290e9495e6e5eb8d6f0ca
+  metadata.gz: 60e0f42fa6405907798a1cd4d24633059768206fd26203101099cf3b1e8bba2f9bc089a318f7b2112fbfbe1432a88563a0e80126b1e17f97b9243d73d414dd1e
+  data.tar.gz: ccd7a99f503e51818998b2629bd7bd8f02b365db37a942550c9129bdf2c92e4b8bd8d9ebd54e085a3331f5fb292f57b1576f33cf785d141609a54e221d3e3487

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_contexts_controller.rb

@@ -19,7 +19,7 @@ module Ishapi
           render layout: false
         end
         format.json do
-          render json: @results
+          render json: { items: @results }
         end
       end
     end

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.public
       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.public
       @videos = @videos.page( params[:videos_page] ).per( 10 )
     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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.283
+  version: 0.1.8.285
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-16 00:00:00.000000000 Z
+date: 2023-09-19 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
@@ -247,8 +250,8 @@ files:
 - app/views/ishapi/application/_pagination.jbuilder
 - app/views/ishapi/application_mailer/forwarder_notify.html.erb
 - app/views/ishapi/email_contexts/summary.csv.erb
-- app/views/ishapi/email_contexts/summary.jbuilder
 - 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
@@ -275,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

data/app/views/ishapi/email_contexts/summary.jbuilder

@@ -1,3 +0,0 @@
-
-json.summary do
-  json.a 'b'