コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
d830ac0311 | ||
|
|
7585f51e01 |
@@ -5,6 +5,7 @@ class MaterialVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ class MaterialsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class NicoTagsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
post_tag_max_sql =
|
post_tag_max_sql =
|
||||||
PostExternalTag
|
PostExternalTag
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ class PostVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ class TagVersionsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
page = 1 if page < 1
|
page = 1 if page < 1
|
||||||
limit = 1 if limit < 1
|
limit = 1 if limit < 1
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ class TheatreCommentsController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 20 if limit <= 0
|
limit = 20 if limit <= 0
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
no_gt = params[:no_gt].to_i
|
no_gt = params[:no_gt].to_i
|
||||||
no_gt = 0 if no_gt < 0
|
no_gt = 0 if no_gt < 0
|
||||||
@@ -9,6 +10,7 @@ class TheatreCommentsController < ApplicationController
|
|||||||
comments = TheatreComment
|
comments = TheatreComment
|
||||||
.where(theatre_id: params[:theatre_id])
|
.where(theatre_id: params[:theatre_id])
|
||||||
.where('no > ?', no_gt)
|
.where('no > ?', no_gt)
|
||||||
|
.includes(:user)
|
||||||
.order(no: :desc)
|
.order(no: :desc)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ class TheatreProgrammesController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 100 if limit <= 0
|
limit = 100 if limit <= 0
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
position_gt = params[:position_gt].to_i
|
position_gt = params[:position_gt].to_i
|
||||||
position_gt = 0 if position_gt < 0
|
position_gt = 0 if position_gt < 0
|
||||||
@@ -10,7 +11,7 @@ class TheatreProgrammesController < ApplicationController
|
|||||||
.where(theatre_id: params[:theatre_id])
|
.where(theatre_id: params[:theatre_id])
|
||||||
.where('position > ?', position_gt)
|
.where('position > ?', position_gt)
|
||||||
.includes(:post)
|
.includes(:post)
|
||||||
.order(position: :desc).limit(100)
|
.order(position: :desc)
|
||||||
.limit(limit)
|
.limit(limit)
|
||||||
|
|
||||||
render json: programmes.map { |programme|
|
render json: programmes.map { |programme|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ class TheatreSkipEventsController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
limit = params[:limit].to_i
|
limit = params[:limit].to_i
|
||||||
limit = 50 if limit <= 0
|
limit = 50 if limit <= 0
|
||||||
|
limit = 100 if limit > 100
|
||||||
|
|
||||||
events =
|
events =
|
||||||
TheatreSkipEvent
|
TheatreSkipEvent
|
||||||
|
|||||||
@@ -0,0 +1,174 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'List API limits', type: :request do
|
||||||
|
shared_examples 'a capped list' do |default_count, minimum_count, paginated|
|
||||||
|
def response_rows
|
||||||
|
body = json
|
||||||
|
body.is_a?(Array) ? body : body.fetch(collection_key)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'caps oversized limits at 100 and preserves the 100 boundary' do
|
||||||
|
get path, params: { locale: 'ja', limit: 100 }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows.size).to eq(100)
|
||||||
|
boundary_rows = response_rows
|
||||||
|
|
||||||
|
[101, 10_000].each do |limit|
|
||||||
|
get path, params: { locale: 'ja', limit: }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows).to eq(boundary_rows)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'preserves the default, nonpositive and small positive limits' do
|
||||||
|
get path, params: { locale: 'ja' }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows.size).to eq(default_count)
|
||||||
|
|
||||||
|
[0, -1].each do |limit|
|
||||||
|
get path, params: { locale: 'ja', limit: }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows.size).to eq(minimum_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
get path, params: { locale: 'ja', limit: 2 }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows.size).to eq(2)
|
||||||
|
end
|
||||||
|
|
||||||
|
if paginated
|
||||||
|
it 'uses the capped limit for page offsets and preserves total count' do
|
||||||
|
get path, params: { locale: 'ja', limit: 100 }
|
||||||
|
first_page = response_rows
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('count')).to eq(101)
|
||||||
|
|
||||||
|
get path, params: { locale: 'ja', limit: 100, page: 2 }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows.size).to eq(1)
|
||||||
|
second_page = response_rows
|
||||||
|
expect(first_page & second_page).to be_empty
|
||||||
|
|
||||||
|
get path, params: { locale: 'ja', limit: 101, page: 2 }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(response_rows).to eq(second_page)
|
||||||
|
expect(json.fetch('count')).to eq(101)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'posts' do
|
||||||
|
let(:path) { '/posts' }
|
||||||
|
let(:collection_key) { 'posts' }
|
||||||
|
before { create_list(:post, 101) }
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'tags' do
|
||||||
|
let(:path) { '/tags' }
|
||||||
|
let(:collection_key) { 'tags' }
|
||||||
|
before { create_list(:tag, 101) }
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'nico tags' do
|
||||||
|
let(:path) { '/tags/nico' }
|
||||||
|
let(:collection_key) { 'tags' }
|
||||||
|
before { create_list(:external_tag, 101) }
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'materials' do
|
||||||
|
let(:path) { '/materials' }
|
||||||
|
let(:collection_key) { 'materials' }
|
||||||
|
before do
|
||||||
|
101.times { |index| Material.create!(url: "https://example.com/material-#{ index }") }
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'post versions' do
|
||||||
|
let(:path) { '/posts/versions' }
|
||||||
|
let(:collection_key) { 'versions' }
|
||||||
|
let(:post) { create(:post) }
|
||||||
|
before do
|
||||||
|
101.times do |index|
|
||||||
|
PostVersion.create!(post:, version_no: index + 1, event_type: 'update',
|
||||||
|
url: post.url, tags: '', tags_json: [], parent_post_ids: '')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'tag versions' do
|
||||||
|
let(:path) { '/tags/versions' }
|
||||||
|
let(:collection_key) { 'versions' }
|
||||||
|
let(:tag) { create(:tag) }
|
||||||
|
before do
|
||||||
|
101.times do |index|
|
||||||
|
TagVersion.create!(tag:, version_no: index + 1, event_type: 'update',
|
||||||
|
name: 'limit tag', category: 'general', aliases: '',
|
||||||
|
parent_tag_ids: '', names: {
|
||||||
|
ja: { name: 'limit tag', script_code: 'Jpan',
|
||||||
|
auto_generated: false, aliases: [] } })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'material versions' do
|
||||||
|
let(:path) { '/materials/versions' }
|
||||||
|
let(:collection_key) { 'versions' }
|
||||||
|
let(:material) { Material.create!(url: 'https://example.com/material') }
|
||||||
|
before do
|
||||||
|
101.times do |index|
|
||||||
|
MaterialVersion.create!(material:, version_no: index + 1,
|
||||||
|
event_type: 'update', url: material.url)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 1, true
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'theatre lists' do
|
||||||
|
let(:theatre) { create(:theatre) }
|
||||||
|
let(:post) { create(:post) }
|
||||||
|
|
||||||
|
context 'comments' do
|
||||||
|
let(:path) { "/theatres/#{ theatre.id }/comments" }
|
||||||
|
before { create_list(:theatre_comment, 101, theatre:, user: theatre.created_by_user) }
|
||||||
|
|
||||||
|
include_examples 'a capped list', 20, 20, false
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'programmes' do
|
||||||
|
let(:path) { "/theatres/#{ theatre.id }/programmes" }
|
||||||
|
before do
|
||||||
|
101.times do |index|
|
||||||
|
TheatreProgramme.create!(theatre:, post:, position: index + 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 100, 100, false
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'skip events' do
|
||||||
|
let(:path) { "/theatres/#{ theatre.id }/skip_events" }
|
||||||
|
before do
|
||||||
|
101.times do |index|
|
||||||
|
TheatreSkipEvent.create!(theatre:, post:,
|
||||||
|
skipped_by_user: theatre.created_by_user,
|
||||||
|
created_at: Time.utc(2026, 1, 1) + index.seconds)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
include_examples 'a capped list', 50, 50, false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
||||||
import { PassThrough } from 'node:stream'
|
import { PassThrough } from 'node:stream'
|
||||||
import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
|
import { renderToPipeableStream } from 'react-dom/server'
|
||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { I18nextProvider } from 'react-i18next'
|
import { I18nextProvider } from 'react-i18next'
|
||||||
import { createStaticHandler, createStaticRouter,
|
import { createStaticHandler, createStaticRouter,
|
||||||
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
|
|||||||
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
||||||
import { apiGet, isApiError } from '@/lib/api'
|
import { apiGet, isApiError } from '@/lib/api'
|
||||||
import { createUII18n } from '@/lib/i18n'
|
import { createUII18n } from '@/lib/i18n'
|
||||||
import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
|
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
|
||||||
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
||||||
import { withRenderContext } from '@/lib/renderContext.server'
|
import { withRenderContext } from '@/lib/renderContext.server'
|
||||||
|
|
||||||
@@ -171,26 +171,8 @@ export const render = async (
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
const helmet = helmetContext.helmet!
|
const helmet = helmetContext.helmet!
|
||||||
const alternates = status === 200 && known != null
|
|
||||||
? await Promise.all (locales.locales.map (entry => entry.code)
|
|
||||||
.filter (isLocaleCode)
|
|
||||||
.filter (code => known.route.handle?.locale == null
|
|
||||||
|| known.route.handle.locale === code)
|
|
||||||
.map (async targetLocale => {
|
|
||||||
const location = { pathname: url.pathname, search: url.search, hash: '' }
|
|
||||||
const path = targetLocale === locale
|
|
||||||
? url.pathname + url.search
|
|
||||||
: (known.route.handle?.switchLocale != null
|
|
||||||
? await known.route.handle.switchLocale ({
|
|
||||||
location, params: known.params, locale, targetLocale })
|
|
||||||
: switchLocalePath (location, targetLocale))
|
|
||||||
return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
|
|
||||||
href={new URL (path, origin).href}/>
|
|
||||||
}))
|
|
||||||
: []
|
|
||||||
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
||||||
.map (entry => entry.toString ()).join ('')
|
.map (entry => entry.toString ()).join ('')
|
||||||
+ renderToStaticMarkup (<>{alternates}</>)
|
|
||||||
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
||||||
query.state.status !== 'pending'
|
query.state.status !== 'pending'
|
||||||
&& query.meta?.clientOnly !== true
|
&& query.meta?.clientOnly !== true
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする