ishapi 0.1.8.175 → 0.1.8.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a4b4e0d9bd0969eeda9a1fe9589212a70bd5c8661e0302d9a1ba31a3f5137b
-  data.tar.gz: 476d698e3c15ce28c33eae87a072f77853e3ca48008de339fd9aacf9b4e7e37c
+  metadata.gz: 624ac9590f37f623390c3d985f6cdef76ce0ac93b4f35d7c9e3556412a27f75e
+  data.tar.gz: 8bc5cbd36d9b8cfbcb5af703841ad320787157e82ad9a7da47bba609eb674d35
 SHA512:
-  metadata.gz: af2e387db139204820f396cfa0976223a2cdfd63c1c9a9fe5e43e4f69fb742d4ac99b1b7e2716c229bec19203a259dcd3badde894e669b7030377a1b86264e74
-  data.tar.gz: ed0a356af8d052cab676e33e71d4efbb1a281acc98f76b57543e9ccdd8b26156ab7ddc4e5ee04cb65311aeb19b155e15d1b67eb635b446e746fe3c83c56279a5
+  metadata.gz: c606ff431e7cbf34b57f303c111cb479ef420f7b9527c4290f51ad0dccb8e4a6e9e17df4725b28efc673bb445c2755040d07fcd5aac90da8b7597cdc203d1317
+  data.tar.gz: 2e6980d59dc035a5ad4e4928388f17feb5d02b6f70b240ec5818f2c9e1a20151a26f34cf9b12a8bcd28c5f30023ad5d8d479cd77b46acf79513e64f3d8d92cbc

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/controllers/ishapi/user_profiles_controller.rb

@@ -2,12 +2,26 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class UserProfilesController < ApplicationController
 
-    before_action :check_profile
+    before_action :check_profile, only: %i| show | ## @TODO: hmmm I may not need this check at all
+
+    before_action :check_profile_hard, only: %i| update |
 
     def show
-      @profile = IshModels::UserProfile.find_by :username => params[:username]
+      @profile = Ish::UserProfile.find_by :username => params[:username]
       authorize! :show, @profile
     end
 
+    def update
+      @profile = Ish::UserProfile.find @current_user.profile
+      authorize! :update, @profile
+
+      flag = @profile.update params[:profile].permit!
+      if flag
+        render json: { message: 'ok' }, status: :ok
+      else
+        render json: { message: "No luck: #{@profile.errors.full_messages.join(", ")}." }, code: 400
+      end
+    end
+
   end
 end

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
@@ -33,6 +39,9 @@ class Ishapi::Ability
     user ||= User.new
 
     can [ :show ], Ish::UserProfile
+    can [ :update ], Ish::UserProfile do |p|
+      p.user.id.to_s == user.id.to_s
+    end
 
     can [ :index, :show ], City
 

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

@@ -20,10 +20,9 @@ json.markers do
     ## @TODO: this is copy-pasted and should be abstracted.
     destination = marker.destination
     json.premium_tier destination.premium_tier
+    json.is_premium   destination.is_premium
     json.id           destination.id.to_s
     if destination.is_premium
-      json.premium_tier destination.premium_tier
-      json.is_premium   destination.premium_tier > 0
       if current_user && current_user.profile
         json.is_purchased current_user.profile.has_premium_purchase( destination )
       end

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
@@ -58,8 +61,8 @@ Ishapi::Engine.routes.draw do
 
   post  'users/fb_sign_in',      to: 'users#fb_sign_in'
   get   'users/me',              to: 'users#account'
-  post  'users/profile',         to: 'users#show'
-  post  'users/profile/update',  to: 'users#update'
+  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
   match 'users/long_term_token', to: 'application#long_term_token', via: [ :get, :post ]
   post  'users/login',           to: 'users#login'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.175
+  version: 0.1.8.178
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails