コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
820e4ac828 | ||
|
|
e13a52db9a |
@@ -5,7 +5,6 @@ class MaterialVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ class MaterialsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ class NicoTagsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
post_tag_max_sql =
|
||||
PostExternalTag
|
||||
|
||||
@@ -11,7 +11,6 @@ class PostVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@ class PostsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ class TagVersionsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@ class TagsController < ApplicationController
|
||||
|
||||
page = 1 if page < 1
|
||||
limit = 1 if limit < 1
|
||||
limit = 100 if limit > 100
|
||||
|
||||
offset = (page - 1) * limit
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ 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
|
||||
@@ -10,7 +9,6 @@ class TheatreCommentsController < ApplicationController
|
||||
comments = TheatreComment
|
||||
.where(theatre_id: params[:theatre_id])
|
||||
.where('no > ?', no_gt)
|
||||
.includes(:user)
|
||||
.order(no: :desc)
|
||||
.limit(limit)
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ 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
|
||||
@@ -11,7 +10,7 @@ class TheatreProgrammesController < ApplicationController
|
||||
.where(theatre_id: params[:theatre_id])
|
||||
.where('position > ?', position_gt)
|
||||
.includes(:post)
|
||||
.order(position: :desc)
|
||||
.order(position: :desc).limit(100)
|
||||
.limit(limit)
|
||||
|
||||
render json: programmes.map { |programme|
|
||||
|
||||
@@ -2,7 +2,6 @@ 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,5 @@
|
||||
class AddPostCountIndexToTags < ActiveRecord::Migration[8.0]
|
||||
def change
|
||||
add_index :tags, :post_count
|
||||
end
|
||||
end
|
||||
生成ファイル
+2
-1
@@ -10,7 +10,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
|
||||
ActiveRecord::Schema[8.0].define(version: 2026_11_15_000000) do
|
||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||
t.string "name", null: false
|
||||
t.string "record_type", null: false
|
||||
@@ -630,6 +630,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
|
||||
t.integer "post_count", default: 0, null: false
|
||||
t.integer "version_no", null: false
|
||||
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
||||
t.index ["post_count"], name: "index_tags_on_post_count"
|
||||
t.check_constraint "(`deprecated_at` is null) or (`category` <> _utf8mb4'nico')", name: "chk_tags_deprecated_at_not_nico"
|
||||
t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
|
||||
end
|
||||
|
||||
@@ -2,6 +2,19 @@ require 'rails_helper'
|
||||
|
||||
RSpec.describe Tag, type: :model do
|
||||
include WikiRecords
|
||||
|
||||
describe 'post_count index' do
|
||||
it 'has a non-unique index on post_count alone' do
|
||||
indexes = described_class.connection.indexes(described_class.table_name)
|
||||
|
||||
expect(indexes).to include(
|
||||
have_attributes(
|
||||
name: 'index_tags_on_post_count',
|
||||
columns: ['post_count'],
|
||||
unique: false))
|
||||
end
|
||||
end
|
||||
|
||||
describe '#has_description?' do
|
||||
let(:tag) { create(:tag) }
|
||||
|
||||
|
||||
@@ -1,174 +0,0 @@
|
||||
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
|
||||
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
|
||||
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
|
||||
})
|
||||
|
||||
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
|
||||
renderSidebar ()
|
||||
|
||||
// jsdom has no layout; guard the responsive classes responsible for clipping.
|
||||
const sidebar = screen.getByText ('Sidebar body')
|
||||
|
||||
expect (sidebar).not.toHaveClass ('overflow-y-auto')
|
||||
expect (sidebar).toHaveClass ('md:overflow-y-auto')
|
||||
})
|
||||
|
||||
it ('uses maxWidth without applying the container main-width reserve twice', async () => {
|
||||
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
|
||||
const onWidthChange = vi.fn ()
|
||||
|
||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
||||
</style>
|
||||
</Helmet>
|
||||
|
||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
||||
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||
{children}
|
||||
</div>
|
||||
|
||||
|
||||
@@ -35,6 +35,10 @@ const renderPage = () =>
|
||||
describe ('TagDetailPage', () => {
|
||||
beforeEach (() => {
|
||||
vi.clearAllMocks ()
|
||||
tagsApi.fetchTag.mockReset ()
|
||||
api.apiPut.mockReset ()
|
||||
api.isApiError.mockReset ()
|
||||
toastApi.toast.mockReset ()
|
||||
api.isApiError.mockReturnValue (false)
|
||||
})
|
||||
|
||||
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
|
||||
})
|
||||
|
||||
it ('submits edited tag fields', async () => {
|
||||
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
|
||||
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
|
||||
tagsApi.fetchTag
|
||||
.mockResolvedValue (updatedTag)
|
||||
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
|
||||
api.apiPut.mockResolvedValueOnce (updatedTag)
|
||||
|
||||
renderPage ()
|
||||
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする