ishapi 0.1.8.176 → 0.1.8.180

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534814e2570fd0506905da3c2af5baa3b54b7e23762ae0b1d43c7b733747a46d
-  data.tar.gz: 00f9f2f19642d1c51c3a1893d2657c1a77ee5e2254aa6ee4930b0bf33b307b86
+  metadata.gz: bc1fab799950f80dc60e96c14da20e2b819597bb6ba08a7202faa265f8da9b1c
+  data.tar.gz: 60a76c0bcc2df49cf116fcec8d9889710290c8811c0c8922ffbaff5b85063a6f
 SHA512:
-  metadata.gz: 53c030593cf235e01ca9b671b63bd47bfee8db9c2b9a84a8d10db01b401cadda3f6a14b7608f0a23ab888cb2fb8799a511798518060e76707e2accf1e9ca5d3a
-  data.tar.gz: 2f44b2869368baa23d513ddc82b6749cc22b1e87b1b720d769a50e4976334261bd3a7682db0728a94f0194c4decab25a13419619a749015a727aff580e1eafca
+  metadata.gz: 2d9949936dca45d8377c8331083f2fa6badc2dcc73e424f2130957f60b688368b06bebaf533198d2c08020ec4d5b865b844488c12e3c49fff6922a589f554673
+  data.tar.gz: '024685ff64b145e92763772af8fd3da14bd994dd329f6808799b484808949753c3216f0267db1607231eefb50430068154615213bdbfbb98b0bbbb54ff449460'

data/app/controllers/ishapi/maps_controller.rb

@@ -5,7 +5,8 @@ class Ishapi::MapsController < Ishapi::ApplicationController
   before_action :check_profile, only: [ :show ]
 
   def show
-    @location = ::Gameui::Map.find_by slug: params[:slug]
+    @location   = ::Gameui::Map.where( slug: params[:slug] ).first
+    @location ||= ::Gameui::Map.find params[:slug]
     @map = @location.map || @location
 
     authorize! :show, @map
@@ -13,6 +14,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/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.176
+  version: 0.1.8.180
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails