コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
1b6c7358d4 |
@@ -28,19 +28,17 @@ class NicoTagsController < ApplicationController
|
||||
'ON post_tag_max.external_tag_id = external_tags.id')
|
||||
.includes(linked_tags: [:tag_names, :tag_descriptions])
|
||||
if name
|
||||
name_pattern = ExternalTag.sanitize_sql_like(name).tr('*?', '%_')
|
||||
q = q.where(('external_tags.name LIKE ? ' +
|
||||
"OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"),
|
||||
"%#{ name_pattern }%", "%#{ name_pattern }")
|
||||
"%#{ name }%", "%#{ name }")
|
||||
end
|
||||
|
||||
if linked_tag
|
||||
linked_tag_pattern = "%#{ Tag.sanitize_sql_like(linked_tag).tr('*?', '%_') }%"
|
||||
linked_tag_ids =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.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)
|
||||
linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id)
|
||||
q = q.where(id: linked_nico_tag_ids)
|
||||
|
||||
@@ -46,8 +46,8 @@ class PostsController < ApplicationController
|
||||
:tag_names, :tag_descriptions] }])
|
||||
.with_attached_thumbnail
|
||||
|
||||
q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url
|
||||
q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title
|
||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||
q = q.where('posts.title LIKE ?', "%#{ title }%") if title
|
||||
if original_created_from
|
||||
q = q.where('posts.original_created_before > ?', original_created_from)
|
||||
end
|
||||
|
||||
@@ -9,8 +9,8 @@ class TagsController < ApplicationController
|
||||
|
||||
post_id = params[:post]
|
||||
|
||||
name = params[:name].to_s.strip.presence
|
||||
category = params[:category].to_s.strip.presence
|
||||
name = params[:name].presence
|
||||
category = params[:category].presence
|
||||
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
||||
(params[:post_count_lte].presence || -1).to_i
|
||||
post_count_between[0] = nil if post_count_between[0] < 0
|
||||
@@ -56,11 +56,10 @@ class TagsController < ApplicationController
|
||||
end
|
||||
|
||||
if name
|
||||
name_pattern = "%#{ Tag.sanitize_sql_like(name).tr('*?', '%_') }%"
|
||||
tags = tags.where('tag_names.name LIKE ?', name_pattern)
|
||||
tags = tags.where('tag_names.name LIKE ?', "%#{ name }%")
|
||||
external_tags =
|
||||
external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?",
|
||||
name_pattern)
|
||||
"%#{ name }%")
|
||||
end
|
||||
|
||||
if category == 'nico'
|
||||
|
||||
@@ -3,56 +3,6 @@ require 'rails_helper'
|
||||
|
||||
RSpec.describe 'NicoTags', type: :request 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
|
||||
external = create(:external_tag, name: 'legacy_external', post_count: 3)
|
||||
|
||||
|
||||
@@ -516,45 +516,6 @@ RSpec.describe 'Posts API', type: :request do
|
||||
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
|
||||
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) }
|
||||
|
||||
@@ -39,46 +39,6 @@ RSpec.describe 'Tags API', type: :request do
|
||||
end
|
||||
|
||||
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
|
||||
TagDescription.create!(tag:, language_code: 'ja', body: '', version_no: 1)
|
||||
TagDescription.create!(tag: tag2, language_code: 'ja', body: '', version_no: 1)
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
import { act, cleanup, render } from '@testing-library/react'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { GekanatorBackdrop } from '@/pages/GekanatorPage'
|
||||
import { buildPost } from '@/test/factories'
|
||||
|
||||
import type { CSSProperties, ReactNode } from 'react'
|
||||
|
||||
vi.mock ('framer-motion', async importOriginal => ({
|
||||
...await importOriginal<typeof import ('framer-motion')> (),
|
||||
motion: {
|
||||
div: (
|
||||
{ children, animate: animation, initial, transition, style }: {
|
||||
children?: ReactNode
|
||||
animate?: { scale?: number; rotateY?: number }
|
||||
initial?: { rotateY?: number }
|
||||
transition?: { duration?: number }
|
||||
style?: CSSProperties },
|
||||
) => (
|
||||
<div
|
||||
data-scale={animation?.scale}
|
||||
data-rotation={animation?.rotateY}
|
||||
data-initial-rotation={initial?.rotateY}
|
||||
data-duration={transition?.duration}
|
||||
data-columns={style?.gridTemplateColumns}>
|
||||
{children}
|
||||
</div>) } }))
|
||||
|
||||
const target = buildPost ({ id: 1, thumbnail: 'https://example.com/target.jpg' })
|
||||
const candidates = [
|
||||
buildPost ({ id: 2, thumbnail: 'https://example.com/second.jpg' }),
|
||||
buildPost ({ id: 3, thumbnail: 'https://example.com/third.jpg' })]
|
||||
const candidateThumbnails = candidates.map (post => post.thumbnail)
|
||||
|
||||
describe.each ([
|
||||
{ motionMode: 'on', duration: 450, columns: 10 },
|
||||
{ motionMode: 'calm', duration: 600, columns: 7 }] as const) (
|
||||
'GekanatorBackdrop winning-run collapse ($motionMode)',
|
||||
({ motionMode, duration, columns }) => {
|
||||
const props = {
|
||||
posts: [target],
|
||||
mascotAsset: '/mascot.png',
|
||||
phase: 'question' as const,
|
||||
visualSeed: 'winning-run',
|
||||
motionMode,
|
||||
winningRunTargetPost: target,
|
||||
winningRunQuestionCount: 2 }
|
||||
|
||||
beforeEach (() => {
|
||||
vi.useFakeTimers ()
|
||||
})
|
||||
|
||||
afterEach (() => {
|
||||
cleanup ()
|
||||
vi.useRealTimers ()
|
||||
})
|
||||
|
||||
it ('flips the old target to normal candidates before restoring the scale', () => {
|
||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="collapsed"
|
||||
winningRunTargetPost={null}
|
||||
winningRunQuestionCount={0}/>)
|
||||
|
||||
const flips = container.querySelectorAll ('[data-rotation="180"]')
|
||||
expect (flips).toHaveLength (9 * 8 * 8)
|
||||
for (const flip of flips) {
|
||||
const images = flip.querySelectorAll ('img')
|
||||
expect (flip).toHaveAttribute ('data-initial-rotation', '0')
|
||||
expect (flip).toHaveAttribute ('data-duration', String (duration / 1000))
|
||||
expect (images).toHaveLength (2)
|
||||
expect (candidateThumbnails).toContain (images[0].getAttribute ('src'))
|
||||
expect (images[1]).toHaveAttribute ('src', target.thumbnail)
|
||||
}
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '2')
|
||||
|
||||
act (() => { vi.advanceTimersByTime (duration - 1) })
|
||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (flips.length)
|
||||
act (() => { vi.advanceTimersByTime (1) })
|
||||
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute ('data-scale', '1')
|
||||
expect (container.querySelector ('[data-columns]')).toHaveAttribute (
|
||||
'data-columns', `repeat(${ columns }, minmax(0, 1fr))`)
|
||||
const images = container.querySelectorAll ('img')
|
||||
expect (images).toHaveLength (9 * columns * columns)
|
||||
for (const image of images)
|
||||
expect (candidateThumbnails).toContain (image.getAttribute ('src'))
|
||||
})
|
||||
|
||||
it ('cancels the collapse when a winning run resumes during the flip', () => {
|
||||
const { container, rerender } = render (<GekanatorBackdrop {...props}/>)
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="collapsed"
|
||||
winningRunTargetPost={null}
|
||||
winningRunQuestionCount={0}/>)
|
||||
expect (container.querySelectorAll ('[data-rotation="180"]')).toHaveLength (9 * 8 * 8)
|
||||
act (() => { vi.advanceTimersByTime (duration / 2) })
|
||||
|
||||
rerender (<GekanatorBackdrop {...props}
|
||||
posts={candidates}
|
||||
visualSeed="resumed"
|
||||
winningRunTargetPost={candidates[0]}
|
||||
winningRunQuestionCount={1}/>)
|
||||
|
||||
expect (container.querySelectorAll ('[data-rotation]')).toHaveLength (0)
|
||||
act (() => { vi.advanceTimersByTime (duration) })
|
||||
expect (container.querySelector ('[data-scale]')).toHaveAttribute (
|
||||
'data-scale', String (8 / 6))
|
||||
const images = container.querySelectorAll ('img')
|
||||
expect (images).toHaveLength (9 * 8 * 8)
|
||||
for (const image of images)
|
||||
expect (image).toHaveAttribute ('src', candidates[0].thumbnail)
|
||||
})
|
||||
})
|
||||
@@ -3203,7 +3203,7 @@ const backgroundPostsFor = ({
|
||||
}
|
||||
|
||||
|
||||
const GekanatorBackdrop: FC<{
|
||||
export const GekanatorBackdrop: FC<{
|
||||
posts: Post[]
|
||||
mascotAsset: string
|
||||
phase: Phase
|
||||
@@ -3362,6 +3362,9 @@ const GekanatorBackdrop: FC<{
|
||||
const renderedSettings = settingsForMode (displayedBackdropMode)
|
||||
const renderedTileCount = renderedSettings.columns * renderedSettings.rows
|
||||
const renderedScale = scaleForMode (displayedBackdropMode, displayedWinningRunCount)
|
||||
const tileFlipAllowed =
|
||||
displayedBackdropMode === 'normal'
|
||||
|| (displayedBackdropMode === 'winning_run' && backdropMode === 'normal')
|
||||
|
||||
const isGuessPresentation =
|
||||
backdropMode === 'guess' || displayedBackdropMode === 'guess'
|
||||
@@ -3609,16 +3612,14 @@ const GekanatorBackdrop: FC<{
|
||||
? toThumbnails[index % Math.max (toThumbnails.length, 1)]
|
||||
: currentThumbnail
|
||||
const thumbnail =
|
||||
displayedBackdropMode === 'winning_run'
|
||||
|| displayedBackdropMode === 'guess'
|
||||
? nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
||||
: currentThumbnail
|
||||
tileFlipAllowed
|
||||
? currentThumbnail
|
||||
: nextThumbnails[index % Math.max (nextThumbnails.length, 1)]
|
||||
if (!(thumbnail) || !(frontThumbnail) || !(backThumbnail))
|
||||
return null
|
||||
|
||||
const imageSource = ['intro', 'end'].includes (phase) ? mascotAsset : thumbnail
|
||||
const showStaticTile =
|
||||
displayedBackdropMode !== 'normal' || !(isFlippingTiles)
|
||||
const staticTile = !tileFlipAllowed || !isFlippingTiles
|
||||
|
||||
return (
|
||||
<motion.div
|
||||
@@ -3627,14 +3628,14 @@ const GekanatorBackdrop: FC<{
|
||||
layout={displayedBackdropMode !== 'normal'}
|
||||
transition={{ duration: tileFlipDuration, ease: 'easeInOut' }}
|
||||
style={{ perspective: 1600 }}>
|
||||
{showStaticTile && (
|
||||
{staticTile && (
|
||||
<img
|
||||
src={imageSource}
|
||||
alt=""
|
||||
className="absolute inset-0 h-full w-full object-cover"
|
||||
style={{ opacity: renderedSettings.opacity }}/>)
|
||||
}
|
||||
{!(showStaticTile) && (
|
||||
{!staticTile && (
|
||||
<motion.div
|
||||
className="absolute inset-0"
|
||||
initial={{ rotateY: 0 }}
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする