コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
d830ac0311 | ||
|
|
7585f51e01 |
@@ -5,6 +5,7 @@ class MaterialVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ class MaterialsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ class NicoTagsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
post_tag_max_sql =
|
||||
PostExternalTag
|
||||
|
||||
@@ -11,6 +11,7 @@ class PostVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ class PostsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ class TagVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ class TagsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ class TheatreCommentsController < ApplicationController
|
||||
def index
|
||||
limit = params[:limit].to_i
|
||||
limit = 20 if limit <= 0
|
||||
limit = 100 if limit > 100
|
||||
|
||||
no_gt = params[:no_gt].to_i
|
||||
no_gt = 0 if no_gt < 0
|
||||
@@ -9,6 +10,7 @@ class TheatreCommentsController < ApplicationController
|
||||
comments = TheatreComment
|
||||
.where(theatre_id: params[:theatre_id])
|
||||
.where('no > ?', no_gt)
|
||||
.includes(:user)
|
||||
.order(no: :desc)
|
||||
.limit(limit)
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ class TheatreProgrammesController < ApplicationController
|
||||
def index
|
||||
limit = params[:limit].to_i
|
||||
limit = 100 if limit <= 0
|
||||
limit = 100 if limit > 100
|
||||
|
||||
position_gt = params[:position_gt].to_i
|
||||
position_gt = 0 if position_gt < 0
|
||||
@@ -10,7 +11,7 @@ class TheatreProgrammesController < ApplicationController
|
||||
.where(theatre_id: params[:theatre_id])
|
||||
.where('position > ?', position_gt)
|
||||
.includes(:post)
|
||||
.order(position: :desc).limit(100)
|
||||
.order(position: :desc)
|
||||
.limit(limit)
|
||||
|
||||
render json: programmes.map { |programme|
|
||||
|
||||
@@ -2,6 +2,7 @@ class TheatreSkipEventsController < ApplicationController
|
||||
def index
|
||||
limit = params[:limit].to_i
|
||||
limit = 50 if limit <= 0
|
||||
limit = 100 if limit > 100
|
||||
|
||||
events =
|
||||
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
|
||||
@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
|
||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
|
||||
import type { FC, FormEvent, ReactNode } from 'react'
|
||||
import type { FC, FormEvent } from 'react'
|
||||
|
||||
import type { Post, TagWithSections } from '@/types'
|
||||
|
||||
@@ -23,8 +23,6 @@ type PostFormField =
|
||||
'parentPostIds' | 'tags' | 'videoMs'
|
||||
| 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
|
||||
|
||||
type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
|
||||
|
||||
const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
|
||||
[...new Set (values.flatMap (value => value ?? []))]
|
||||
|
||||
@@ -152,63 +150,12 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
const handleSubmit = async (e: FormEvent) => {
|
||||
e.preventDefault ()
|
||||
|
||||
if (disabled) return
|
||||
|
||||
setDisabled (true)
|
||||
try
|
||||
{
|
||||
const current: PostEditData = {
|
||||
title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore }
|
||||
const fields: {
|
||||
[Key in keyof PostEditData]-?: {
|
||||
name: ReactNode
|
||||
prev: PostEditData[Key] } } = {
|
||||
title: { name: label ('shared:labels.title'), prev: post.title },
|
||||
parentPostIds: {
|
||||
name: label ('shared:labels.parentPosts'),
|
||||
prev: (post.parentPosts ?? []).map (parent => parent.id).join (' ') },
|
||||
tags: { name: label ('tags:title'), prev: tagsToStr (post.tags) },
|
||||
duration: {
|
||||
name: label ('shared:labels.duration'),
|
||||
prev: videoMsToDurationValue (post.videoMs) },
|
||||
originalCreatedFrom: {
|
||||
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||
{label ('shared:labels.since')}</>,
|
||||
prev: post.originalCreatedFrom },
|
||||
originalCreatedBefore: {
|
||||
name: <>{label ('shared:labels.originalCreatedAt')}{' '}
|
||||
{label ('shared:labels.before')}</>,
|
||||
prev: post.originalCreatedBefore } }
|
||||
const differences = (Object.keys (fields) as (keyof PostEditData)[])
|
||||
.map (key => ({ key, name: fields[key].name,
|
||||
prev: fields[key].prev ?? '', current: current[key] ?? '' }))
|
||||
.filter (row => row.prev !== row.current)
|
||||
|
||||
if (!(await dialogue.confirm ({
|
||||
title: label ('shared:actions.diff'),
|
||||
confirmText: label ('shared:actions.update'),
|
||||
description: (
|
||||
<dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
|
||||
{differences.map (row => (
|
||||
<div key={row.key}>
|
||||
<dt className="font-semibold">{row.name}</dt>
|
||||
<dd className="whitespace-pre-wrap break-words">
|
||||
{row.prev && (
|
||||
<del className="block text-red-600 dark:text-red-400">
|
||||
{row.prev}
|
||||
</del>)}
|
||||
{row.current && (
|
||||
<ins className="block text-green-700 dark:text-green-400">
|
||||
{row.current}
|
||||
</ins>)}
|
||||
</dd>
|
||||
</div>))}
|
||||
</dl>) })))
|
||||
return
|
||||
|
||||
await update ({ id: post.id, ...current },
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
{ baseVersionNo: post.versionNo })
|
||||
}
|
||||
finally
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする