コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
9cba244d10 |
@@ -28,19 +28,17 @@ class NicoTagsController < ApplicationController
|
|||||||
'ON post_tag_max.external_tag_id = external_tags.id')
|
'ON post_tag_max.external_tag_id = external_tags.id')
|
||||||
.includes(linked_tags: [:tag_names, :tag_descriptions])
|
.includes(linked_tags: [:tag_names, :tag_descriptions])
|
||||||
if name
|
if name
|
||||||
name_pattern = ExternalTag.sanitize_sql_like(name).tr('*?', '%_')
|
|
||||||
q = q.where(('external_tags.name LIKE ? ' +
|
q = q.where(('external_tags.name LIKE ? ' +
|
||||||
"OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"),
|
"OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"),
|
||||||
"%#{ name_pattern }%", "%#{ name_pattern }")
|
"%#{ name }%", "%#{ name }")
|
||||||
end
|
end
|
||||||
|
|
||||||
if linked_tag
|
if linked_tag
|
||||||
linked_tag_pattern = "%#{ Tag.sanitize_sql_like(linked_tag).tr('*?', '%_') }%"
|
|
||||||
linked_tag_ids =
|
linked_tag_ids =
|
||||||
Tag
|
Tag
|
||||||
.joins(:tag_names)
|
.joins(:tag_names)
|
||||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true })
|
.where(tag_names: { language_code: locale.language_code, primary_flg: true })
|
||||||
.where('tag_names.name LIKE ?', linked_tag_pattern)
|
.where('tag_names.name LIKE ?', "%#{ linked_tag }%")
|
||||||
.pluck(:id)
|
.pluck(:id)
|
||||||
linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id)
|
linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id)
|
||||||
q = q.where(id: linked_nico_tag_ids)
|
q = q.where(id: linked_nico_tag_ids)
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ class PostsController < ApplicationController
|
|||||||
:tag_names, :tag_descriptions] }])
|
:tag_names, :tag_descriptions] }])
|
||||||
.with_attached_thumbnail
|
.with_attached_thumbnail
|
||||||
|
|
||||||
q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url
|
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||||
q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title
|
q = q.where('posts.title LIKE ?', "%#{ title }%") if title
|
||||||
if original_created_from
|
if original_created_from
|
||||||
q = q.where('posts.original_created_before > ?', original_created_from)
|
q = q.where('posts.original_created_before > ?', original_created_from)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
post_id = params[:post]
|
post_id = params[:post]
|
||||||
|
|
||||||
name = params[:name].to_s.strip.presence
|
name = params[:name].presence
|
||||||
category = params[:category].to_s.strip.presence
|
category = params[:category].presence
|
||||||
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
||||||
(params[:post_count_lte].presence || -1).to_i
|
(params[:post_count_lte].presence || -1).to_i
|
||||||
post_count_between[0] = nil if post_count_between[0] < 0
|
post_count_between[0] = nil if post_count_between[0] < 0
|
||||||
@@ -56,11 +56,10 @@ class TagsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
if name
|
if name
|
||||||
name_pattern = "%#{ Tag.sanitize_sql_like(name).tr('*?', '%_') }%"
|
tags = tags.where('tag_names.name LIKE ?', "%#{ name }%")
|
||||||
tags = tags.where('tag_names.name LIKE ?', name_pattern)
|
|
||||||
external_tags =
|
external_tags =
|
||||||
external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?",
|
external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?",
|
||||||
name_pattern)
|
"%#{ name }%")
|
||||||
end
|
end
|
||||||
|
|
||||||
if category == 'nico'
|
if category == 'nico'
|
||||||
|
|||||||
@@ -3,56 +3,6 @@ require 'rails_helper'
|
|||||||
|
|
||||||
RSpec.describe 'NicoTags', type: :request do
|
RSpec.describe 'NicoTags', type: :request do
|
||||||
describe 'GET /tags/nico' do
|
describe 'GET /tags/nico' do
|
||||||
[:name, :linked_tag].each do |field|
|
|
||||||
context "when #{ field } contains wildcards" do
|
|
||||||
let!(:search_tags) do
|
|
||||||
names = ['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end']
|
|
||||||
names.map.with_index do |name, index|
|
|
||||||
if field == :name
|
|
||||||
create(:external_tag, name:)
|
|
||||||
else
|
|
||||||
destination = create(:tag, primary_name: name)
|
|
||||||
external = create(:external_tag, name: "wild-linked-#{ index }")
|
|
||||||
NicoTagRelation.create!(nico_tag: external, tag: destination)
|
|
||||||
external
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
{
|
|
||||||
'%' => [0, 4],
|
|
||||||
'_' => [1, 4],
|
|
||||||
'wild%end' => [0],
|
|
||||||
'wild_end' => [1],
|
|
||||||
'wild*end' => [0, 1, 2, 3, 4],
|
|
||||||
'wild?end' => [0, 1, 2],
|
|
||||||
'wild??end' => [3, 4],
|
|
||||||
'wild%*end' => [0, 4],
|
|
||||||
'wild_?nd' => [1],
|
|
||||||
'wild%?end' => [4] }.each do |query, indices|
|
|
||||||
it "filters #{ field } with #{ query.inspect }" do
|
|
||||||
get '/tags/nico', params: { field => query }
|
|
||||||
|
|
||||||
expected_ids = indices.map { |index| search_tags[index].id }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('tags').pluck('id')).to match_array(expected_ids)
|
|
||||||
expect(json.fetch('count')).to eq(expected_ids.size)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'supports wildcards in qualified external names' do
|
|
||||||
external = create(:external_tag, name: 'qualified_end')
|
|
||||||
create(:external_tag, name: 'qualifiedABend')
|
|
||||||
|
|
||||||
get '/tags/nico', params: { name: 'nico:qualified?end' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.fetch('tags').pluck('id')).to eq([external.id])
|
|
||||||
expect(json.fetch('count')).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns the legacy Tag-compatible external fields' do
|
it 'returns the legacy Tag-compatible external fields' do
|
||||||
external = create(:external_tag, name: 'legacy_external', post_count: 3)
|
external = create(:external_tag, name: 'legacy_external', post_count: 3)
|
||||||
|
|
||||||
|
|||||||
@@ -516,45 +516,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
[:title, :url].each do |field|
|
|
||||||
context "when #{field} contains wildcards" do
|
|
||||||
let!(:search_posts) do
|
|
||||||
values = [
|
|
||||||
'needle%25end', 'needleX25end', 'needle_end',
|
|
||||||
'needleXend', 'needleABend', 'needle%25_end']
|
|
||||||
values.map.with_index do |value, index|
|
|
||||||
Post.create!(uploaded_user: user,
|
|
||||||
title: field == :title ? "prefix #{value} suffix" : 'url search post',
|
|
||||||
url: field == :url ? "https://example.com/prefix-#{value}-suffix" :
|
|
||||||
"https://example.com/title-search-#{index}")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
{
|
|
||||||
'%' => [0, 5],
|
|
||||||
'_' => [2, 5],
|
|
||||||
'needle%25end' => [0],
|
|
||||||
'needle_end' => [2],
|
|
||||||
'needle*end' => [0, 1, 2, 3, 4, 5],
|
|
||||||
'needle?end' => [2, 3],
|
|
||||||
'needle??end' => [4],
|
|
||||||
'needle%*end' => [0, 5],
|
|
||||||
'needle_?nd' => [2],
|
|
||||||
'needle%25_end' => [5],
|
|
||||||
'needle%25_*end' => [5]
|
|
||||||
}.each do |query, expected_indices|
|
|
||||||
it "matches #{query.inspect} using only * and ? as wildcards" do
|
|
||||||
get '/posts', params: { field => query }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expected_ids = expected_indices.map { |i| search_posts[i].id }
|
|
||||||
expect(json.fetch('posts').map { |p| p['id'] }).to match_array(expected_ids)
|
|
||||||
expect(json.fetch('count')).to eq(expected_ids.size)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when created_from/created_to are provided' do
|
context 'when created_from/created_to are provided' do
|
||||||
let(:t_created_hit) { Time.zone.local(2010, 1, 5, 12, 0, 0) }
|
let(:t_created_hit) { Time.zone.local(2010, 1, 5, 12, 0, 0) }
|
||||||
let(:t_created_miss) { Time.zone.local(2012, 1, 5, 12, 0, 0) }
|
let(:t_created_miss) { Time.zone.local(2012, 1, 5, 12, 0, 0) }
|
||||||
|
|||||||
@@ -39,46 +39,6 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /tags' do
|
describe 'GET /tags' do
|
||||||
context 'when the name contains wildcards' do
|
|
||||||
let!(:tn) { create(:tag_name, name: 'background-tag') }
|
|
||||||
|
|
||||||
let(:names) do
|
|
||||||
['wild%end', 'wild_end', 'wildXend', 'wildABend', 'wild%_end']
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
names.each do |name|
|
|
||||||
create(:tag, primary_name: name)
|
|
||||||
create(:external_tag, name:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
{
|
|
||||||
'%' => [0, 4],
|
|
||||||
'_' => [1, 4],
|
|
||||||
'wild%end' => [0],
|
|
||||||
'wild_end' => [1],
|
|
||||||
'wild*end' => [0, 1, 2, 3, 4],
|
|
||||||
'wild?end' => [0, 1, 2],
|
|
||||||
'wild??end' => [3, 4],
|
|
||||||
'wild%*end' => [0, 4],
|
|
||||||
'wild_?nd' => [1],
|
|
||||||
'wild%?end' => [4],
|
|
||||||
'nico:wild?end' => [0, 1, 2] }.each do |query, indices|
|
|
||||||
it "filters internal and external names with #{ query.inspect }" do
|
|
||||||
get '/tags', params: { name: query }
|
|
||||||
|
|
||||||
expected_names = indices.flat_map do |index|
|
|
||||||
name = names[index]
|
|
||||||
query.start_with?('nico:') ? ["nico:#{ name }"] : [name, "nico:#{ name }"]
|
|
||||||
end
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(response_names).to match_array(expected_names)
|
|
||||||
expect(json.fetch('count')).to eq(expected_names.size)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'serialises descriptions and parents without loading legacy Wiki pages' do
|
it 'serialises descriptions and parents without loading legacy Wiki pages' do
|
||||||
TagDescription.create!(tag:, language_code: 'ja', body: '', version_no: 1)
|
TagDescription.create!(tag:, language_code: 'ja', body: '', version_no: 1)
|
||||||
TagDescription.create!(tag: tag2, language_code: 'ja', body: '', version_no: 1)
|
TagDescription.create!(tag: tag2, language_code: 'ja', body: '', version_no: 1)
|
||||||
|
|||||||
+2
-2
@@ -6,8 +6,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc -b && npm run build:client && npm run build:server",
|
"build": "tsc -b && npm run build:client && npm run build:server",
|
||||||
"build:client": "vite build --outDir dist/client",
|
"build:client": "NODE_ENV=production vite build --outDir dist/client",
|
||||||
"build:server": "vite build --ssr src/entry-server.tsx --outDir dist/server",
|
"build:server": "NODE_ENV=production vite build --ssr src/entry-server.tsx --outDir dist/server",
|
||||||
"start": "node server.mjs",
|
"start": "node server.mjs",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"test": "vitest",
|
"test": "vitest",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { spawn } from 'node:child_process'
|
|||||||
import { after, before, test } from 'node:test'
|
import { after, before, test } from 'node:test'
|
||||||
import { createServer as createViteServer } from 'vite'
|
import { createServer as createViteServer } from 'vite'
|
||||||
|
|
||||||
import { render } from './dist/server/entry-server.js'
|
import { render, renderSitemap } from './dist/server/entry-server.js'
|
||||||
|
|
||||||
const origin = 'https://ssr.example.invalid'
|
const origin = 'https://ssr.example.invalid'
|
||||||
const date = '2026-09-15T00:00:00+09:00'
|
const date = '2026-09-15T00:00:00+09:00'
|
||||||
@@ -366,6 +366,15 @@ test ('counts SSR renders the shell without result requests or embedded results'
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test ('noindex theatre routes are absent from sitemap', async () => {
|
||||||
|
const start = requests.length
|
||||||
|
const result = await renderSitemap ('/sitemap-ja-theatres-1.xml', origin, apiURL)
|
||||||
|
const calls = requests.slice (start).map (request => new URL (request.url, origin))
|
||||||
|
|
||||||
|
assert.equal (result.status, 404)
|
||||||
|
assert.equal (calls.some (url => url.pathname === '/sitemap_entries/theatres'), false)
|
||||||
|
})
|
||||||
|
|
||||||
test ('every canonical screen route returns page HTML without JavaScript', async t => {
|
test ('every canonical screen route returns page HTML without JavaScript', async t => {
|
||||||
const cookie = await authenticatedCookie ()
|
const cookie = await authenticatedCookie ()
|
||||||
for (const route of routes) {
|
for (const route of routes) {
|
||||||
@@ -393,7 +402,10 @@ test ('every canonical screen route returns page HTML without JavaScript', async
|
|||||||
if (route.path === 'posts/:id')
|
if (route.path === 'posts/:id')
|
||||||
assert.match (result.head, new RegExp (`SSR post ${locale}`))
|
assert.match (result.head, new RegExp (`SSR post ${locale}`))
|
||||||
if (route.path === 'theatres/:id')
|
if (route.path === 'theatres/:id')
|
||||||
|
{
|
||||||
assert.match (result.html.replace (/<[^>]*>/g, ''), /SSR[ ]theatre/)
|
assert.match (result.html.replace (/<[^>]*>/g, ''), /SSR[ ]theatre/)
|
||||||
|
assert.equal (route.handle?.robots, 'noindex')
|
||||||
|
}
|
||||||
if (route.path === 'wiki' || route.path === 'wiki/:title')
|
if (route.path === 'wiki' || route.path === 'wiki/:title')
|
||||||
assert.match (result.html, new RegExp (`SSR wiki body ${locale}|SSR`))
|
assert.match (result.html, new RegExp (`SSR wiki body ${locale}|SSR`))
|
||||||
assert.doesNotMatch (result.html, /Switched to client rendering|template id="B:/)
|
assert.doesNotMatch (result.html, /Switched to client rendering|template id="B:/)
|
||||||
|
|||||||
+2
-1
@@ -152,7 +152,8 @@ export const pageRoutes = (
|
|||||||
{ path: 'tags/changes', element: <TagHistoryPage/>,
|
{ path: 'tags/changes', element: <TagHistoryPage/>,
|
||||||
handle: { preload: TagHistoryPage.preload } },
|
handle: { preload: TagHistoryPage.preload } },
|
||||||
{ path: 'theatres/:id', element: <TheatreDetailPage user={user}/>,
|
{ path: 'theatres/:id', element: <TheatreDetailPage user={user}/>,
|
||||||
handle: { preload: TheatreDetailPage.preload, sitemap: ['theatres'] } },
|
handle: { preload: TheatreDetailPage.preload, robots: 'noindex',
|
||||||
|
sitemap: ['theatres'] } },
|
||||||
{ path: 'materials', element: <MaterialBasePage/>,
|
{ path: 'materials', element: <MaterialBasePage/>,
|
||||||
handle: { preload: MaterialBasePage.preload }, children: [
|
handle: { preload: MaterialBasePage.preload }, children: [
|
||||||
{ index: true, element: <MaterialListPage/>,
|
{ index: true, element: <MaterialListPage/>,
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする