コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
c0f42ea0c0 |
@@ -218,16 +218,63 @@ class TagsController < ApplicationController
|
||||
locale = resolve_locale!
|
||||
|
||||
q = params[:q].to_s.strip.sub(/\Anot:/i, '')
|
||||
literal = ActiveRecord::Base.sanitize_sql_like(q)
|
||||
nico = bool?(:nico, default: true)
|
||||
present = bool?(:present, default: true)
|
||||
prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
|
||||
|
||||
rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
|
||||
if rows.length < 20 && q.present?
|
||||
suffix_rows = autocomplete_rows(locale:, pattern: "%#{ literal }", nico:, present:)
|
||||
rows = (rows + suffix_rows).uniq { [_1['category'], _1['id']] }.first(20)
|
||||
with_nico = bool?(:nico, default: true)
|
||||
present_only = bool?(:present, default: true)
|
||||
|
||||
alias_rows =
|
||||
TagName
|
||||
.where(language_code: locale.language_code, primary_flg: false)
|
||||
.where('name LIKE ?', prefix)
|
||||
.pluck(:tag_id, :name)
|
||||
|
||||
matched_alias_by_tag_id = { }
|
||||
tag_ids = []
|
||||
alias_rows.each do |tag_id, alias_name|
|
||||
tag_ids << tag_id
|
||||
matched_alias_by_tag_id[tag_id] ||= alias_name
|
||||
end
|
||||
|
||||
base =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
||||
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
||||
deprecated_at: nil)
|
||||
base = base.where('tags.post_count > 0') if present_only
|
||||
|
||||
canonical_hit = base.where('tag_names.name LIKE ?', prefix)
|
||||
|
||||
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
||||
|
||||
internal_rows =
|
||||
internal_tags
|
||||
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
||||
.limit(20)
|
||||
.map { |tag|
|
||||
TagRepr.base(tag, language_code: locale.language_code)
|
||||
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
||||
}
|
||||
|
||||
return render json: internal_rows unless with_nico
|
||||
|
||||
external_base = ExternalTag.all
|
||||
external_base = external_base.where('post_count > 0') if present_only
|
||||
|
||||
external_rows =
|
||||
external_base
|
||||
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
|
||||
.order(post_count: :desc, name: :asc)
|
||||
.limit(20)
|
||||
.map { external_tag_json(_1) }
|
||||
|
||||
rows =
|
||||
(internal_rows + external_rows)
|
||||
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
||||
.first(20)
|
||||
|
||||
render json: rows
|
||||
end
|
||||
|
||||
@@ -498,59 +545,6 @@ class TagsController < ApplicationController
|
||||
|
||||
private
|
||||
|
||||
def autocomplete_rows locale:, pattern:, nico:, present:
|
||||
alias_rows =
|
||||
TagName
|
||||
.where(language_code: locale.language_code, primary_flg: false)
|
||||
.where('name LIKE ?', pattern)
|
||||
.pluck(:tag_id, :name)
|
||||
|
||||
matched_alias_by_tag_id = { }
|
||||
tag_ids = []
|
||||
alias_rows.each do |tag_id, alias_name|
|
||||
tag_ids << tag_id
|
||||
matched_alias_by_tag_id[tag_id] ||= alias_name
|
||||
end
|
||||
|
||||
base =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
||||
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
||||
deprecated_at: nil)
|
||||
base = base.where('tags.post_count > 0') if present
|
||||
|
||||
canonical_hit = base.where('tag_names.name LIKE ?', pattern)
|
||||
|
||||
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
||||
|
||||
internal_rows =
|
||||
internal_tags
|
||||
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
||||
.limit(20)
|
||||
.map { |tag|
|
||||
TagRepr.base(tag, language_code: locale.language_code)
|
||||
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
||||
}
|
||||
|
||||
return internal_rows unless nico
|
||||
|
||||
external_base = ExternalTag.all
|
||||
external_base = external_base.where('post_count > 0') if present
|
||||
|
||||
external_rows =
|
||||
external_base
|
||||
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
|
||||
.order(post_count: :desc, name: :asc)
|
||||
.limit(20)
|
||||
.map { external_tag_json(_1) }
|
||||
|
||||
(internal_rows + external_rows)
|
||||
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
||||
.first(20)
|
||||
end
|
||||
|
||||
def material_filter_param default:
|
||||
value = params[:material_filter].to_s.presence
|
||||
return default unless ['present', 'missing', 'any'].include?(value)
|
||||
|
||||
@@ -482,7 +482,6 @@ RSpec.describe 'Tags API', type: :request do
|
||||
create(:tag, category: :general, primary_name: name, post_count: 1)
|
||||
create(:external_tag, name:, post_count: 1)
|
||||
end
|
||||
create(:external_tag, name: 'suffix_combined', post_count: 100)
|
||||
|
||||
get '/tags/autocomplete', params: { q: 'combined' }
|
||||
|
||||
@@ -491,39 +490,6 @@ RSpec.describe 'Tags API', type: :request do
|
||||
expect(json.map { |row| row.fetch('name') }).to eq(expected.first(20))
|
||||
end
|
||||
|
||||
it 'appends primary, alias, and external suffix matches without duplicate resources' do
|
||||
prefix = create(:tag, primary_name: 'tail', post_count: 1)
|
||||
create(:tag_name, :alias, name: 'tail_alias', tag: prefix)
|
||||
create(:tag_name, :alias, name: 'alias_tail', tag: prefix)
|
||||
create(:tag, primary_name: 'primary_tail', post_count: 4)
|
||||
alias_target = create(:tag, primary_name: 'alias_target', post_count: 3)
|
||||
create(:tag_name, :alias, name: 'suffix_tail', tag: alias_target)
|
||||
external = create(:external_tag, id: prefix.id, name: 'external_tail', post_count: 5)
|
||||
create(:tag, primary_name: 'middle_tail_only', post_count: 100)
|
||||
create(:external_tag, name: 'middle_tail_only', post_count: 100)
|
||||
|
||||
get '/tags/autocomplete', params: { q: 'tail' }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json.map { |row| row.fetch('name') }).to eq(
|
||||
['tail', 'nico:external_tail', 'primary_tail', 'alias_target'])
|
||||
expect(json.first.fetch('matched_alias')).to eq('tail_alias')
|
||||
expect(json.last.fetch('matched_alias')).to eq('suffix_tail')
|
||||
expect(json[1]).to include('id' => external.id, 'category' => 'nico')
|
||||
end
|
||||
|
||||
it 'fills only the remaining places with suffix matches' do
|
||||
names = 19.times.map { |number| "capacity_#{ number.to_s.rjust(2, '0') }" }
|
||||
names.each { create(:tag, primary_name: _1, post_count: 1) }
|
||||
create(:tag, primary_name: 'first_capacity', post_count: 3)
|
||||
create(:external_tag, name: 'second_capacity', post_count: 2)
|
||||
|
||||
get '/tags/autocomplete', params: { q: 'capacity' }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expect(json.map { |row| row.fetch('name') }).to eq(names + ['first_capacity'])
|
||||
end
|
||||
|
||||
it 'excludes external tags but preserves internal alias matches when nico is false' do
|
||||
internal = create(:tag, category: :general, primary_name: 'switch_internal', post_count: 1)
|
||||
alias_target = create(:tag, category: :general, primary_name: 'alias_target', post_count: 1)
|
||||
@@ -552,20 +518,12 @@ RSpec.describe 'Tags API', type: :request do
|
||||
create(:external_tag, name: literal, post_count: 1)
|
||||
create(:tag, category: :general, primary_name: 'literalXmatch', post_count: 2)
|
||||
create(:external_tag, name: 'literalXmatch', post_count: 2)
|
||||
suffix = "suffix_literal#{ wildcard }"
|
||||
create(:tag, primary_name: suffix, post_count: 1)
|
||||
suffix_alias = create(:tag, primary_name: 'suffix_alias_target', post_count: 1)
|
||||
create(:tag_name, :alias, name: "alias_#{ suffix }", tag: suffix_alias)
|
||||
create(:external_tag, name: suffix, post_count: 1)
|
||||
create(:tag, primary_name: 'suffix_literalX', post_count: 2)
|
||||
create(:external_tag, name: 'suffix_literalX', post_count: 2)
|
||||
|
||||
get '/tags/autocomplete', params: { q: "literal#{ wildcard }" }
|
||||
|
||||
expect(json.map { |row| row.fetch('name') })
|
||||
.to contain_exactly(
|
||||
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }",
|
||||
suffix, 'suffix_alias_target', "nico:#{ suffix }")
|
||||
literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { useQuery } from '@tanstack/react-query'
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import PostList from '@/components/PostList'
|
||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
import PostDurationField from '@/components/posts/PostDurationField'
|
||||
@@ -10,14 +12,15 @@ import { Button } from '@/components/ui/button'
|
||||
import { toast } from '@/components/ui/use-toast'
|
||||
import { isApiError } from '@/lib/api'
|
||||
import useDialogue from '@/lib/dialogues/useDialogue'
|
||||
import { updatePost } from '@/lib/posts'
|
||||
import { fetchPosts, updatePost } from '@/lib/posts'
|
||||
import { postsKeys } from '@/lib/queryKeys'
|
||||
import { msToTime } from '@/lib/utils'
|
||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
|
||||
import type { FC, FormEvent } from 'react'
|
||||
|
||||
import type { Post, TagWithSections } from '@/types'
|
||||
import type { FetchPostsParams, Post, TagWithSections } from '@/types'
|
||||
|
||||
type PostFormField =
|
||||
'parentPostIds' | 'tags' | 'videoMs'
|
||||
@@ -68,6 +71,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
|
||||
const [title, setTitle] = useState (post.title)
|
||||
|
||||
const [importVisible, setImportVisible] = useState (false)
|
||||
const [sourceTitle, setSourceTitle] = useState ('')
|
||||
const [sourcePage, setSourcePage] = useState (1)
|
||||
const sourceParams: FetchPostsParams = {
|
||||
title: sourceTitle, page: sourcePage, limit: 20,
|
||||
url: '', tags: '', match: 'all', order: 'original_created_at:desc',
|
||||
originalCreatedFrom: '', originalCreatedTo: '',
|
||||
createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '' }
|
||||
const { data: sources, isError: sourceError } = useQuery ({
|
||||
queryKey: postsKeys.index (sourceParams, locale),
|
||||
queryFn: () => fetchPosts (sourceParams, locale),
|
||||
enabled: importVisible && !disabled })
|
||||
|
||||
const importTags = (source: Post) => {
|
||||
if (disabled)
|
||||
return
|
||||
setTags (current => {
|
||||
const existing = new Set (current.split (/\s+/))
|
||||
const additions = tagsToStr (source.tags).split (/\s+/)
|
||||
.filter (tag => tag !== '' && !existing.has (tag))
|
||||
return additions.length > 0
|
||||
? `${current}${current.trim () === '' ? '' : ' '}${additions.join (' ')}`
|
||||
: current
|
||||
})
|
||||
setImportVisible (false)
|
||||
}
|
||||
|
||||
const videoFlg =
|
||||
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
||||
[tags])
|
||||
@@ -192,6 +222,48 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
setTags={setTags}
|
||||
errors={fieldErrors.tags}/>
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
disabled={disabled}
|
||||
aria-expanded={importVisible}
|
||||
onClick={() => setImportVisible (visible => !visible)}>
|
||||
{label ('edit.import')}
|
||||
</Button>
|
||||
{importVisible && (
|
||||
<div className="space-y-2" onKeyDown={event => {
|
||||
if (event.key === 'Enter' && event.target instanceof HTMLInputElement)
|
||||
event.preventDefault ()
|
||||
}}>
|
||||
<PostTextField
|
||||
label={label ('shared:labels.title')}
|
||||
type="search"
|
||||
value={sourceTitle}
|
||||
disabled={disabled}
|
||||
onChange={value => {
|
||||
setSourceTitle (value)
|
||||
setSourcePage (1)
|
||||
}}/>
|
||||
<FieldError messages={sourceError ? [label ('common:fetchError')] : []}/>
|
||||
{!disabled && <PostList posts={sources?.posts ?? []} onSelect={importTags}/>}
|
||||
<div className="flex flex-col gap-2 md:flex-row">
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
disabled={disabled || sourcePage <= 1}
|
||||
onClick={() => setSourcePage (page => page - 1)}>
|
||||
{label ('common:pagination.previous')}
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
disabled={disabled || sourcePage * 20 >= (sources?.count ?? 0)}
|
||||
onClick={() => setSourcePage (page => page + 1)}>
|
||||
{label ('common:pagination.next')}
|
||||
</Button>
|
||||
</div>
|
||||
</div>)}
|
||||
|
||||
{/* オリジナルの作成日時 */}
|
||||
<PostOriginalCreatedTimeField
|
||||
disabled={disabled}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { useRef } from 'react'
|
||||
import { useLocation } from 'react-router-dom'
|
||||
|
||||
import PrefetchLink from '@/components/PrefetchLink'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||
import { cn } from '@/lib/utils'
|
||||
@@ -13,10 +14,11 @@ import type { FC, MouseEvent } from 'react'
|
||||
import type { Post } from '@/types'
|
||||
|
||||
type Props = { posts: Post[]
|
||||
onSelect?: (post: Post) => void
|
||||
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
||||
|
||||
|
||||
const PostList: FC<Props> = ({ posts, onClick }) => {
|
||||
const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
|
||||
const { label } = useUITranslation ('shared')
|
||||
const location = useLocation ()
|
||||
const behaviourSettings = useClientBehaviourSettings ()
|
||||
@@ -39,7 +41,63 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
||||
const sharedId = `page-${ post.id }`
|
||||
const layoutId = sharedId
|
||||
|
||||
return (
|
||||
const card = (
|
||||
<motion.div
|
||||
ref={cardRef}
|
||||
layout={animationMode === 'off' ? false : true}
|
||||
layoutId={(onSelect || animationMode === 'off') ? undefined : layoutId}
|
||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
||||
'transform-gpu will-change-transform',
|
||||
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
||||
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
||||
whileHover={{ scale: 1.02 }}
|
||||
onLayoutAnimationStart={() => {
|
||||
if (!(cardRef.current))
|
||||
return
|
||||
|
||||
cardRef.current.style.position = 'relative'
|
||||
cardRef.current.style.zIndex = '9999'
|
||||
}}
|
||||
onLayoutAnimationComplete={() => {
|
||||
if (!(cardRef.current))
|
||||
return
|
||||
|
||||
cardRef.current.style.zIndex = ''
|
||||
cardRef.current.style.position = ''
|
||||
}}
|
||||
transition={{ layout: cardLayoutTransition }}>
|
||||
{thumbnailMode === 'off'
|
||||
? (
|
||||
<div className="flex h-full w-full items-center justify-center
|
||||
bg-muted text-center text-xs text-muted-foreground">
|
||||
{label ('labels.noThumbnail')}
|
||||
</div>)
|
||||
: (
|
||||
<img
|
||||
src={post.thumbnail || post.thumbnailBase || undefined}
|
||||
alt={post.title || post.url}
|
||||
title={post.title || post.url || undefined}
|
||||
loading={
|
||||
thumbnailMode === 'light'
|
||||
? 'lazy'
|
||||
: (i < 12 ? 'eager' : 'lazy')
|
||||
}
|
||||
decoding="async"
|
||||
className="object-cover w-full h-full"/>)}
|
||||
</motion.div>)
|
||||
|
||||
return onSelect
|
||||
? (
|
||||
<Button
|
||||
key={post.id}
|
||||
type="button"
|
||||
variant="ghost"
|
||||
className="w-40 h-40 p-0"
|
||||
aria-label={post.title || post.url}
|
||||
onClick={() => onSelect (post)}>
|
||||
{card}
|
||||
</Button>)
|
||||
: (
|
||||
<PrefetchLink
|
||||
to={`/posts/${ post.id }`}
|
||||
key={post.id}
|
||||
@@ -49,51 +107,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
||||
setForLocationKey (location.key, sharedId)
|
||||
onClick?.(e)
|
||||
}}>
|
||||
<motion.div
|
||||
ref={cardRef}
|
||||
layout={animationMode === 'off' ? false : true}
|
||||
layoutId={animationMode === 'off' ? undefined : layoutId}
|
||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
||||
'transform-gpu will-change-transform',
|
||||
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
||||
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
||||
whileHover={{ scale: 1.02 }}
|
||||
onLayoutAnimationStart={() => {
|
||||
if (!(cardRef.current))
|
||||
return
|
||||
|
||||
cardRef.current.style.position = 'relative'
|
||||
cardRef.current.style.zIndex = '9999'
|
||||
}}
|
||||
onLayoutAnimationComplete={() => {
|
||||
if (!(cardRef.current))
|
||||
return
|
||||
|
||||
cardRef.current.style.zIndex = ''
|
||||
cardRef.current.style.position = ''
|
||||
}}
|
||||
transition={{ layout: cardLayoutTransition }}>
|
||||
{thumbnailMode === 'off'
|
||||
? (
|
||||
<div className="flex h-full w-full items-center justify-center
|
||||
bg-muted text-center text-xs text-muted-foreground">
|
||||
{label ('labels.noThumbnail')}
|
||||
</div>)
|
||||
: (
|
||||
<img
|
||||
src={post.thumbnail || post.thumbnailBase || undefined}
|
||||
alt={post.title || post.url}
|
||||
title={post.title || post.url || undefined}
|
||||
loading={
|
||||
thumbnailMode === 'light'
|
||||
? 'lazy'
|
||||
: i < 12
|
||||
? 'eager'
|
||||
: 'lazy'
|
||||
}
|
||||
decoding="async"
|
||||
className="object-cover w-full h-full"/>)}
|
||||
</motion.div>
|
||||
{card}
|
||||
</PrefetchLink>)
|
||||
})}
|
||||
</div>)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{
|
||||
"_untranslated": ["edit.import"],
|
||||
"list": {
|
||||
"tagline": "{{brand}}",
|
||||
"empty": "ミンタㇻ タ ネン カ イサㇺ",
|
||||
@@ -31,6 +32,7 @@
|
||||
"showExternal": "ソイタㇰ ソㇱ アヌカレ"
|
||||
},
|
||||
"edit": {
|
||||
"import": "インポート",
|
||||
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
|
||||
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
|
||||
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
"question": "表示しますか?", "showExternal": "外部ページを表示"
|
||||
},
|
||||
"edit": {
|
||||
"import": "インポート",
|
||||
"validationFailed": "更新はできなかったよ……",
|
||||
"conflictTitle": "競合が発生しました.",
|
||||
"conflictDescription": "ほかの耕作員が先に更新してゐます.",
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする