Compare commits

...

4 Commits

Author SHA1 Message Date
みてるぞ 9ef2d8307a #294 2026-04-18 20:29:47 +09:00
みてるぞ 48f823a7c8 履歴画面変更(#308) (#315)
Merge branch 'main' into feature/308

#308

#308

#308

#308

Co-authored-by: miteruzo <miteruzo@naver.com>
Reviewed-on: #315
2026-04-18 05:43:33 +09:00
みてるぞ bd11e37fd3 緊急対応(#312) (#313)
'backend/config/storage.yml' を更新

Reviewed-on: #313
2026-04-15 20:21:51 +09:00
みてるぞ e72ec608f4 利用規約(#95) (#311)
#95

#95

#95

#95

#95

Merge remote-tracking branch 'origin/main' into feature/095

#95

#95

#95

Co-authored-by: miteruzo <miteruzo@naver.com>
Reviewed-on: #311
2026-04-14 12:31:48 +09:00
35 changed files with 2025 additions and 479 deletions
@@ -33,7 +33,8 @@ class NicoTagsController < ApplicationController
return head :bad_request if tag.category != 'nico' return head :bad_request if tag.category != 'nico'
linked_tag_names = params[:tags].to_s.split(' ') linked_tag_names = params[:tags].to_s.split(' ')
linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false) linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false,
with_no_deerjikist: false)
return head :bad_request if linked_tags.any? { |t| t.category == 'nico' } return head :bad_request if linked_tags.any? { |t| t.category == 'nico' }
tag.linked_tags = linked_tags tag.linked_tags = linked_tags
@@ -0,0 +1,119 @@
class PostVersionsController < ApplicationController
def index
post_id = params[:post].presence
tag_id = params[:tag].presence
page = (params[:page].presence || 1).to_i
limit = (params[:limit].presence || 20).to_i
page = 1 if page < 1
limit = 1 if limit < 1
offset = (page - 1) * limit
tag_name =
if tag_id
TagName.joins(:tag).find_by(tag: { id: tag_id })
end
return render json: { versions: [], count: 0 } if tag_id && tag_name.blank?
q = PostVersion.joins(<<~SQL.squish)
LEFT JOIN
post_versions prev
ON
prev.post_id = post_versions.post_id
AND prev.version_no = post_versions.version_no - 1
SQL
.select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
'prev.original_created_from AS prev_original_created_from',
'prev.original_created_before AS prev_original_created_before')
q = q.where('post_versions.post_id = ?', post_id) if post_id
if tag_name
escaped = ActiveRecord::Base.sanitize_sql_like(tag_name.name)
q = q.where(("CONCAT(' ', post_versions.tags, ' ') LIKE :kw " +
"OR CONCAT(' ', prev.tags, ' ') LIKE :kw"),
kw: "% #{ escaped } %")
end
count = q.except(:select, :order, :limit, :offset).count
versions = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC'))
.limit(limit)
.offset(offset)
render json: { versions: serialise_versions(versions), count: }
end
private
def serialise_versions rows
user_ids = rows.map(&:created_by_user_id).compact.uniq
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
rows.map do |row|
cur_tags = split_tags(row.tags)
prev_tags = split_tags(row.attributes['prev_tags'])
{
post_id: row.post_id,
version_no: row.version_no,
event_type: row.event_type,
title: {
current: row.title,
prev: row.attributes['prev_title']
},
url: {
current: row.url,
prev: row.attributes['prev_url']
},
thumbnail: {
current: nil,
prev: nil
},
thumbnail_base: {
current: row.thumbnail_base,
prev: row.attributes['prev_thumbnail_base']
},
tags: build_version_tags(cur_tags, prev_tags),
original_created_from: {
current: row.original_created_from&.iso8601,
prev: row.attributes['prev_original_created_from']&.iso8601
},
original_created_before: {
current: row.original_created_before&.iso8601,
prev: row.attributes['prev_original_created_before']&.iso8601
},
created_at: row.created_at.iso8601,
created_by_user:
if row.created_by_user_id
{
id: row.created_by_user_id,
name: users_by_id[row.created_by_user_id]
}
end
}
end
end
def build_version_tags(cur_tags, prev_tags)
(cur_tags | prev_tags).map do |name|
type =
if cur_tags.include?(name) && prev_tags.include?(name)
'context'
elsif cur_tags.include?(name)
'added'
else
'removed'
end
{
name:,
type:
}
end
end
def split_tags(tags)
tags.to_s.split(/\s+/).reject(&:blank?)
end
end
+4 -4
View File
@@ -44,7 +44,7 @@ class PostsController < ApplicationController
filtered_posts filtered_posts
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id") .joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all")) .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
.preload(tags: { tag_name: :wiki_page }) .preload(tags: [:materials, { tag_name: :wiki_page }])
.with_attached_thumbnail .with_attached_thumbnail
q = q.where('posts.url LIKE ?', "%#{ url }%") if url q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -95,7 +95,7 @@ class PostsController < ApplicationController
end end
def random def random
post = filtered_posts.preload(tags: { tag_name: :wiki_page }) post = filtered_posts.preload(tags: [:materials, { tag_name: :wiki_page }])
.order('RAND()') .order('RAND()')
.first .first
return head :not_found unless post return head :not_found unless post
@@ -104,7 +104,7 @@ class PostsController < ApplicationController
end end
def show def show
post = Post.includes(tags: { tag_name: :wiki_page }).find_by(id: params[:id]) post = Post.includes(tags: [:materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
return head :not_found unless post return head :not_found unless post
render json: PostRepr.base(post, current_user) render json: PostRepr.base(post, current_user)
@@ -204,7 +204,7 @@ class PostsController < ApplicationController
pts = pts.where(post_id: id) if id.present? pts = pts.where(post_id: id) if id.present?
pts = pts.where(tag_id:) if tag_id.present? pts = pts.where(tag_id:) if tag_id.present?
pts = pts.includes(:post, :created_user, :deleted_user, pts = pts.includes(:post, :created_user, :deleted_user,
tag: { tag_name: :wiki_page }) tag: [:materials, { tag_name: :wiki_page }])
events = [] events = []
pts.each do |pt| pts.each do |pt|
+4 -2
View File
@@ -98,7 +98,9 @@ class Tag < ApplicationRecord
@niconico ||= find_or_create_by_tag_name!('ニコニコ', category: :meta) @niconico ||= find_or_create_by_tag_name!('ニコニコ', category: :meta)
end end
def self.normalise_tags tag_names, with_tagme: true, deny_nico: true def self.normalise_tags tag_names, with_tagme: true,
with_no_deerjikist: true,
deny_nico: true
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') } if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
raise NicoTagNormalisationError raise NicoTagNormalisationError
end end
@@ -112,7 +114,7 @@ class Tag < ApplicationRecord
end end
tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme) tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
tags << Tag.no_deerjikist if tags.all? { |t| !(t.deerjikist?) } tags << Tag.no_deerjikist if with_no_deerjikist && tags.all? { |t| !(t.deerjikist?) }
tags.uniq(&:id) tags.uniq(&:id)
end end
+1
View File
@@ -49,6 +49,7 @@ Rails.application.routes.draw do
collection do collection do
get :random get :random
get :changes get :changes
get :versions, to: 'post_versions#index'
end end
member do member do
+1
View File
@@ -13,3 +13,4 @@ r2:
secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %> secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %>
bucket: <%= ENV['R2_BUCKET'] %> bucket: <%= ENV['R2_BUCKET'] %>
region: auto region: auto
request_checksum_calculation: when_required
+212
View File
@@ -756,6 +756,218 @@ RSpec.describe 'Posts API', type: :request do
end end
end end
describe 'GET /posts/versions' do
let(:member) { create(:user, :member, name: 'version member') }
let(:t_v1) { Time.zone.local(2020, 1, 1, 12, 0, 0) }
let(:t_v2) { Time.zone.local(2020, 1, 2, 12, 0, 0) }
let(:t_other) { Time.zone.local(2020, 1, 3, 12, 0, 0) }
let(:oc_from) { Time.zone.local(2019, 12, 31, 0, 0, 0) }
let(:oc_before) { Time.zone.local(2020, 1, 1, 0, 0, 0) }
let!(:tag_name2) { TagName.create!(name: 'spec_tag_2') }
let!(:tag2) { Tag.create!(tag_name: tag_name2, category: :general) }
def snapshot_tags(post)
post.snapshot_tag_names.join(' ')
end
def create_post_version!(post, version_no:, event_type:, created_by_user:, created_at:)
PostVersion.create!(
post: post,
version_no: version_no,
event_type: event_type,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
parent: post.parent,
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at: created_at,
created_by_user: created_by_user
)
end
let!(:v1) do
travel_to(t_v1) do
create_post_version!(
post_record,
version_no: 1,
event_type: 'create',
created_by_user: member,
created_at: t_v1
)
end
end
let!(:v2) do
post_record.post_tags.kept.find_by!(tag: tag).discard_by!(member)
PostTag.create!(post: post_record, tag: tag2, created_user: member)
post_record.update!(
title: 'updated spec post',
original_created_from: oc_from,
original_created_before: oc_before
)
travel_to(t_v2) do
create_post_version!(
post_record.reload,
version_no: 2,
event_type: 'update',
created_by_user: member,
created_at: t_v2
)
end
end
let!(:other_post_version) do
other_post = Post.create!(
title: 'other versioned post',
url: 'https://example.com/other-versioned'
)
PostTag.create!(post: other_post, tag: tag)
travel_to(t_other) do
create_post_version!(
other_post,
version_no: 1,
event_type: 'create',
created_by_user: member,
created_at: t_other
)
end
end
it 'returns versions for the specified post in reverse chronological order' do
get '/posts/versions', params: { post: post_record.id }
expect(response).to have_http_status(:ok)
expect(json).to include('versions', 'count')
expect(json.fetch('count')).to eq(2)
versions = json.fetch('versions')
expect(versions.map { |v| v['post_id'] }.uniq).to eq([post_record.id])
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
latest = versions.first
expect(latest).to include(
'post_id' => post_record.id,
'version_no' => 2,
'event_type' => 'update',
'created_by_user' => {
'id' => member.id,
'name' => member.name
}
)
expect(latest.fetch('title')).to eq(
'current' => 'updated spec post',
'prev' => 'spec post'
)
expect(latest.fetch('url')).to eq(
'current' => 'https://example.com/spec',
'prev' => 'https://example.com/spec'
)
expect(latest.fetch('thumbnail')).to eq(
'current' => nil,
'prev' => nil
)
expect(latest.fetch('thumbnail_base')).to eq(
'current' => nil,
'prev' => nil
)
expect(latest.fetch('tags')).to include(
{ 'name' => 'spec_tag_2', 'type' => 'added' },
{ 'name' => 'spec_tag', 'type' => 'removed' }
)
expect(latest.fetch('original_created_from')).to eq(
'current' => oc_from.iso8601,
'prev' => nil
)
expect(latest.fetch('original_created_before')).to eq(
'current' => oc_before.iso8601,
'prev' => nil
)
expect(latest.fetch('created_at')).to eq(t_v2.iso8601)
first = versions.second
expect(first).to include(
'post_id' => post_record.id,
'version_no' => 1,
'event_type' => 'create',
'created_by_user' => {
'id' => member.id,
'name' => member.name
}
)
expect(first.fetch('title')).to eq(
'current' => 'spec post',
'prev' => nil
)
expect(first.fetch('tags')).to include(
{ 'name' => 'spec_tag', 'type' => 'added' }
)
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
end
it 'filters versions by tag when the current snapshot includes the tag' do
get '/posts/versions', params: { post: post_record.id, tag: tag2.id }
expect(response).to have_http_status(:ok)
expect(json.fetch('count')).to eq(1)
versions = json.fetch('versions')
expect(versions.size).to eq(1)
expect(versions[0]['post_id']).to eq(post_record.id)
expect(versions[0]['version_no']).to eq(2)
expect(versions[0]['tags']).to include(
{ 'name' => 'spec_tag_2', 'type' => 'added' }
)
end
it 'filters versions by tag when the tag exists in either current or previous snapshot' do
get '/posts/versions', params: { post: post_record.id, tag: tag.id }
expect(response).to have_http_status(:ok)
expect(json.fetch('count')).to eq(2)
versions = json.fetch('versions')
expect(versions.map { |v| v['post_id'] }).to all(eq(post_record.id))
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
latest = versions[0]
first = versions[1]
expect(latest['tags']).to include(
{ 'name' => 'spec_tag', 'type' => 'removed' }
)
expect(first['tags']).to include(
{ 'name' => 'spec_tag', 'type' => 'added' }
)
end
it 'returns empty when tag does not exist' do
get '/posts/versions', params: { tag: 999_999_999 }
expect(response).to have_http_status(:ok)
expect(json.fetch('versions')).to eq([])
expect(json.fetch('count')).to eq(0)
end
it 'clamps page and limit to at least 1' do
get '/posts/versions', params: { post: post_record.id, page: 0, limit: 0 }
expect(response).to have_http_status(:ok)
expect(json.fetch('count')).to eq(2)
versions = json.fetch('versions')
expect(versions.size).to eq(1)
expect(versions[0]['version_no']).to eq(2)
end
end
describe 'POST /posts/:id/viewed' do describe 'POST /posts/:id/viewed' do
let(:user) { create(:user) } let(:user) { create(:user) }
+925 -181
View File
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -15,6 +15,8 @@
"@dnd-kit/modifiers": "^9.0.0", "@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@fontsource-variable/noto-sans-jp": "^5.2.9", "@fontsource-variable/noto-sans-jp": "^5.2.9",
"@mdx-js/react": "^3.1.1",
"@mdx-js/rollup": "^3.1.1",
"@radix-ui/react-dialog": "^1.1.14", "@radix-ui/react-dialog": "^1.1.14",
"@radix-ui/react-switch": "^1.2.5", "@radix-ui/react-switch": "^1.2.5",
"@radix-ui/react-toast": "^1.2.14", "@radix-ui/react-toast": "^1.2.14",
@@ -37,13 +39,15 @@
"react-youtube": "^10.1.0", "react-youtube": "^10.1.0",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"tailwind-merge": "^3.3.0", "tailwind-merge": "^3.3.0",
"zustand": "^5.0.8", "unist-util-visit-parents": "^6.0.1",
"unist-util-visit-parents": "^6.0.1" "zustand": "^5.0.8"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.25.0", "@eslint/js": "^9.25.0",
"@tailwindcss/typography": "^0.5.19",
"@types/axios": "^0.14.4", "@types/axios": "^0.14.4",
"@types/markdown-it": "^14.1.2", "@types/markdown-it": "^14.1.2",
"@types/mdx": "^2.0.13",
"@types/node": "^24.0.13", "@types/node": "^24.0.13",
"@types/react": "^19.1.2", "@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2", "@types/react-dom": "^19.1.2",
+42 -35
View File
@@ -1,4 +1,4 @@
import { AnimatePresence, LayoutGroup } from 'framer-motion' import { AnimatePresence, LayoutGroup, motion } from 'framer-motion'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { BrowserRouter, import { BrowserRouter,
Navigate, Navigate,
@@ -15,8 +15,10 @@ import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
import MaterialListPage from '@/pages/materials/MaterialListPage' import MaterialListPage from '@/pages/materials/MaterialListPage'
import MaterialNewPage from '@/pages/materials/MaterialNewPage' import MaterialNewPage from '@/pages/materials/MaterialNewPage'
// import MaterialSearchPage from '@/pages/materials/MaterialSearchPage' // import MaterialSearchPage from '@/pages/materials/MaterialSearchPage'
import MorePage from '@/pages/MorePage'
import NicoTagListPage from '@/pages/tags/NicoTagListPage' import NicoTagListPage from '@/pages/tags/NicoTagListPage'
import NotFound from '@/pages/NotFound' import NotFound from '@/pages/NotFound'
import TOSPage from '@/pages/TOSPage.mdx'
import PostDetailPage from '@/pages/posts/PostDetailPage' import PostDetailPage from '@/pages/posts/PostDetailPage'
import PostHistoryPage from '@/pages/posts/PostHistoryPage' import PostHistoryPage from '@/pages/posts/PostHistoryPage'
import PostListPage from '@/pages/posts/PostListPage' import PostListPage from '@/pages/posts/PostListPage'
@@ -44,36 +46,36 @@ const RouteTransitionWrapper = ({ user, setUser }: {
const location = useLocation () const location = useLocation ()
return ( return (
<LayoutGroup id="gallery-shared"> <AnimatePresence mode="wait">
<AnimatePresence mode="wait"> <Routes location={location}>
<Routes location={location}> <Route path="/" element={<Navigate to="/posts" replace/>}/>
<Route path="/" element={<Navigate to="/posts" replace/>}/> <Route path="/posts" element={<PostListPage/>}/>
<Route path="/posts" element={<PostListPage/>}/> <Route path="/posts/new" element={<PostNewPage user={user}/>}/>
<Route path="/posts/new" element={<PostNewPage user={user}/>}/> <Route path="/posts/search" element={<PostSearchPage/>}/>
<Route path="/posts/search" element={<PostSearchPage/>}/> <Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
<Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/> <Route path="/posts/changes" element={<PostHistoryPage/>}/>
<Route path="/posts/changes" element={<PostHistoryPage/>}/> <Route path="/tags" element={<TagListPage/>}/>
<Route path="/tags" element={<TagListPage/>}/> <Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/> <Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/> <Route path="/materials" element={<MaterialBasePage/>}>
<Route path="/materials" element={<MaterialBasePage/>}> <Route index element={<MaterialListPage/>}/>
<Route index element={<MaterialListPage/>}/> <Route path="new" element={<MaterialNewPage/>}/>
<Route path="new" element={<MaterialNewPage/>}/> <Route path=":id" element ={<MaterialDetailPage/>}/>
<Route path=":id" element ={<MaterialDetailPage/>}/> </Route>
</Route> {/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */}
{/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */} <Route path="/wiki" element={<WikiSearchPage/>}/>
<Route path="/wiki" element={<WikiSearchPage/>}/> <Route path="/wiki/:title" element={<WikiDetailPage/>}/>
<Route path="/wiki/:title" element={<WikiDetailPage/>}/> <Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
<Route path="/wiki/new" element={<WikiNewPage user={user}/>}/> <Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/>
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/> <Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/>
<Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/> <Route path="/wiki/changes" element={<WikiHistoryPage/>}/>
<Route path="/wiki/changes" element={<WikiHistoryPage/>}/> <Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/>
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/> <Route path="/settings" element={<Navigate to="/users/settings" replace/>}/>
<Route path="/settings" element={<Navigate to="/users/settings" replace/>}/> <Route path="/tos" element={<TOSPage/>}/>
<Route path="*" element={<NotFound/>}/> <Route path="/more" element={<MorePage/>}/>
</Routes> <Route path="*" element={<NotFound/>}/>
</AnimatePresence> </Routes>
</LayoutGroup>) </AnimatePresence>)
} }
@@ -131,10 +133,15 @@ export default (() => {
<> <>
<RouteBlockerOverlay/> <RouteBlockerOverlay/>
<BrowserRouter> <BrowserRouter>
<div className="flex flex-col h-dvh w-full"> <LayoutGroup>
<TopNav user={user}/> <motion.div
<RouteTransitionWrapper user={user} setUser={setUser}/> layout="position"
</div> transition={{ layout: { duration: .2, ease: 'easeOut' } }}
className="flex flex-col h-dvh w-full overflow-y-hidden">
<TopNav user={user}/>
<RouteTransitionWrapper user={user} setUser={setUser}/>
</motion.div>
</LayoutGroup>
<Toaster/> <Toaster/>
</BrowserRouter> </BrowserRouter>
</>) </>)
@@ -90,7 +90,9 @@ export default (({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }:
className={cn ('rounded select-none', over && 'ring-2 ring-offset-2')} className={cn ('rounded select-none', over && 'ring-2 ring-offset-2')}
{...attributes} {...attributes}
{...listeners}> {...listeners}>
<motion.div layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}> <motion.div
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
<TagLink tag={tag} nestLevel={nestLevel}/> <TagLink tag={tag} nestLevel={nestLevel}/>
</motion.div> </motion.div>
</div>) </div>)
+1 -1
View File
@@ -62,7 +62,7 @@ export default (({ post, onSave }: Props) => {
<Label></Label> <Label></Label>
<input type="text" <input type="text"
className="w-full border rounded p-2" className="w-full border rounded p-2"
value={title} value={title ?? ''}
onChange={ev => setTitle (ev.target.value)}/> onChange={ev => setTitle (ev.target.value)}/>
</div> </div>
+1 -1
View File
@@ -56,7 +56,7 @@ export default (({ posts, onClick }: Props) => {
cardRef.current.style.zIndex = '' cardRef.current.style.zIndex = ''
cardRef.current.style.position = '' cardRef.current.style.position = ''
}} }}
transition={{ type: 'spring', stiffness: 500, damping: 40, mass: .5 }}> transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
<img src={post.thumbnail || post.thumbnailBase || undefined} <img src={post.thumbnail || post.thumbnailBase || undefined}
alt={post.title || post.url} alt={post.title || post.url}
title={post.title || post.url || undefined} title={post.title || post.url || undefined}
+6 -2
View File
@@ -313,7 +313,9 @@ export default (({ post, sp }: Props) => {
{CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && ( {CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
<div className="my-3" key={cat}> <div className="my-3" key={cat}>
<SubsectionTitle> <SubsectionTitle>
<motion.div layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}> <motion.div
layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
{CATEGORY_NAMES[cat]} {CATEGORY_NAMES[cat]}
</motion.div> </motion.div>
</SubsectionTitle> </SubsectionTitle>
@@ -325,7 +327,9 @@ export default (({ post, sp }: Props) => {
</ul> </ul>
</div>))} </div>))}
{post && ( {post && (
<motion.div layoutId={`post-info-${ sp }`}> <motion.div
layoutId={`post-info-${ sp }`}
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
<SectionTitle></SectionTitle> <SectionTitle></SectionTitle>
<ul> <ul>
<li>Id.: {post.id}</li> <li>Id.: {post.id}</li>
+3 -1
View File
@@ -65,7 +65,9 @@ export default (({ posts, onClick }: Props) => {
{CATEGORIES.flatMap (cat => cat in tags ? ( {CATEGORIES.flatMap (cat => cat in tags ? (
tags[cat].map (tag => ( tags[cat].map (tag => (
<li key={tag.id} className="mb-1"> <li key={tag.id} className="mb-1">
<motion.div layoutId={`tag-${ tag.id }`}> <motion.div
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
layoutId={`tag-${ tag.id }`}>
<TagLink tag={tag} onClick={onClick}/> <TagLink tag={tag} onClick={onClick}/>
</motion.div> </motion.div>
</li>))) : [])} </li>))) : [])}
+228 -103
View File
@@ -14,11 +14,65 @@ import { fetchWikiPage } from '@/lib/wiki'
import type { FC, MouseEvent } from 'react' import type { FC, MouseEvent } from 'react'
import type { Menu, User } from '@/types' import type { Menu, MenuVisibleItem, Tag, User } from '@/types'
type Props = { user: User | null } type Props = { user: User | null }
export const menuOutline = ({ tag, wikiId, user, pathName }: {
tag?: Tag | null
wikiId: number | null
user: User | null,
pathName: string }): Menu => {
const postCount = tag?.postCount ?? 0
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
const wikiTitle = pathName.split ('/')[2] ?? ''
return [
{ name: '広場', to: '/posts', subMenu: [
{ name: '一覧', to: '/posts' },
{ name: '検索', to: '/posts/search' },
{ name: '追加', to: '/posts/new' },
{ name: '履歴', to: '/posts/changes' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
{ name: 'タグ', to: '/tags', subMenu: [
{ name: 'マスタ', to: '/tags' },
{ name: '別名タグ', to: '/tags/aliases', visible: false },
{ name: '上位タグ', to: '/tags/implications', visible: false },
{ name: 'ニコニコ連携', to: '/tags/nico' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' }] },
{ name: '素材', to: '/materials', visible: false, subMenu: [
{ name: '一覧', to: '/materials' },
{ name: '検索', to: '/materials/search', visible: false },
{ name: '追加', to: '/materials/new' },
{ name: '履歴', to: '/materials/changes', visible: false },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
{ name: <>&thinsp;1&thinsp;</>, to: '/theatres/1' },
{ name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
{ name: <>&thinsp;1&thinsp;</>,
to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:上映会' }] },
{ name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
{ name: '検索', to: '/wiki' },
{ name: '新規', to: '/wiki/new' },
{ name: '全体履歴', to: '/wiki/changes' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:Wiki' },
{ component: <Separator/>, visible: wikiPageFlg },
{ name: `広場 (${ postCount || 0 })`, to: `/posts?tags=${ wikiTitle }`,
visible: wikiPageFlg },
{ name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
{ name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
{ name: 'ユーザ', to: '/users/settings', visible: false, subMenu: [
{ name: '一覧', to: '/users', visible: false },
{ name: 'お前', to: `/users/${ user?.id }`, visible: false },
{ name: '設定', to: '/users/settings', visible: Boolean (user) }] },
{ name: '法規', visible: false, subMenu: [
{ name: '利用規約', to: '/tos' }] }]
}
export default (({ user }: Props) => { export default (({ user }: Props) => {
const location = useLocation () const location = useLocation ()
@@ -26,25 +80,30 @@ export default (({ user }: Props) => {
const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([]) const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([])
const navRef = useRef<HTMLDivElement | null> (null) const navRef = useRef<HTMLDivElement | null> (null)
const measure = () => { const measure = (idx: number) => {
const nav = navRef.current const nav = navRef.current
const el = itemsRef.current[activeIdx] const el = itemsRef.current[idx < 0 ? visibleMenu.length : idx]
if (!(nav) || !(el) || activeIdx < 0)
return if (!(nav) || !(el))
{
setHL ({ left: 0, width: 0, visible: true })
return
}
const navRect = nav.getBoundingClientRect () const navRect = nav.getBoundingClientRect ()
const elRect = el.getBoundingClientRect () const elRect = el.getBoundingClientRect ()
setHl ({ left: elRect.left - navRect.left, setHL ({ left: elRect.left - navRect.left,
width: elRect.width, width: elRect.width,
visible: true }) visible: true })
} }
const [hl, setHl] = useState<{ left: number; width: number; visible: boolean }> ({ const [hl, setHL] = useState<{ left: number; width: number; visible: boolean }> ({
left: 0, left: 0,
width: 0, width: 0,
visible: false }) visible: false })
const [menuOpen, setMenuOpen] = useState (false) const [menuOpen, setMenuOpen] = useState (false)
const [moreVsbl, setMoreVsbl] = useState (false)
const [openItemIdx, setOpenItemIdx] = useState (-1) const [openItemIdx, setOpenItemIdx] = useState (-1)
const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ()) const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ())
@@ -62,51 +121,10 @@ export default (({ user }: Props) => {
queryKey: tagsKeys.show (effectiveTitle), queryKey: tagsKeys.show (effectiveTitle),
queryFn: () => fetchTagByName (effectiveTitle) }) queryFn: () => fetchTagByName (effectiveTitle) })
const postCount = tag?.postCount ?? 0 const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (location.pathname) && wikiId) const activeIdx =
const wikiTitle = location.pathname.split ('/')[2] ?? '' visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
const menu: Menu = [
{ name: '広場', to: '/posts', subMenu: [
{ name: '一覧', to: '/posts' },
{ name: '検索', to: '/posts/search' },
{ name: '追加', to: '/posts/new' },
{ name: '履歴', to: '/posts/changes' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
{ name: 'タグ', to: '/tags', subMenu: [
{ name: 'マスタ', to: '/tags' },
{ name: '別名タグ', to: '/tags/aliases', visible: false },
{ name: '上位タグ', to: '/tags/implications', visible: false },
{ name: 'ニコニコ連携', to: '/tags/nico' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' }] },
// { name: '素材', to: '/materials', subMenu: [
// { name: '一覧', to: '/materials' },
// { name: '検索', to: '/materials/search', visible: false },
// { name: '追加', to: '/materials/new' },
// { name: '履歴', to: '/materials/changes', visible: false },
// { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
{ name: <>&thinsp;1&thinsp;</>, to: '/theatres/1' },
{ name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
{ name: <>&thinsp;1&thinsp;</>,
to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:上映会' }] },
{ name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
{ name: '検索', to: '/wiki' },
{ name: '新規', to: '/wiki/new' },
{ name: '全体履歴', to: '/wiki/changes' },
{ name: 'ヘルプ', to: '/wiki/ヘルプ:Wiki' },
{ component: <Separator/>, visible: wikiPageFlg },
{ name: `広場 (${ postCount || 0 })`, to: `/posts?tags=${ wikiTitle }`,
visible: wikiPageFlg },
{ name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
{ name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
{ name: 'ユーザ', to: '/users/settings', subMenu: [
{ name: '一覧', to: '/users', visible: false },
{ name: 'お前', to: `/users/${ user?.id }`, visible: false },
{ name: '設定', to: '/users/settings', visible: Boolean (user) }] }]
const activeIdx = menu.findIndex (item => location.pathname.startsWith (item.base || item.to))
const prevActiveIdxRef = useRef<number> (activeIdx) const prevActiveIdxRef = useRef<number> (activeIdx)
@@ -119,28 +137,24 @@ export default (({ user }: Props) => {
const dir = dirRef.current const dir = dirRef.current
useLayoutEffect (() => { useLayoutEffect (() => {
if (activeIdx < 0) const raf = requestAnimationFrame (() => measure (moreVsbl ? -1 : activeIdx))
return const onResize = () => requestAnimationFrame (() => measure (moreVsbl ? -1 : activeIdx))
const raf = requestAnimationFrame (measure)
const onResize = () => requestAnimationFrame (measure)
addEventListener ('resize', onResize) addEventListener ('resize', onResize)
return () => { return () => {
cancelAnimationFrame (raf) cancelAnimationFrame (raf)
removeEventListener ('resize', onResize) removeEventListener ('resize', onResize)
} }
}, [activeIdx]) })
useEffect (() => { useEffect (() => {
const unsubscribe = WikiIdBus.subscribe (setWikiId) const unsubscribe = WikiIdBus.subscribe (setWikiId)
return () => unsubscribe () return () => unsubscribe ()
}, []) }, [activeIdx])
useEffect (() => { useEffect (() => {
setMenuOpen (false) setMenuOpen (false)
setOpenItemIdx (menu.findIndex (item => ( setOpenItemIdx (activeIdx)
location.pathname.startsWith (item.base || item.to))))
}, [location]) }, [location])
return ( return (
@@ -167,17 +181,39 @@ export default (({ user }: Props) => {
transform: `translateX(${ hl.left }px)`, transform: `translateX(${ hl.left }px)`,
opacity: hl.visible ? 1 : 0 }}/> opacity: hl.visible ? 1 : 0 }}/>
{menu.map ((item, i) => ( {visibleMenu.map ((item, i) => (
<PrefetchLink <motion.div
key={i} key={item.to}
to={item.to} layoutId={`menu-${ item.name }`}
ref={(el: (HTMLAnchorElement | null)) => { animate={{ opacity: moreVsbl ? 0 : 1 }}
itemsRef.current[i] = el transition={{ opacity: { duration: .12 },
}} layout: { duration: .2, ease: 'easeOut' } }}
className={cn ('relative z-10 flex h-full items-center px-5', style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
(i === openItemIdx) && 'font-bold')}> onMouseEnter={() => setMoreVsbl (false)}>
{item.name} <PrefetchLink
</PrefetchLink>))} to={item.to}
ref={(el: (HTMLAnchorElement | null)) => {
itemsRef.current[i] = el
}}
className={cn ('relative z-10 flex h-full items-center px-5',
(i === openItemIdx) && 'font-bold')}>
{item.name}
</PrefetchLink>
</motion.div>))}
<PrefetchLink
to="/more"
ref={(el: (HTMLAnchorElement | null)) => {
itemsRef.current[visibleMenu.length] = el
}}
onClick={() => setMoreVsbl (false)}
onMouseEnter={() => {
setMoreVsbl (true)
measure (-1)
}}
className={cn ('relative z-10 flex h-full items-center px-5',
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
&raquo;
</PrefetchLink>
</div> </div>
</div> </div>
@@ -195,36 +231,115 @@ export default (({ user }: Props) => {
</a> </a>
</nav> </nav>
<div className="relative hidden md:flex bg-yellow-200 dark:bg-red-950 <AnimatePresence initial={false}>
items-center w-full min-h-[40px] overflow-hidden"> <motion.div
<AnimatePresence initial={false} custom={dir}> key="submenu-shell"
<motion.div layout
key={activeIdx} className="relative hidden md:block overflow-hidden
custom={dir} bg-yellow-200 dark:bg-red-950"
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }), style={{ height: moreVsbl ? 40 * menu.length : (activeIdx < 0 ? 0 : 40) }}
centre: { y: 0, opacity: 1 }, onMouseLeave={() => {
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }} if (moreVsbl)
className="absolute inset-0 flex items-center px-3" setMoreVsbl (false)
initial="enter" }}
animate="centre" transition={{ layout: { duration: .2, ease: 'easeOut' } }}
exit="exit" onAnimationComplete={() => {
transition={{ duration: .2, ease: 'easeOut' }}> measure (moreVsbl ? -1 : activeIdx)
{(menu[activeIdx]?.subMenu ?? []) }}>
.filter (item => item.visible ?? true) {moreVsbl
.map ((item, i) => ( ? (
'component' in item menu.map ((item, i) => (
? <Fragment key={`c-${ i }`}>{item.component}</Fragment> <div key={i} className="relative h-[40px]">
: ( <div className="absolute inset-0 flex items-center px-3">
<PrefetchLink <motion.div
key={`l-${ i }`} transition={{ duration: .2, ease: 'easeOut' }}
to={item.to} {...((item.visible ?? true)
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined} ? { layoutId: `menu-${ item.name }` }
className="h-full flex items-center px-3"> : { initial: { x: 40, y: -40, opacity: 0 },
{item.name} animate: { x: 0, y: 0, opacity: 1 },
</PrefetchLink>)))} exit: { x: 40, y: -40, opacity: 0 } })}
</motion.div> className="z-10 h-full flex items-center px-3 font-bold w-24">
</AnimatePresence> <h2>{item.name}</h2>
</div> </motion.div>
{item.subMenu
.filter (subItem => subItem.visible ?? true)
.map ((subItem, j) => (
'component' in subItem
? (
<motion.div
key={`c-${ i }-${ j }`}
transition={{ duration: .2, ease: 'easeOut' }}
{...((visibleMenu[activeIdx]?.name
=== item.name)
? { layoutId: `submenu-${ item.name }-${ j }` }
: { initial: { y: -40, opacity: 0 },
animate: { y: 0, opacity: 1 },
exit: { y: -40, opacity: 0 } })}>
{subItem.component}
</motion.div>)
: (
<motion.div
key={`l-${ i }-${ j }`}
transition={{ duration: .2, ease: 'easeOut' }}
{...((visibleMenu[activeIdx]?.name
=== item.name)
? { layoutId: `submenu-${ item.name }-${ j }` }
: { initial: { y: -40, opacity: 0 },
animate: { y: 0, opacity: 1 },
exit: { y: -40, opacity: 0 } })}>
<PrefetchLink
to={subItem.to}
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
onClick={() => setMoreVsbl (false)}
className="h-full flex items-center px-3">
{subItem.name}
</PrefetchLink>
</motion.div>)))}
</div>
</div>)))
: ((visibleMenu[activeIdx]?.subMenu ?? []).length > 0
&& (
<div className="relative h-[40px]">
<AnimatePresence initial={false} custom={dir}>
<motion.div
key={activeIdx}
custom={dir}
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
centre: { y: 0, opacity: 1 },
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
className="absolute inset-0 flex items-center px-3"
initial="enter"
animate="centre"
exit="exit"
transition={{ duration: .2, ease: 'easeOut' }}>
{(visibleMenu[activeIdx]?.subMenu ?? [])
.filter (item => item.visible ?? true)
.map ((item, i) => (
'component' in item
? (
<motion.div
key={`c-${ i }`}
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
{item.component}
</motion.div>)
: (
<motion.div
key={`l-${ i }`}
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
<PrefetchLink
to={item.to}
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined}
className="h-full flex items-center px-3">
{item.name}
</PrefetchLink>
</motion.div>)))}
</motion.div>
</AnimatePresence>
</div>))}
</motion.div>
</AnimatePresence>
<AnimatePresence initial={false}> <AnimatePresence initial={false}>
{menuOpen && ( {menuOpen && (
@@ -241,7 +356,7 @@ export default (({ user }: Props) => {
exit="closed" exit="closed"
transition={{ duration: .2, ease: 'easeOut' }}> transition={{ duration: .2, ease: 'easeOut' }}>
<Separator/> <Separator/>
{menu.map ((item, i) => ( {visibleMenu.map ((item, i) => (
<Fragment key={i}> <Fragment key={i}>
<PrefetchLink <PrefetchLink
to={i === openItemIdx ? item.to : '#'} to={i === openItemIdx ? item.to : '#'}
@@ -294,6 +409,16 @@ export default (({ user }: Props) => {
</motion.div>)} </motion.div>)}
</AnimatePresence> </AnimatePresence>
</Fragment>))} </Fragment>))}
<PrefetchLink
to="/more"
ref={(el: (HTMLAnchorElement | null)) => {
itemsRef.current[visibleMenu.length] = el
}}
className={cn ('w-full min-h-[40px] flex items-center pl-8',
((openItemIdx < 0)
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
&raquo;
</PrefetchLink>
<TopNavUser user={user} sp/> <TopNavUser user={user} sp/>
<Separator/> <Separator/>
</motion.div>)} </motion.div>)}
+9 -15
View File
@@ -4,8 +4,6 @@ import ReactMarkdown from 'react-markdown'
import remarkGFM from 'remark-gfm' import remarkGFM from 'remark-gfm'
import PrefetchLink from '@/components/PrefetchLink' import PrefetchLink from '@/components/PrefetchLink'
import SectionTitle from '@/components/common/SectionTitle'
import SubsectionTitle from '@/components/common/SubsectionTitle'
import { wikiKeys } from '@/lib/queryKeys' import { wikiKeys } from '@/lib/queryKeys'
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink' import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
import { fetchWikiPages } from '@/lib/wiki' import { fetchWikiPages } from '@/lib/wiki'
@@ -16,19 +14,15 @@ import type { Components } from 'react-markdown'
type Props = { title: string type Props = { title: string
body?: string } body?: string }
const mdComponents = { h1: ({ children }) => <SectionTitle>{children}</SectionTitle>, const mdComponents = { a: (({ href, children }) => (
h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>, ['/', '.'].some (e => href?.startsWith (e))
ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>, ? <PrefetchLink to={href!}>{children}</PrefetchLink>
ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>, : (
a: (({ href, children }) => ( <a href={href}
['/', '.'].some (e => href?.startsWith (e)) target="_blank"
? <PrefetchLink to={href!}>{children}</PrefetchLink> rel="noopener noreferrer">
: ( {children}
<a href={href} </a>))) } as const satisfies Components
target="_blank"
rel="noopener noreferrer">
{children}
</a>))) } as const satisfies Components
export default (({ title, body }: Props) => { export default (({ title, body }: Props) => {
@@ -1,9 +1,11 @@
import React from 'react' import { cn } from '@/lib/utils'
type Props = { children: React.ReactNode } import type { ComponentPropsWithoutRef, FC } from 'react'
type Props = ComponentPropsWithoutRef<'h2'>
export default ({ children }: Props) => ( export default (({ children, className, ...rest }: Props) => (
<h2 className="text-xl my-4"> <h2 {...rest} className={cn ('text-xl my-4', className)}>
{children} {children}
</h2>) </h2>)) satisfies FC<Props>
+7 -3
View File
@@ -1,3 +1,5 @@
import { motion } from 'framer-motion'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import type { FC, ReactNode } from 'react' import type { FC, ReactNode } from 'react'
@@ -8,7 +10,9 @@ type Props = {
export default (({ children, className }: Props) => ( export default (({ children, className }: Props) => (
<main className={cn ('flex-1 overflow-y-auto p-4 md:h-[calc(100dvh-88px)]', <motion.main
className)}> transition={{ layout: { duration: .2, ease: 'easeOut' } }}
className={cn ('flex-1 overflow-y-auto p-4', className)}
layout="position">
{children} {children}
</main>)) satisfies FC<Props> </motion.main>)) satisfies FC<Props>
@@ -1,3 +1,4 @@
import { motion } from 'framer-motion'
import { Helmet } from 'react-helmet-async' import { Helmet } from 'react-helmet-async'
import type { FC, ReactNode } from 'react' import type { FC, ReactNode } from 'react'
@@ -6,10 +7,10 @@ type Props = { children: ReactNode }
export default (({ children }: Props) => ( export default (({ children }: Props) => (
<div <motion.div
className="p-4 w-full md:w-64 md:h-full layout="position"
md:h-[calc(100dvh-88px)] md:overflow-y-auto transition={{ layout: { duration: .2, ease: 'easeOut' } }}
sidebar"> className="p-4 w-full md:w-64 md:h-full md:overflow-y-auto sidebar">
<Helmet> <Helmet>
<style> <style>
{` {`
@@ -26,4 +27,4 @@ export default (({ children }: Props) => (
</Helmet> </Helmet>
{children} {children}
</div>)) satisfies FC<Props> </motion.div>)) satisfies FC<Props>
+7 -7
View File
@@ -1,6 +1,6 @@
import { apiDelete, apiGet, apiPost } from '@/lib/api' import { apiDelete, apiGet, apiPost } from '@/lib/api'
import type { FetchPostsParams, Post, PostTagChange } from '@/types' import type { FetchPostsParams, Post, PostVersion } from '@/types'
export const fetchPosts = async ( export const fetchPosts = async (
@@ -29,17 +29,17 @@ export const fetchPost = async (id: string): Promise<Post> => await apiGet (`/po
export const fetchPostChanges = async ( export const fetchPostChanges = async (
{ id, tag, page, limit }: { { post, tag, page, limit }: {
id?: string post?: string
tag?: string tag?: string
page: number page: number
limit: number }, limit: number },
): Promise<{ ): Promise<{
changes: PostTagChange[] versions: PostVersion[]
count: number }> => count: number }> =>
await apiGet ('/posts/changes', { params: { ...(id && { id }), await apiGet ('/posts/versions', { params: { ...(post && { post }),
...(tag && { tag }), ...(tag && { tag }),
page, limit } }) page, limit } })
export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => { export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => {
+1 -1
View File
@@ -5,7 +5,7 @@ export const postsKeys = {
index: (p: FetchPostsParams) => ['posts', 'index', p] as const, index: (p: FetchPostsParams) => ['posts', 'index', p] as const,
show: (id: string) => ['posts', id] as const, show: (id: string) => ['posts', id] as const,
related: (id: string) => ['related', id] as const, related: (id: string) => ['related', id] as const,
changes: (p: { id?: string; tag?: string; page: number; limit: number }) => changes: (p: { post?: string; tag?: string; page: number; limit: number }) =>
['posts', 'changes', p] as const } ['posts', 'changes', p] as const }
export const tagsKeys = { export const tagsKeys = {
+4
View File
@@ -0,0 +1,4 @@
import type { MDXComponents } from 'mdx/types'
export const useMDXComponents = (): MDXComponents => ({ })
+46
View File
@@ -0,0 +1,46 @@
import { Helmet } from 'react-helmet-async'
import PrefetchLink from '@/components/PrefetchLink'
import { menuOutline } from '@/components/TopNav'
import SectionTitle from '@/components/common/SectionTitle'
import MainArea from '@/components/layout/MainArea'
import { SITE_TITLE } from '@/config'
import type { FC } from 'react'
import type { User } from '@/types'
export default (() => {
const menu = menuOutline (
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
return (
<MainArea className="md:flex">
<Helmet>
<title>{`メニュー | ${ SITE_TITLE }`}</title>
</Helmet>
{[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => (
<div key={i} className="flex-1 mx-16">
{menu.slice (4 * i, 4 * (i + 1)).map ((item, j) => (
<section key={j}>
<SectionTitle className="font-bold">{item.name}</SectionTitle>
<ul>
{item.subMenu
.filter (subItem => (subItem.visible ?? true))
.map ((subItem, k) => ('name' in subItem && (
<li key={k}>
<PrefetchLink
to={subItem.to}
target={subItem.to.slice (0, 2) === '//'
? '_blank'
: undefined}>
{subItem.name}
</PrefetchLink>
</li>)))}
</ul>
</section>))}
</div>))}
</MainArea>)
}) satisfies FC
+134
View File
@@ -0,0 +1,134 @@
import { Helmet } from 'react-helmet-async'
import MainArea from '@/components/layout/MainArea'
import { SITE_TITLE } from '@/config'
import { dateString } from '@/lib/utils'
export const lastUpdatedAt = dateString ('2026-04-12', 'hour')
<MainArea>
<Helmet>
<title>{`利用規約 | ${ SITE_TITLE }`}</title>
</Helmet>
<article className="prose dark:prose-invert mx-auto p-4">
# 利用規約
最終更新日: {lastUpdatedAt}
この利用規約(以下「本規約」)は、ぼざクリ タグ広場(以下「本サービス」)の利用条件を定めるものです。利用者は、本サービスを利用した時点で、本規約に同意したものとみなされます。
## 第 1 条 本サービスの位置づけ
1. 本サービスは、タグ・Wiki・外部リンクの整理を中心とする知識共有基盤です。
2. 本サービスの中心価値は、コンテンツそのものの再配布ではなく、タグを軸にした整理、検索、再発見、および周辺知識の蓄積にあります。
3. 本サービスは、運営上の必要に応じて、機能、公開範囲、名称、URL、表示内容その他の仕様を変更することがあります。
## 第 2 条 公開方針と利用者区分
1. 本サービスは、初回一般公開時点では、**誰でも閲覧できる一方で、投稿・編輯は申請制** とします。
2. 初回一般公開時点では、通常の農奴は閲覧のみを行えます。
3. 投稿、タグ編輯、Wiki 編輯その他の耕作行為は、運営が承認した利用者(以下「耕作員」)に限って認めます。
4. 独裁者は、耕作員に加えて、差戻、削除、利用制限、その他の管理操作を行えます。
5. 運営は、履歴管理、差戻、BAN 運用、監査導線その他の運営装備がじゅうぶんに整ったと判断した場合、農奴に一部の編輯権限を開放することがあります。
6. 利用者区分、権限範囲、申請条件、承認基準、承認後の取扱いは、運営が必要に応じて定め、変更できます。
## 第 3 条 利用開始と引継ぎコード
1. 本サービスでは、一般的な Id. / パスワード方式ではなく、運営が別途定める認証情報または引継ぎコードを用いる場合があります。
2. 利用者は、自身に割り当てられた引継ぎコード、認証情報、端末上の保存情報を自己の責任で管理するものとします。
3. 利用者は、自己の引継ぎコードまたは認証情報を第 3 者に譲渡、貸与、共有、漏洩してはなりません。
4. 引継ぎコードの漏洩、第 3 者利用、紛失、盗用その他の事故によって利用者または第 3 者に生じた損害について、運営は責任を負いません。
5. 運営は、本人確認、濫用対策、監査対応または保守のため、利用情報とアクセス元情報を関聯づけて扱うことがあります。
## 第 4 条 申請制編輯の基本ルール
1. 耕作員は、タグ整理基盤の品質維持を最優先し、個人的な所有主張ではなく、検索性、再利用性、可読性、整合性を重視して編輯しなければなりません。
2. 耕作員は、主観的な好悪、内輪ネタ、報復、私怨、対立誘導のためにタグや Wiki を操作してはなりません。
3. 耕作員は、誤りの修正、体系の整理、リンクの保守、知識の補足を目的として編輯を行うものとします。
4. 運営は、申請内容、過去の行動、編輯品質、聯絡可能性、運営負荷その他の事情を考慮して、承認、保留、拒否、取消を行えます。
5. 耕作員資格は権利ではなく、運営が本サービスの維持のために付与する可撤回の権限です。
## 第 5 条 禁止事項
利用者は、以下の行為をしてはなりません。
1. 法令または公序良俗に違反する行為。
2. 犯罪を助長し、またはこれに結びつく行為。
3. 著作権、著作者人格権、商標権、肖像権、パブリシティ権、プライバシー権その他第 3 者の権利を侵害する行為。
4. 無断転載、違法アップロード、違法複製物、海賊版、権限のない転載先への誘導、またはそれらを正当化、拡散、補助する行為。
5. 実在人物に関する名誉毀損、侮辱、差別、脅迫、晒し、つきまとい、嫌がらせ、私刑の扇動その他の加害行為。
6. 個人情報、非公開情報、秘匿されるべき情報を本人の承諾なく掲載、送信、共有、推測可能な形で開示する行為。
7. 虚偽の情報、誤解を招く情報、出典を偽装した情報、意図的なミスリード、荒らし目的のタグづけ、関係のないタグの大量付与、分類妨碍、検索妨碍その他の品質破壊行為。
8. マルウェア、フィッシング、詐欺、誘導広告、悪質なリダイレクト、危険な外部リンクその他利用者または運営に危害を与える行為。
9. 本サービスの趣旨に照らして不相当な政治的扇動、宗教勧誘、商業宣伝、連鎖的勧誘、スパム、同一内容の反復送信。
10. 未成年の安全に反する行為、児童性的搾取、違法または著しく不適切な性的表現、過度に露骨な性表現や残虐表現を、一般公開導線に無警告で流し込む行為。
11. 運営、他の利用者、外部サービスまたは第 3 者に著しい負担、不利益、混乱を生じさせる行為。
12. 前各号のいずれかを試みる行為、教唆する行為、容易にする行為。
13. その他、運営が本サービスの目的または安全な運営に照らして不適切と判断する行為。
## 第 6 条 投稿、タグ、Wiki 等の取扱い
1. 利用者は、自らが投稿、編輯、登録、送信または変更する情報について、必要な権利を有し、または適法に利用できる状態でなければなりません。
2. 利用者は、自らが行った投稿、タグづけ、Wiki 編輯、説明文、コメント、関聯づけその他の行為について責任を負います。
3. 利用者は、運営に対し、本サービスの運営、表示、複製、保存、配信、整形、引用、履歴表示、差戻、バックアップ、障碍対応および弘報のために必要な範囲で、当該利用者生成情報を無償で利用する非独占的な権利を許諾するものとします。
4. 前項の許諾は、本サービスの運営上必要な範囲に限られ、利用者の権利帰属自体を運営へ移転するものではありません。
5. 運営は、分類整合性、表記統一、誤記修正、別名統合、差戻その他の理由により、投稿、タグ、Wiki その他の内容を編輯、非表示化、削除、統合、分割または凍結できます。
## 第 7 条 外部リンクと埋め込み
1. 本サービスは、外部サイトへのリンク、外部コンテンツの埋め込みまたはそれらに関するメタデータを表示する場合があります。
2. 外部リンク先または埋め込み先の権利、利用条件、公開範囲、削除方針、広告、追跡、Cookie その他の取扱いは、当該外部サービスの定めに従います。
3. 運営は、外部リンク先の適法性、安全性、継続性、正確性、品質、可用性、または内容の完全性を保証しません。
4. 外部権利者からの申立て、運営判断、法令対応または安全性確保のため、運営は外部リンク、埋め込み、サムネイル、説明文その他の表示を制限、差替え、非表示または削除できます。
## 第 8 条 履歴、差戻、削除
1. 本サービスでは、保守、監査、荒らし対策、説明責任その他の目的で、投稿、タグ、Wiki その他の変更履歴を保持し、表示し、または内部的に参照することがあります。
2. 利用者は、一度行った編輯が、後に差戻、修正、非表示化または削除されることがあることをあらかじめ承諾するものとします。
3. 利用者が削除を希望した場合でも、法令上、保守上、監査上、紛争対応上またはバックアップ上の必要により、直ちに完全消去できないことがあります。
4. 運営は、本サービス全体の健全性を維持するため、説明の有無を問わず、履歴の表示範囲、保存期間、差戻方針、削除方針を定め、変更できます。
## 第 9 条 利用制限、資格取消、BAN
1. 運営は、利用者が次のいずれかに該当すると判断した場合、事前の通知なく、または通知後に、投稿・編輯の制限、耕作員資格の取消、コンテンツの非表示または削除、引継ぎコードの失効、ユーザ BAN、IP BAN その他必要な措置を行えます。
- 本規約に違反した場合
- 本サービスの趣旨に反する運用妨碍、荒らし、品質破壊行為を行った場合
- 運営からの確認、修正要請、停止要請に合理的理由なく応じない場合
- 登録情報、申請内容または説明に虚偽がある場合
- 安全性、法令順守、運営継続の観点から措置が必要と判断された場合
2. 運営は、前項の措置について、その理由、基準、証拠または内部判断過程を常に開示する義務を負いません。
3. 利用制限または資格取消後も、運営は、必要に応じて履歴、ログ、申請記録、通報記録その他のデータを保持できます。
## 第 10 条 未成年の利用
1. 運営は、未成年の安全確保の観点から、年齢に応じた表示制限、導線制御、非表示化、削除、申請拒否その他の措置を行えます。
2. 利用者は、未成年が閲覧しうる一般公開面において、未成年に不適切な内容を無警告で流し込まないものとします。
## 第 11 条 お問い合わせ、通報、御意見番
1. 利用者は、本サービスが別途案内する問い合わせ、通報または御意見板の導線を通じて、バグ報告、問題報告、削除要請その他の聯絡を行えます。
2. 運営は、すべての問い合わせに回答する義務を負わず、回答期限、対応結果または対応方法を保証しません。
## 第 12 条 免責
1. 運営は、本サービスについて、特定目的適合性、完全性、正確性、継続性、安全性、無瑕疵性、または利用者の期待への適合を保証しません。
2. 運営は、外部リンク先、外部埋め込み先、第 3 者投稿、利用者同士の紛争、通信障碍、データ消失、誤分類、誤リンク、誤記、差戻、機能停止または仕様変更によって生じた損害について、責任を負いません。
3. 本サービスは、予告なく停止、終了、変更または縮小されることがあります。
## 第 13 条 規約の変更
1. 運営は、法令改正、機能追加、運用方針の変更、安全対策、表現調整その他の理由により、本規約を変更できます。
2. 変更後の本規約は、本サービス上に掲載された時点または運営が別途定める時点から効力を生じます。
3. 変更後に利用を継続した利用者は、変更後の本規約に同意したものとみなされます。
## 第 14 条 準拠法および管轄
1. 本規約および本サービスの利用には、日本法を準拠法とします。
2. 本規約または本サービスに関して生じた一切の紛争については、運営の所在地を管轄する裁判所を第 1 審の専属的合意管轄裁判所とします。ただし、法令に別段の定めがある場合はこの限りではありません。
## 附則
本規約は、{lastUpdatedAt} から適用します。
</article>
</MainArea>
@@ -6,8 +6,7 @@ import type { FC } from 'react'
export default (() => ( export default (() => (
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
md:h-[calc(100dvh-88px)]">
<MaterialSidebar/> <MaterialSidebar/>
<Outlet/> <Outlet/>
</div>)) satisfies FC </div>)) satisfies FC
+3 -4
View File
@@ -93,11 +93,10 @@ export default (({ user }: Props) => {
: 'bg-gray-500 hover:bg-gray-600') : 'bg-gray-500 hover:bg-gray-600')
return ( return (
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
md:h-[calc(100dvh-88px)]">
<Helmet> <Helmet>
{(post?.thumbnail || post?.thumbnailBase) && ( {(post?.thumbnail || post?.thumbnailBase) && (
<meta name="thumbnail" content={post.thumbnail || post.thumbnailBase}/>)} <meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
{post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>} {post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
</Helmet> </Helmet>
@@ -117,7 +116,7 @@ export default (({ user }: Props) => {
initial={{ opacity: 1 }} initial={{ opacity: 1 }}
animate={{ opacity: 0 }} animate={{ opacity: 0 }}
transition={{ duration: .2, ease: 'easeOut' }}> transition={{ duration: .2, ease: 'easeOut' }}>
<img src={post.thumbnail || post.thumbnailBase} <img src={post.thumbnail || post.thumbnailBase || undefined}
alt={post.title || post.url} alt={post.title || post.url}
title={post.title || post.url || undefined} title={post.title || post.url || undefined}
className="object-cover w-full h-full"/> className="object-cover w-full h-full"/>
+185 -73
View File
@@ -1,4 +1,4 @@
import { useQuery } from '@tanstack/react-query' import { useQuery, useQueryClient } from '@tanstack/react-query'
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { useEffect } from 'react' import { useEffect } from 'react'
import { Helmet } from 'react-helmet-async' import { Helmet } from 'react-helmet-async'
@@ -9,15 +9,30 @@ import PrefetchLink from '@/components/PrefetchLink'
import PageTitle from '@/components/common/PageTitle' import PageTitle from '@/components/common/PageTitle'
import Pagination from '@/components/common/Pagination' import Pagination from '@/components/common/Pagination'
import MainArea from '@/components/layout/MainArea' import MainArea from '@/components/layout/MainArea'
import { toast } from '@/components/ui/use-toast'
import { SITE_TITLE } from '@/config' import { SITE_TITLE } from '@/config'
import { apiPut } from '@/lib/api'
import { fetchPostChanges } from '@/lib/posts' import { fetchPostChanges } from '@/lib/posts'
import { postsKeys, tagsKeys } from '@/lib/queryKeys' import { postsKeys, tagsKeys } from '@/lib/queryKeys'
import { fetchTag } from '@/lib/tags' import { fetchTag } from '@/lib/tags'
import { cn, dateString } from '@/lib/utils' import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
import type { FC } from 'react' import type { FC } from 'react'
const renderDiff = (diff: { current: string | null; prev: string | null }) => (
<>
{(diff.prev && diff.prev !== diff.current) && (
<>
<del className="text-red-600 dark:text-red-400">
{diff.prev}
</del>
{diff.current && <br/>}
</>)}
{diff.current}
</>)
export default (() => { export default (() => {
const location = useLocation () const location = useLocation ()
const query = new URLSearchParams (location.search) const query = new URLSearchParams (location.search)
@@ -36,15 +51,17 @@ export default (() => {
: { data: null } : { data: null }
const { data, isLoading: loading } = useQuery ({ const { data, isLoading: loading } = useQuery ({
queryKey: postsKeys.changes ({ ...(id && { id }), queryKey: postsKeys.changes ({ ...(id && { post: id }),
...(tagId && { tag: tagId }), ...(tagId && { tag: tagId }),
page, limit }), page, limit }),
queryFn: () => fetchPostChanges ({ ...(id && { id }), queryFn: () => fetchPostChanges ({ ...(id && { post: id }),
...(tagId && { tag: tagId }), ...(tagId && { tag: tagId }),
page, limit }) }) page, limit }) })
const changes = data?.changes ?? [] const changes = data?.versions ?? []
const totalPages = data ? Math.ceil (data.count / limit) : 0 const totalPages = data ? Math.ceil (data.count / limit) : 0
const qc = useQueryClient ()
useEffect (() => { useEffect (() => {
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' }) document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
}, [location.search]) }, [location.search])
@@ -65,76 +82,171 @@ export default (() => {
{loading ? 'Loading...' : ( {loading ? 'Loading...' : (
<> <>
<table className="table-auto w-full border-collapse"> <div className="overflow-x-auto">
<thead className="border-b-2 border-black dark:border-white"> <table className="w-full min-w-[1200px] table-fixed border-collapse">
<tr> <colgroup>
<th className="p-2 text-left">稿</th> {/* 投稿 */}
<th className="p-2 text-left"></th> <col className="w-64"/>
<th className="p-2 text-left"></th> {/* 版 */}
</tr> <col className="w-40"/>
</thead> {/* タイトル */}
<tbody> <col className="w-96"/>
{changes.map ((change, i) => { {/* URL */}
const withPost = i === 0 || change.post.id !== changes[i - 1].post.id <col className="w-96"/>
if (withPost) {/* タグ */}
{ <col className="w-[48rem]"/>
rowsCnt = 1 {/* オリジナルの投稿日時 */}
for (let j = i + 1; <col className="w-96"/>
(j < changes.length {/* 更新日時 */}
&& change.post.id === changes[j].post.id); <col className="w-64"/>
++j) {/* (差戻ボタン) */}
++rowsCnt <col className="w-20"/>
} </colgroup>
let layoutId: string | undefined = `page-${ change.post.id }` <thead className="border-b-2 border-black dark:border-white">
if (layoutIds.includes (layoutId)) <tr>
layoutId = undefined <th className="p-2 text-left">稿</th>
else <th className="p-2 text-left"></th>
layoutIds.push (layoutId) <th className="p-2 text-left"></th>
<th className="p-2 text-left">URL</th>
<th className="p-2 text-left"></th>
<th className="p-2 text-left">稿</th>
<th className="p-2 text-left"></th>
<th className="p-2"/>
</tr>
</thead>
return ( <tbody>
<tr key={`${ change.timestamp }-${ change.post.id }-${ change.tag?.id }`} {changes.map ((change, i) => {
className={cn ('even:bg-gray-100 dark:even:bg-gray-700', const withPost = i === 0 || change.postId !== changes[i - 1].postId
withPost && 'border-t')}> if (withPost)
{withPost && ( {
<td className="align-top p-2 bg-white dark:bg-[#242424] border-r" rowsCnt = 1
rowSpan={rowsCnt}> for (let j = i + 1;
<PrefetchLink to={`/posts/${ change.post.id }`}> (j < changes.length
<motion.div && change.postId === changes[j].postId);
layoutId={layoutId} ++j)
transition={{ type: 'spring', ++rowsCnt
stiffness: 500, }
damping: 40,
mass: .5 }}> let layoutId: string | undefined = `page-${ change.postId }`
<img src={change.post.thumbnail if (layoutIds.includes (layoutId))
|| change.post.thumbnailBase layoutId = undefined
|| undefined} else
alt={change.post.title || change.post.url} layoutIds.push (layoutId)
title={change.post.title || change.post.url || undefined}
className="w-40"/> return (
</motion.div> <tr key={`${ change.postId }.${ change.versionNo }`}
</PrefetchLink> className={cn ('even:bg-gray-100 dark:even:bg-gray-700',
</td>)} withPost && 'border-t')}>
<td className="p-2"> {withPost && (
{change.tag <td className="align-top p-2 bg-white dark:bg-[#242424] border-r"
? <TagLink tag={change.tag} withWiki={false} withCount={false}/> rowSpan={rowsCnt}>
: '(マスタ削除済のタグ) '} <PrefetchLink to={`/posts/${ change.postId }`}>
{`${ change.changeType === 'add' ? '記載' : '消除' }`} <motion.div
</td> layoutId={layoutId}
<td className="p-2"> transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
{change.user <img src={change.thumbnail.current
? ( || change.thumbnailBase.current
<PrefetchLink to={`/users/${ change.user.id }`}> || undefined}
{change.user.name} alt={change.title.current || change.url.current}
</PrefetchLink>) title={change.title.current || change.url.current || undefined}
: 'bot 操作'} className="w-40"/>
<br/> </motion.div>
{dateString (change.timestamp)} </PrefetchLink>
</td> </td>)}
</tr>) <td className="p-2">{change.postId}.{change.versionNo}</td>
})} <td className="p-2 break-all">{renderDiff (change.title)}</td>
</tbody> <td className="p-2 break-all">{renderDiff (change.url)}</td>
</table> <td className="p-2">
{change.tags.map ((tag, i) => (
tag.type === 'added'
? (
<ins
key={i}
className="mr-2 text-green-600 dark:text-green-400">
{tag.name}
</ins>)
: (
tag.type === 'removed'
? (
<del
key={i}
className="mr-2 text-red-600 dark:text-red-400">
{tag.name}
</del>)
: (
<span key={i} className="mr-2">
{tag.name}
</span>))))}
</td>
<td className="p-2">
{change.versionNo === 1
? originalCreatedAtString (change.originalCreatedFrom.current,
change.originalCreatedBefore.current)
: renderDiff ({
current: originalCreatedAtString (
change.originalCreatedFrom.current,
change.originalCreatedBefore.current),
prev: originalCreatedAtString (
change.originalCreatedFrom.prev,
change.originalCreatedBefore.prev) })}
</td>
<td className="p-2">
{change.createdByUser
? (
<PrefetchLink to={`/users/${ change.createdByUser.id }`}>
{change.createdByUser.name
|| `名もなきニジラー(#${ change.createdByUser.id }`}
</PrefetchLink>)
: 'bot 操作'}
<br/>
{dateString (change.createdAt)}
</td>
<td className="p-2">
<a
href="#"
onClick={async e => {
e.preventDefault ()
if (!(confirm (
`${ change.title.current
|| change.url.current }』を版 ${
change.versionNo } に差戻します.\nよろしいですか?`)))
return
try
{
await apiPut (
`/posts/${ change.postId }`,
{ title: change.title.current,
tags: change.tags
.filter (t => t.type !== 'removed')
.map (t => t.name)
.filter (t => t.slice (0, 5) !== 'nico:')
.join (' '),
original_created_from:
change.originalCreatedFrom.current,
original_created_before:
change.originalCreatedBefore.current })
qc.invalidateQueries ({ queryKey: postsKeys.root })
qc.invalidateQueries ({ queryKey: tagsKeys.root })
toast ({ description: '差戻しました.' })
}
catch
{
toast ({ description: '差戻に失敗……' })
}
}}>
</a>
</td>
</tr>)
})}
</tbody>
</table>
</div>
<Pagination page={page} totalPages={totalPages}/> <Pagination page={page} totalPages={totalPages}/>
</>)} </>)}
+1 -2
View File
@@ -70,8 +70,7 @@ export default (() => {
return ( return (
<div <div
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
md:h-[calc(100dvh-88px)]"
ref={containerRef}> ref={containerRef}>
<Helmet> <Helmet>
<title> <title>
+2 -2
View File
@@ -289,7 +289,7 @@ export default (() => {
{results.map (row => ( {results.map (row => (
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700"> <tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
<td className="p-2"> <td className="p-2">
<PrefetchLink to={`/posts/${ row.id }`} title={row.title}> <PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
<motion.div <motion.div
layoutId={`page-${ row.id }`} layoutId={`page-${ row.id }`}
transition={{ type: 'spring', transition={{ type: 'spring',
@@ -304,7 +304,7 @@ export default (() => {
</PrefetchLink> </PrefetchLink>
</td> </td>
<td className="p-2 truncate"> <td className="p-2 truncate">
<PrefetchLink to={`/posts/${ row.id }`} title={row.title}> <PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
{row.title} {row.title}
</PrefetchLink> </PrefetchLink>
</td> </td>
@@ -232,7 +232,7 @@ export default (() => {
return <ErrorScreen status={status}/> return <ErrorScreen status={status}/>
return ( return (
<div className="md:flex md:flex-1"> <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
<Helmet> <Helmet>
{theatre && ( {theatre && (
<title> <title>
+9 -10
View File
@@ -7,7 +7,6 @@ import PostList from '@/components/PostList'
import PrefetchLink from '@/components/PrefetchLink' import PrefetchLink from '@/components/PrefetchLink'
import TagLink from '@/components/TagLink' import TagLink from '@/components/TagLink'
import WikiBody from '@/components/WikiBody' import WikiBody from '@/components/WikiBody'
import PageTitle from '@/components/common/PageTitle'
import TabGroup, { Tab } from '@/components/common/TabGroup' import TabGroup, { Tab } from '@/components/common/TabGroup'
import MainArea from '@/components/layout/MainArea' import MainArea from '@/components/layout/MainArea'
import { SITE_TITLE } from '@/config' import { SITE_TITLE } from '@/config'
@@ -107,15 +106,15 @@ export default () => {
</PrefetchLink>) : '(最新)'} </PrefetchLink>) : '(最新)'}
</div>)} </div>)}
<PageTitle> <article className="prose dark:prose-invert mx-auto p-4">
<TagLink tag={tag ?? defaultTag} <h1 className="prose-a:no-underline">
withWiki={false} <TagLink tag={tag ?? defaultTag}
withCount={false} withWiki={false}
{...(version && { to: `/wiki/${ encodeURIComponent (title) }` })}/> withCount={false}
</PageTitle> {...(version && { to: `/wiki/${ encodeURIComponent (title) }` })}/>
<div className="prose mx-auto p-4"> </h1>
{loading ? 'Loading...' : <WikiBody title={title} body={wikiPage?.body}/>} {loading ? <div>Loading...</div> : <WikiBody title={title} body={wikiPage?.body}/>}
</div> </article>
{(!(version) && posts.length > 0) && ( {(!(version) && posts.length > 0) && (
<TabGroup> <TabGroup>
+39 -11
View File
@@ -63,10 +63,20 @@ export type Material = {
export type Menu = MenuItem[] export type Menu = MenuItem[]
export type MenuItem = { export type MenuInvisibleItem = {
name: ReactNode
to?: string
base?: string
visible: false
subMenu: SubMenuItem[] }
export type MenuItem = MenuVisibleItem | MenuInvisibleItem
export type MenuVisibleItem = {
name: ReactNode name: ReactNode
to: string to: string
base?: string base?: string
visible?: true
subMenu: SubMenuItem[] } subMenu: SubMenuItem[] }
export type NicoTag = Tag & { export type NicoTag = Tag & {
@@ -107,9 +117,9 @@ export type NiconicoViewerHandle = {
export type Post = { export type Post = {
id: number id: number
url: string url: string
title: string title: string | null
thumbnail: string thumbnail: string | null
thumbnailBase: string thumbnailBase: string | null
tags: Tag[] tags: Tag[]
viewed: boolean viewed: boolean
related: Post[] related: Post[]
@@ -117,7 +127,7 @@ export type Post = {
originalCreatedBefore: string | null originalCreatedBefore: string | null
createdAt: string createdAt: string
updatedAt: string updatedAt: string
uploadedUser: { id: number; name: string } | null } uploadedUser: { id: number; name: string | null } | null }
export type PostTagChange = { export type PostTagChange = {
post: Post post: Post
@@ -126,12 +136,30 @@ export type PostTagChange = {
changeType: 'add' | 'remove' changeType: 'add' | 'remove'
timestamp: string } timestamp: string }
export type SubMenuItem = export type PostVersion = {
| { component: ReactNode postId: number
visible: boolean } versionNo: number
| { name: ReactNode eventType: 'create' | 'update' | 'discard' | 'restore'
to: string title: { current: string | null; prev: string | null }
visible?: boolean } url: { current: string; prev: string | null }
thumbnail: { current: string | null; prev: string | null }
thumbnailBase: { current: string | null; prev: string | null }
tags: { name: string; type: 'context' | 'added' | 'removed' }[]
originalCreatedFrom: { current: string | null; prev: string | null }
originalCreatedBefore: { current: string | null; prev: string | null }
createdAt: string
createdByUser: { id: number; name: string | null } | null }
export type SubMenuComponentItem = {
component: ReactNode
visible: boolean }
export type SubMenuItem = SubMenuComponentItem | SubMenuStringItem
export type SubMenuStringItem = {
name: ReactNode
to: string
visible?: boolean }
export type Tag = { export type Tag = {
id: number id: number
+2 -2
View File
@@ -8,7 +8,7 @@ import { DARK_COLOUR_SHADE,
const colours = Object.values (TAG_COLOUR) const colours = Object.values (TAG_COLOUR)
export default { export default {
content: ['./src/**/*.{html,js,ts,jsx,tsx}'], content: ['./src/**/*.{html,js,ts,jsx,tsx,mdx}'],
safelist: [...colours.map (c => `text-${ c }-${ LIGHT_COLOUR_SHADE }`), safelist: [...colours.map (c => `text-${ c }-${ LIGHT_COLOUR_SHADE }`),
...colours.map (c => `hover:text-${ c }-${ LIGHT_COLOUR_SHADE - 200 }`), ...colours.map (c => `hover:text-${ c }-${ LIGHT_COLOUR_SHADE - 200 }`),
...colours.map (c => `dark:text-${ c }-${ DARK_COLOUR_SHADE }`), ...colours.map (c => `dark:text-${ c }-${ DARK_COLOUR_SHADE }`),
@@ -24,4 +24,4 @@ export default {
'rainbow-scroll': { 'rainbow-scroll': {
'0%': { backgroundPosition: '0% 50%' }, '0%': { backgroundPosition: '0% 50%' },
'100%': { backgroundPosition: '200% 50%' } } } } }, '100%': { backgroundPosition: '200% 50%' } } } } },
plugins: [] } satisfies Config plugins: [require ('@tailwindcss/typography')] } satisfies Config
+3 -2
View File
@@ -1,11 +1,12 @@
import { defineConfig } from 'vite' import mdx from '@mdx-js/rollup'
import react from '@vitejs/plugin-react' import react from '@vitejs/plugin-react'
import path from 'path' import path from 'path'
import { defineConfig } from 'vite'
// https://vite.dev/config/ // https://vite.dev/config/
export default defineConfig ({ export default defineConfig ({
plugins: [react()], plugins: [mdx ({ providerImportSource: '@/mdx-components' }), react ()],
resolve: { alias: { '@': path.resolve (__dirname, './src') } }, resolve: { alias: { '@': path.resolve (__dirname, './src') } },
server: { host: true, server: { host: true,
port: 5173, port: 5173,