ishapi 0.1.8.177 → 0.1.8.181

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2316758e2797aeecb65f3e8cacdb034902a7271f8518da15707050bf64e097
-  data.tar.gz: ba8bc72419963ea42441cee3dfd3b537aa79d3bf8dd21ff5fa4f44f7e77b37c7
+  metadata.gz: 7ef65cf53c1c9ed63d5118cba183a30c1958a00c5a7e45d23fc15e32605782f4
+  data.tar.gz: 3be58b188615387a0ed57107bb1ba3378327838bb4ec48f012ead15ca0cc8dab
 SHA512:
-  metadata.gz: 33e25407dddeeafa0fe7e80e3483c0e674ebb36028644f69c4b37c2ac03787d93568cddad0ce6981d4c63c0f527c754a4bb572e6d4a8d622e215d212c9e9b22b
-  data.tar.gz: cfed72d717b27f1c7f303eace2491441f0e5108f2536a51fdedaf7c1ed00735012a16b2db13422e4dc6f93aff33a008e4a5b843685fd26fc4c443f3f22fcea60
+  metadata.gz: 292432e6e0f2d4410b0440d849a7cea5409bc52cc8cb03e2f30befdb80de9296a8b560e70ae22368aa55c50a8e3007d42698920d607fd88e451977e98a41b26a
+  data.tar.gz: 015ca8524e54cee60bae0bfac3afe86c092856cd3028091963a2b4e3eab9ddb6e128025512762f35419aaed2e47ce2fdbf059c9c0e597e1278610492fcce3bb7

data/app/controllers/ishapi/maps_controller.rb

@@ -13,6 +13,8 @@ class Ishapi::MapsController < Ishapi::ApplicationController
 
     @markers = @map.markers.permitted_to(current_user.profile)
 
+    @tags = @map.tags
+
     # case @map.ordering_type
     # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
     #   @markers = @markers.order_by( name: :asc )

data/app/controllers/ishapi/newsitems_controller.rb

@@ -3,8 +3,22 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class NewsitemsController < ApplicationController
 
-    before_action :check_profile # , except: [ :index ] # @TODO: this is fucked
-    # before_action :check_multiprofile, only: [ :index ]
+    before_action :check_profile
+
+    def destroy
+      n = Newsitem.find params[:id]
+
+      puts! n.map.creator_profile.id, 'ze id'
+      puts! current_user.profile.id, 'ze2 id'
+
+      authorize! :destroy, n
+      flag = n.destroy
+      if flag
+        render json: { status: 'ok' }, status: :ok
+      else
+        render json: { message: "No luck: #{n.errors.full_messages.join(", ")}." }, status: 400
+      end
+    end
 
     def index
       if params[:domain]

data/app/models/ishapi/ability.rb

@@ -6,7 +6,7 @@ class Ishapi::Ability
     #
     # signed in user
     #
-    unless user.blank?
+    if !user.blank?
 
       # if user.profile && user.profile.sudoer?
       #   can :manage, :all
@@ -14,7 +14,9 @@ class Ishapi::Ability
 
       can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
-        gallery.user_profile == user.profile
+        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
@@ -22,6 +24,10 @@ class Ishapi::Ability
         map.creator_profile == user.profile
       end
 
+      can [ :destroy ], Newsitem do |n|
+        n.map.creator_profile.id == user.profile.id
+      end
+
       can [ :create, :unlock ], ::Ish::Payment
 
       can [ :buy_stars ], ::Ish::UserProfile

data/app/views/ishapi/maps/show.jbuilder

@@ -54,6 +54,10 @@ json.cache! this_key do
       json.partial! 'ishapi/galleries/index', galleries: @galleries
     end
 
+    if @tags
+      json.partial! 'ishapi/tags/index', tags: @tags
+    end
+
   end
 end
 

data/app/views/ishapi/markers/_index.jbuilder

@@ -16,6 +16,7 @@ json.markers do
     json.title_img_path marker.title_image ? marker.title_image.image.url(:thumb) : image_missing
     json.item_type      marker.item_type
     json.url            marker.url
+    json.asset3d_path   marker.asset3d ? marker.asset3d.object.url : ''
 
     ## @TODO: this is copy-pasted and should be abstracted.
     destination = marker.destination

data/app/views/ishapi/newsitems/_index.jbuilder

@@ -5,7 +5,7 @@
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|
-    json.id          item.id.to_s
+    json.newsitem_id item.id.to_s
     json.name        item.name
     json.created_at  item.created_at
     json.updated_at  item.updated_at

data/app/views/ishapi/tags/_index.jbuilder

@@ -5,6 +5,7 @@
 
 json.tags do
   json.array! tags do |tag|
+    json.id   tag.id.to_s
     json.name tag.name
     json.slug tag.slug
   end

data/config/routes.rb

@@ -29,6 +29,9 @@ Ishapi::Engine.routes.draw do
     post 'videos',   to: 'videos#index'
   end
 
+  # N
+  delete 'newsitems/:id', to: 'newsitems#destroy'
+
   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.177
+  version: 0.1.8.181
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails