ishapi 0.1.8.240 → 0.1.8.242

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ca1f21e8c474cc5201d6e0eb71c570f000130a3e2d9808714cf3f9db0cdc66
-  data.tar.gz: 9ac856cdc83167a97e093897209753c5e11f356cd1adbc3e35ce6d37814c5ea7
+  metadata.gz: '0432395c7876153064c35c9c289c2442d2a425e52e954d5e51395e1c0e5d2bff'
+  data.tar.gz: f33e32b3dc91ca4f4289082639c7af54f4ff0c02a98053f5ecb356bad27f18c9
 SHA512:
-  metadata.gz: 240daa3bbc3c8ed7bc1b56316ce950ff810d95f42751d8c48d393715306c79b97c49d2ebeacdf9ab74bfc9dea8dc0733971e34d571a1f87436350cd2400704b9
-  data.tar.gz: 04e0dc0fe9dd0c3cf0a26d7f787883440024e4e5700ed48c158fc90c21fc831c2436d215da3d53be939ceb1b2ed6d62bedd30756e1e616fd39695530c4f3878e
+  metadata.gz: a5fef0cdd135e1bbe0679c2c0b3d271a19f7da7b76bb96e5f2fa72edba50572c709e3202bfef63088609e8b77b1853454db0dc93485cfd2f8a87e0f25674116f
+  data.tar.gz: f493726454f20993e09e88518a99c9f3c976538dacbd8c10588f9e170b51a1ba0b37e947431fd03595c06ff11f8c78b2836928d61bb4bdf714838e14a20aead7

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,14 +9,25 @@ 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]
       outs = convos.map do |convo|
-        convo.add_tag( WpTag::EMAILTAG_TRASH )
-        convo.remove_tag( WpTag::EMAILTAG_INBOX )
+        convo.add_tag( WpTag::TRASH )
+        convo.remove_tag( WpTag::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

@@ -15,6 +15,8 @@ Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
 ## 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
@@ -65,7 +67,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).id
 
     @message = ::Office::EmailMessage.where( message_id: message_id ).first
     @message ||= ::Office::EmailMessage.new
@@ -142,7 +144,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.240
+  version: 0.1.8.242
 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