ishapi 0.1.8.239 → 0.1.8.241

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502e7c5e074f0f8e20df6e14886cd361214661dc9c59de6b8ba860c2af011b0a
-  data.tar.gz: f14a83f3f5d4c7ca5e05f218226c2a00185356a12d8ff8bd9f5deff7b3b4ba19
+  metadata.gz: f333a98ac2350222402236a59d620a370f15baa3aa85e0ccc73b910b0a6fc14c
+  data.tar.gz: 69814c20939ae6ac255355f18b7375109a38aa911f37c5cb30de3d477b1d60ba
 SHA512:
-  metadata.gz: bc61bf750bd2add4bcd4b625e09d47486a6221b2476a9f4c87d2b097024305526a2c4ffeae10417565a9eb58f901c2d3c7246b098eded374f0e93f74ee5e8e03
-  data.tar.gz: 2c3f0b06cc51ab3359e66740c71a19371721ec25693dbc3fbd040c7681fade7771b7e3b0fc23d883b3bf8263fba7e4185339270438e0208a5105b21b7d28ad47
+  metadata.gz: c9dea2a030a9eaab8955b5a53c4646dbfa3f617e7bb3dd560be968483571a5428fb16118cecbf3a56eb1dc6d7cfcf3b8192f0cd0e9ef5ad4a9908e845d8b0ed2
+  data.tar.gz: fabd2be1cfc8e0005b0e51a2cdc9e7dac4d7ba81ee255dfdde186c32028a79f0dacc4e4faf8ea43f6ca3bd405433eddf4df3341cd7906e7996d4629a7fe7d146

data/app/assets/stylesheets/ishapi/{application.css → application.scss}

@@ -10,6 +10,7 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require ./galleries.scss
  *= require_self
+ *= require ./galleries.scss
+ *= require ./locations.scss
  */

data/app/assets/stylesheets/ishapi/locations.scss

@@ -0,0 +1,8 @@
+
+.locations-show {
+  .markers {
+    border: 1px solid grey;
+
+    display: flex;
+  }
+}

data/app/controllers/ishapi/email_conversations_controller.rb

@@ -9,6 +9,16 @@ module Ishapi
 
     before_action :check_jwt
 
+    def rmtag
+      authorize! :email_conversations_rmtag, ::Ishapi
+      convos = Office::EmailConversation.find params[:ids]
+      outs = convos.map do |convo|
+        convo.rmtag( params[:emailtag] )
+      end
+      flash[:notice] = "outcome: #{outs}"
+      render json: { status: :ok }
+    end
+
     def delete
       authorize! :email_conversations_delete, ::Ishapi
       convos = Office::EmailConversation.find params[:ids]
@@ -17,6 +27,7 @@ module Ishapi
         convo.remove_tag( WpTag::EMAILTAG_INBOX )
       end
       flash[:notice] = "outcome: #{outs}"
+      render json: { status: :ok }
     end
 
   end

data/app/controllers/ishapi/locations_controller.rb

@@ -0,0 +1,54 @@
+
+require_dependency "ishapi/application_controller"
+
+##
+## supersedes Ishapi::MapsController
+##
+class Ishapi::LocationsController < Ishapi::ApplicationController
+
+  before_action :check_profile # , only: [ :show, :show_marker ]
+
+  def show
+    if 'self' == params[:slug] # @TODO: constantize _vp_ 2023-01-11
+      @location = ::Gameui::Map.where( slug: @current_profile[:email] ).first
+    else
+      @location   = ::Gameui::Map.where( slug: params[:slug] ).first
+      @location ||= ::Gameui::Map.find params[:slug]
+    end
+
+    authorize! :show, @location
+    map = @location.map || @location # @TODO: remove _vp_ 2023-03-20
+
+    @newsitems = @location.newsitems.page( params[:newsitems_page]
+      ).per( @location.newsitems_page_size )
+
+    @markers = map.markers.permitted_to(@current_profile).order_by(ordering: :asc)
+    # case map.ordering_type
+    # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
+    #   @markers = @markers.order_by( name: :asc )
+    # when ::Gameui::Map::ORDERING_TYPE_CUSTOM
+    #   @markers = @markers.order_by( ordering: :asc )
+    # end
+
+    if map.is_premium && !@current_profile.has_premium_purchase( map )
+      render 'show_restricted'
+    else
+      respond_to do |format|
+        format.json do
+          render 'show'
+        end
+        format.html do
+          render 'show'
+        end
+      end
+    end
+  end
+
+  def show_marker
+    @marker = ::Gameui::Marker.find_by slug: params[:slug]
+    authorize! :show, @marker
+    render json: @marker
+  end
+
+end
+

data/app/controllers/ishapi/maps_controller.rb

@@ -1,6 +1,9 @@
 
 require_dependency "ishapi/application_controller"
 
+##
+## @deprecated, use Ishapi::LocationsController
+##
 class Ishapi::MapsController < Ishapi::ApplicationController
   before_action :check_profile, only: [ :show ]
 

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -28,7 +28,8 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
   # "image/jpeg; name=TX_DL_2.jpg"
   # "text/plain; charset=UTF-8"
   def churn_subpart message, part
-    if part.content_type.include?("multipart/related")
+    if part.content_type.include?("multipart/related") ||
+       part.content_type.include?("multipart/alternative")
 
       part.parts.each do |subpart|
         churn_subpart( message, subpart )
@@ -64,7 +65,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     the_mail           = Mail.new(_mail)
     message_id         = the_mail.header['message-id'].decoded
     in_reply_to_id     = the_mail.header['in-reply-to']&.to_s
-    email_inbox_tag_id = WpTag.email_inbox_tag.id
+    email_inbox_tag_id = WpTag.emailtag(WpTag::INBOX)
 
     @message = ::Office::EmailMessage.where( message_id: message_id ).first
     @message ||= ::Office::EmailMessage.new
@@ -141,7 +142,9 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     ## Actions & Filters
     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
+      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

data/app/models/ishapi/ability.rb

@@ -34,7 +34,7 @@ class Ishapi::Ability
       ##
       if %w| victor@wasya.co victor@piousbox.com piousbox@gmail.com |.include?( user_profile.email )
 
-        can [ :email_conversations_delete ], ::Ishapi
+        can [ :manage ], ::Ishapi
 
         can [ :show ], ::Office::EmailMessage
       end

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

@@ -0,0 +1,14 @@
+
+.locations-show
+  .max-width
+    .header
+      %h3.title Location #{@location.slug}
+
+    .map
+    .markers
+      .title Markers (#{@markers.length}):
+      .items
+        - @markers.each do |marker|
+          = render 'ishapi/markers/card', marker: marker
+    .actions
+    .newsitems

data/app/views/ishapi/markers/_card.haml

@@ -0,0 +1,28 @@
+
+- destination = marker.destination
+
+.markers--card.Card
+  - if destination.premium_tier && !@current_profile&.has_premium_purchase( destination )
+    #{marker.name} [purchase]
+  - else
+    - if marker.url
+      #{marker.url} [external]
+    - else
+      = link_to marker.name, location_path(destination)
+
+
+
+-# const goto = (e) => {
+-#   e.preventDefault()
+-#   if (marker.premium_tier && !marker.is_purchased) {
+-#     setItemToUnlock(marker)
+-#   } else {
+-#     if (marker.url) {
+-#       setShowUrl(marker.url) // @TODO: this should be encoded in the (server-side) router eventually. _vp_ 2022-09-11
+-#     }
+-#     else {
+-#       history.push(href)
+-#     }
+-#   }
+-# }
+

data/config/routes.rb

@@ -8,10 +8,11 @@ Ishapi::Engine.routes.draw do
   resources :addresses
 
   # E
-  post 'email_messages', to: 'email_messages#receive'
+  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'
+  delete 'email_conversations',                 to: 'email_conversations#delete'
+  post   'email_conversations/rmtag/:emailtag', to: 'email_conversations#rmtag'
 
   # G
   get  'galleries',                   :to => 'galleries#index'
@@ -27,6 +28,9 @@ Ishapi::Engine.routes.draw do
   get 'leadsets',    to: 'leadsets#index'
   delete 'leadsets', to: 'leadsets#destroy'
 
+  get 'locations/show/:slug', to: 'locations#show'
+  resources :locations
+
   get 'maps', to: 'maps#index'
   get 'maps/view/:slug', to: 'maps#show'
   get 'markers/view/:slug', to: 'maps#show_marker'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.239
+  version: 0.1.8.241
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,8 +204,9 @@ files:
 - Rakefile
 - app/assets/config/ishapi_manifest.js
 - app/assets/javascripts/ishapi/application.js
-- app/assets/stylesheets/ishapi/application.css
+- app/assets/stylesheets/ishapi/application.scss
 - app/assets/stylesheets/ishapi/galleries.scss
+- app/assets/stylesheets/ishapi/locations.scss
 - app/assets/stylesheets/scaffold.css
 - app/controllers/ishapi/addresses_controller.rb
 - app/controllers/ishapi/application_controller.rb
@@ -215,6 +216,7 @@ files:
 - app/controllers/ishapi/gameui_controller.rb
 - app/controllers/ishapi/invoices_controller.rb
 - app/controllers/ishapi/leadsets_controller.rb
+- app/controllers/ishapi/locations_controller.rb
 - app/controllers/ishapi/maps_controller.rb
 - app/controllers/ishapi/my/galleries_controller.rb
 - app/controllers/ishapi/my/reports_controller.rb
@@ -249,6 +251,7 @@ files:
 - app/views/ishapi/galleries/show.json.jbuilder
 - app/views/ishapi/galleries/show_premium_locked.jbuilder
 - app/views/ishapi/galleries/show_premium_unlocked.jbuilder
+- app/views/ishapi/locations/show.haml
 - app/views/ishapi/mailer/confirmation_instructions.html.erb
 - app/views/ishapi/mailer/email_changed.html.erb
 - app/views/ishapi/mailer/password_change.html.erb
@@ -259,6 +262,7 @@ files:
 - app/views/ishapi/maps/index.jbuilder
 - app/views/ishapi/maps/show.jbuilder
 - app/views/ishapi/maps/show_restricted.jbuilder
+- app/views/ishapi/markers/_card.haml
 - app/views/ishapi/markers/_index.jbuilder
 - app/views/ishapi/my/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder