diff --git a/.github/workflows/frontend-check.yml b/.github/workflows/frontend-check.yml index c0bfc90..47b94cf 100644 --- a/.github/workflows/frontend-check.yml +++ b/.github/workflows/frontend-check.yml @@ -24,7 +24,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v2 with: - version: 8.6.1 + version: 9.2.0 - name: Setup node uses: actions/setup-node@v4 with: @@ -56,7 +56,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v2 with: - version: 8.6.1 + version: 9.2.0 - name: Setup node uses: actions/setup-node@v3 with: diff --git a/Gemfile.lock b/Gemfile.lock index 4ce7484..28e855e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,6 +78,29 @@ GEM addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) + async (2.10.2) + console (~> 1.10) + fiber-annotation + io-event (~> 1.5, >= 1.5.1) + timers (~> 4.1) + async-container (0.18.2) + async (~> 2.10) + async-http (0.69.0) + async (>= 2.10.2) + async-pool (~> 0.7) + io-endpoint (~> 0.11) + io-stream (~> 0.4) + protocol-http (~> 0.26) + protocol-http1 (~> 0.19) + protocol-http2 (~> 0.18) + traces (>= 0.10) + async-http-cache (0.4.3) + async-http (~> 0.56) + async-pool (0.7.0) + async (>= 1.25) + async-service (0.12.0) + async + async-container (~> 0.16) aws-eventstream (1.2.0) aws-partitions (1.786.0) aws-sdk-core (3.178.0) @@ -128,6 +151,18 @@ GEM railties (>= 3.2) drb (2.2.1) erubi (1.12.0) + falcon (0.47.7) + async + async-container (~> 0.18) + async-http (~> 0.66, >= 0.66.3) + async-http-cache (~> 0.4.0) + async-service (~> 0.10) + bundler + localhost (~> 1.1) + openssl (~> 3.0) + process-metrics (~> 0.2.0) + protocol-rack (~> 0.5) + samovar (~> 2.3) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -147,6 +182,9 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) + io-endpoint (0.11.0) + io-event (1.6.5) + io-stream (0.4.0) irb (1.7.3) reline (>= 0.3.6) jmespath (1.6.2) @@ -157,6 +195,7 @@ GEM llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) + localhost (1.3.1) loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -165,6 +204,7 @@ GEM net-imap net-pop net-smtp + mapping (1.1.1) marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.6) @@ -184,6 +224,7 @@ GEM nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) + openssl (3.2.0) openssl-oaep (0.1.0) parallel (1.23.0) parallel_tests (4.2.1) @@ -194,9 +235,20 @@ GEM pg (1.5.3) pg (1.5.3-x64-mingw-ucrt) prettier_print (1.2.1) + process-metrics (0.2.1) + console (~> 1.8) + samovar (~> 2.1) + protocol-hpack (1.4.3) + protocol-http (0.26.6) + protocol-http1 (0.19.1) + protocol-http (~> 0.22) + protocol-http2 (0.18.0) + protocol-hpack (~> 1.4) + protocol-http (~> 0.18) + protocol-rack (0.6.0) + protocol-http (~> 0.23) + rack (>= 1.0) public_suffix (5.0.3) - puma (6.3.0) - nio4r (~> 2.0) racc (1.7.1) rack (2.2.7) rack-session (1.0.2) @@ -290,6 +342,9 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.13.0) + samovar (2.3.0) + console (~> 1.0) + mapping (~> 1.0) sentry-rails (5.10.0) railties (>= 5.0) sentry-ruby (~> 5.10.0) @@ -309,6 +364,8 @@ GEM prettier_print (>= 1.2.0) thor (1.2.2) timeout (0.4.1) + timers (4.3.5) + traces (0.11.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2023.3) @@ -339,13 +396,13 @@ DEPENDENCIES counter_culture (~> 3.2) debug dotenv-rails (~> 2.8) + falcon (~> 0.47.7) http (~> 5.1) jwt (~> 2.8) nokogiri (~> 1.14.0.rc1) openssl-oaep (~> 0.1.0) parallel_tests (~> 4.2) pg (~> 1.4) - puma (~> 6.3) rails (~> 7.1) rails-i18n (~> 7.0) rbnacl (~> 7.1) diff --git a/backend/app/controllers/sonolus/levels_controller.rb b/backend/app/controllers/sonolus/levels_controller.rb index caf1f2d..a36ae76 100644 --- a/backend/app/controllers/sonolus/levels_controller.rb +++ b/backend/app/controllers/sonolus/levels_controller.rb @@ -219,11 +219,11 @@ def list .sonolus_listed charts = - charts.where("charts.rating >= ?", params[:q_rating_min]) if params[ + charts.where(charts: { rating: (params[:q_rating_min]).. }) if params[ :q_rating_min ].present? charts = - charts.where("charts.rating <= ?", params[:q_rating_max]) if params[ + charts.where(charts: { rating: ..(params[:q_rating_max]) }) if params[ :q_rating_max ].present? case params[:q_sort].to_i diff --git a/backend/preload.rb b/backend/preload.rb index b34b952..f248621 100644 --- a/backend/preload.rb +++ b/backend/preload.rb @@ -1 +1,2 @@ +# frozen_string_literal: true require_relative "config/environment"