From 9a656a9e6ee17d37067f1f6f3f12f417595cdd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Sat, 13 Dec 2025 16:34:45 +0900 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=8A=95=E7=A8=BF=E3=81=A8?= =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=81=AE=E3=83=AA=E3=83=AC=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=83=BB=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=E8=AB=96=E7=90=86=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=A8=E5=B1=A5=E6=AD=B4=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=88#84=EF=BC=89=20(#148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #84 マイグレ修正 Merge remote-tracking branch 'origin/main' into feature/084 #84 構文エラー修正 #84 #84 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/148 --- backend/Gemfile | 2 + backend/Gemfile.lock | 3 + backend/app/controllers/posts_controller.rb | 48 ++++++--- backend/app/models/post.rb | 12 ++- backend/app/models/post_tag.rb | 18 ++++ backend/app/models/tag.rb | 10 +- ...20251011200300_add_discard_to_post_tags.rb | 36 +++++++ backend/lib/tasks/sync_nico.rake | 98 ++++++++++++------- 8 files changed, 172 insertions(+), 55 deletions(-) create mode 100644 backend/db/migrate/20251011200300_add_discard_to_post_tags.rb diff --git a/backend/Gemfile b/backend/Gemfile index bb5460b..303b937 100644 --- a/backend/Gemfile +++ b/backend/Gemfile @@ -63,3 +63,5 @@ gem 'diff-lcs' gem 'dotenv-rails' gem 'whenever', require: false + +gem 'discard' diff --git a/backend/Gemfile.lock b/backend/Gemfile.lock index 8494a53..2c08f92 100644 --- a/backend/Gemfile.lock +++ b/backend/Gemfile.lock @@ -90,6 +90,8 @@ GEM crass (1.0.6) date (3.4.1) diff-lcs (1.6.2) + discard (1.4.0) + activerecord (>= 4.2, < 9.0) dotenv (3.1.8) dotenv-rails (3.1.8) dotenv (= 3.1.8) @@ -420,6 +422,7 @@ DEPENDENCIES bootsnap brakeman diff-lcs + discard dotenv-rails gollum image_processing (~> 1.14) diff --git a/backend/app/controllers/posts_controller.rb b/backend/app/controllers/posts_controller.rb index 81a1c0e..a09028a 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -1,7 +1,3 @@ -require 'open-uri' -require 'nokogiri' - - class PostsController < ApplicationController # GET /posts def index @@ -80,8 +76,9 @@ class PostsController < ApplicationController post.thumbnail.attach(thumbnail) if post.save post.resized_thumbnail! - post.tags = Tag.normalise_tags(tag_names) - post.tags = Tag.expand_parent_tags(post.tags) + tags = Tag.normalise_tags(tag_names) + tags = Tag.expand_parent_tags(tags) + sync_post_tags!(post, tags) render json: post.as_json(include: { tags: { only: [:id, :name, :category, :post_count] } }), status: :created else @@ -114,10 +111,11 @@ class PostsController < ApplicationController original_created_before = params[:original_created_before] post = Post.find(params[:id].to_i) - tags = post.tags.where(category: 'nico').to_a + - Tag.normalise_tags(tag_names, with_tagme: false) - tags = Tag.expand_parent_tags(tags) - if post.update(title:, tags:, original_created_from:, original_created_before:) + if post.update(title:, original_created_from:, original_created_before:) + tags = post.tags.where(category: 'nico').to_a + + Tag.normalise_tags(tag_names, with_tagme: false) + tags = Tag.expand_parent_tags(tags) + sync_post_tags!(post, tags) json = post.as_json json['tags'] = build_tag_tree_for(post.tags) render json:, status: :ok @@ -135,7 +133,11 @@ class PostsController < ApplicationController def filtered_posts tag_names = params[:tags]&.split(' ') match_type = params[:match] - tag_names.present? ? filter_posts_by_tags(tag_names, match_type) : Post.all + if tag_names.present? + filter_posts_by_tags(tag_names, match_type) + else + Post.all + end end def filter_posts_by_tags tag_names, match_type @@ -150,6 +152,30 @@ class PostsController < ApplicationController posts.distinct end + def sync_post_tags! post, desired_tags + desired_tags.each do |t| + t.save! if t.new_record? + end + + desired_ids = desired_tags.map(&:id).to_set + current_ids = post.tags.pluck(:id).to_set + + to_add = desired_ids - current_ids + to_remove = current_ids - desired_ids + + Tag.where(id: to_add).find_each do |tag| + begin + PostTag.create!(post:, tag:, created_user: current_user) + rescue ActiveRecord::RecordNotUnique + ; + end + end + + PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt| + pt.discard_by!(current_user) + end + end + def build_tag_tree_for tags tags = tags.to_a tag_ids = tags.map(&:id) diff --git a/backend/app/models/post.rb b/backend/app/models/post.rb index f32f753..6dd565b 100644 --- a/backend/app/models/post.rb +++ b/backend/app/models/post.rb @@ -1,11 +1,13 @@ -require 'mini_magick' - - class Post < ApplicationRecord + require 'mini_magick' + belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id' belongs_to :uploaded_user, class_name: 'User', optional: true - has_many :post_tags, dependent: :destroy - has_many :tags, through: :post_tags + + has_many :post_tags, dependent: :destroy, inverse_of: :post + has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :post + has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag' + has_many :tags, through: :active_post_tags has_many :user_post_views, dependent: :destroy has_many :post_similarities_as_post, class_name: 'PostSimilarity', diff --git a/backend/app/models/post_tag.rb b/backend/app/models/post_tag.rb index 9dbd756..91a739d 100644 --- a/backend/app/models/post_tag.rb +++ b/backend/app/models/post_tag.rb @@ -1,7 +1,25 @@ class PostTag < ApplicationRecord + include Discard::Model + belongs_to :post belongs_to :tag, counter_cache: :post_count + belongs_to :created_user, class_name: 'User', optional: true + belongs_to :deleted_user, class_name: 'User', optional: true validates :post_id, presence: true validates :tag_id, presence: true + validates :post_id, uniqueness: { + scope: :tag_id, + conditions: -> { where(discarded_at: nil) } } + + def discard_by! deleted_user + return self if discarded? + + transaction do + update!(discarded_at: Time.current, deleted_user:) + Tag.where(id: tag_id).update_all('post_count = GREATEST(post_count - 1, 0)') + end + + self + end end diff --git a/backend/app/models/tag.rb b/backend/app/models/tag.rb index 8a505e2..d496802 100644 --- a/backend/app/models/tag.rb +++ b/backend/app/models/tag.rb @@ -1,6 +1,8 @@ class Tag < ApplicationRecord - has_many :post_tags, dependent: :destroy - has_many :posts, through: :post_tags + has_many :post_tags, dependent: :delete_all, inverse_of: :tag + has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag + has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag' + has_many :posts, through: :active_post_tags has_many :tag_aliases, dependent: :destroy has_many :nico_tag_relations, foreign_key: :nico_tag_id, dependent: :destroy @@ -43,13 +45,13 @@ class Tag < ApplicationRecord 'meta:' => 'meta' }.freeze def self.tagme - @tagme ||= Tag.find_or_initialize_by(name: 'タグ希望') do |tag| + @tagme ||= Tag.find_or_create_by!(name: 'タグ希望') do |tag| tag.category = 'meta' end end def self.bot - @bot ||= Tag.find_or_initialize_by(name: 'bot操作') do |tag| + @bot ||= Tag.find_or_create_by!(name: 'bot操作') do |tag| tag.category = 'meta' end end diff --git a/backend/db/migrate/20251011200300_add_discard_to_post_tags.rb b/backend/db/migrate/20251011200300_add_discard_to_post_tags.rb new file mode 100644 index 0000000..f825a37 --- /dev/null +++ b/backend/db/migrate/20251011200300_add_discard_to_post_tags.rb @@ -0,0 +1,36 @@ +class AddDiscardToPostTags < ActiveRecord::Migration[8.0] + def up + execute <<~SQL + DELETE + pt1 + FROM + post_tags pt1 + INNER JOIN + post_tags pt2 + ON + pt1.post_id = pt2.post_id + AND pt1.tag_id = pt2.tag_id + AND pt1.id > pt2.id + ; + SQL + + add_column :post_tags, :discarded_at, :datetime + add_index :post_tags, :discarded_at + + add_column :post_tags, :is_active, :boolean, + as: 'discarded_at IS NULL', stored: true + + add_column :post_tags, :active_unique_key, :string, + as: "CASE WHEN discarded_at IS NULL THEN CONCAT(post_id, ':', tag_id) ELSE NULL END", + stored: true + + add_index :post_tags, :active_unique_key, unique: true, name: 'idx_post_tags_active_unique' + + add_index :post_tags, [:post_id, :discarded_at] + add_index :post_tags, [:tag_id, :discarded_at] + end + + def down + raise ActiveRecord::IrreversibleMigration, '戻せません．' + end +end diff --git a/backend/lib/tasks/sync_nico.rake b/backend/lib/tasks/sync_nico.rake index 9fe28fb..00e309f 100644 --- a/backend/lib/tasks/sync_nico.rake +++ b/backend/lib/tasks/sync_nico.rake @@ -5,12 +5,30 @@ namespace :nico do require 'open-uri' require 'nokogiri' - fetch_thumbnail = -> url { + fetch_thumbnail = -> url do html = URI.open(url, read_timeout: 60, 'User-Agent' => 'Mozilla/5.0').read doc = Nokogiri::HTML(html) doc.at('meta[name="thumbnail"]')&.[]('content').presence - } + end + + def sync_post_tags! post, desired_tag_ids + desired_ids = desired_tag_ids.compact.to_set + current_ids = post.tags.pluck(:id).to_set + + to_add = desired_ids - current_ids + to_remove = current_ids - desired_ids + + Tag.where(id: to_add.to_a).find_each do |tag| + begin + PostTag.create!(post:, tag:) + rescue ActiveRecord::RecordNotUnique + ; + end + end + + PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each(&:discard!) + end mysql_user = ENV['MYSQL_USER'] mysql_pass = ENV['MYSQL_PASS'] @@ -19,43 +37,53 @@ namespace :nico do { 'MYSQL_USER' => mysql_user, 'MYSQL_PASS' => mysql_pass }, 'python3', "#{ nizika_nico_path }/get_videos.py") - if status.success? - data = JSON.parse(stdout) - data.each do |datum| - post = Post.where('url LIKE ?', '%nicovideo.jp%').find { |post| - post.url =~ %r{#{ Regexp.escape(datum['code']) }(?!\d)} - } - unless post - title = datum['title'] - url = "https://www.nicovideo.jp/watch/#{ datum['code'] }" - thumbnail_base = fetch_thumbnail.(url) || '' rescue '' - post = Post.new(title:, url:, thumbnail_base:, uploaded_user: nil) - if thumbnail_base.present? - post.thumbnail.attach( - io: URI.open(thumbnail_base), - filename: File.basename(URI.parse(thumbnail_base).path), - content_type: 'image/jpeg') - end - post.save! - post.resized_thumbnail! + abort unless status.success? + + data = JSON.parse(stdout) + data.each do |datum| + post = Post.where('url LIKE ?', '%nicovideo.jp%').find { |post| + post.url =~ %r{#{ Regexp.escape(datum['code']) }(?!\d)} + } + unless post + title = datum['title'] + url = "https://www.nicovideo.jp/watch/#{ datum['code'] }" + thumbnail_base = fetch_thumbnail.(url) || '' rescue '' + post = Post.new(title:, url:, thumbnail_base:, uploaded_user: nil) + if thumbnail_base.present? + post.thumbnail.attach( + io: URI.open(thumbnail_base), + filename: File.basename(URI.parse(thumbnail_base).path), + content_type: 'image/jpeg') end + post.save! + post.resized_thumbnail! + end + + kept_tags = post.tags.reload + kept_non_nico_ids = kept_tags.where.not(category: 'nico').pluck(:id).to_set - current_tags = post.tags.where(category: 'nico').pluck(:name).sort - new_tags = datum['tags'].map { |tag| "nico:#{ tag }" }.sort - if current_tags != new_tags - post.tags.destroy(post.tags.where(name: current_tags)) - tags_to_add = [] - new_tags.each do |name| - tag = Tag.find_or_initialize_by(name:) do |t| - t.category = 'nico' - end - tags_to_add.concat([tag] + tag.linked_tags) - end - tags_to_add << Tag.tagme if post.tags.size < 10 - tags_to_add << Tag.bot - post.tags = (post.tags + tags_to_add).uniq + desired_nico_ids = [] + datum['tags'].each do |raw| + name = "nico:#{ raw }" + tag = Tag.find_or_initialize_by(name:) do |t| + t.category = 'nico' end + tag.save! if tag.new_record? + desired_nico_ids << tag.id + desired_nico_ids.concat(tag.linked_tags.pluck(:id)) end + desired_nico_ids.uniq! + + desired_extra_ids = [] + desired_extra_ids << Tag.tagme.id if kept_tags.size < 10 + desired_extra_ids << Tag.bot.id + desired_extra_ids.compact! + desired_extra_ids.uniq! + + desired_all_ids = kept_non_nico_ids.to_a + desired_nico_ids + desired_extra_ids + desired_all_ids.uniq! + + sync_post_tags!(post, desired_all_ids) end end end From f36837f0d83332d74039cc4ef3d43eafc8d03bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Sun, 14 Dec 2025 03:49:03 +0900 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E8=80=95=E4=BD=9C=E5=B1=A5?= =?UTF-8?q?=E6=AD=B4=E3=83=9A=E3=83=BC=E3=82=B8=E4=BD=9C=E6=88=90=EF=BC=88?= =?UTF-8?q?#112=EF=BC=89=20(#177)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #112 現在ページの表示を太く #112 完了 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/177 --- backend/app/controllers/posts_controller.rb | 40 +++++++++ backend/config/routes.rb | 1 + frontend/src/App.tsx | 2 + frontend/src/components/TopNav.tsx | 1 + frontend/src/components/common/Pagination.tsx | 79 ++++++++++++++++ frontend/src/pages/posts/PostHistoryPage.tsx | 90 +++++++++++++++++++ frontend/src/types.ts | 7 ++ 7 files changed, 220 insertions(+) create mode 100644 frontend/src/components/common/Pagination.tsx create mode 100644 frontend/src/pages/posts/PostHistoryPage.tsx diff --git a/backend/app/controllers/posts_controller.rb b/backend/app/controllers/posts_controller.rb index a09028a..96af1c1 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -1,4 +1,6 @@ class PostsController < ApplicationController + Event = Struct.new(:post, :tag, :user, :change_type, :timestamp, keyword_init: true) + # GET /posts def index limit = params[:limit].presence&.to_i @@ -128,6 +130,44 @@ class PostsController < ApplicationController def destroy end + def changes + id = params[:id] + 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 + + pts = PostTag.with_discarded + pts = pts.where(post_id: id) if id.present? + pts = pts.includes(:post, :tag, :created_user, :deleted_user) + + events = [] + pts.each do |pt| + events << Event.new( + post: pt.post, + tag: pt.tag, + user: pt.created_user && { id: pt.created_user.id, name: pt.created_user.name }, + change_type: 'add', + timestamp: pt.created_at) + + if pt.discarded_at + events << Event.new( + post: pt.post, + tag: pt.tag, + user: pt.deleted_user && { id: pt.deleted_user.id, name: pt.deleted_user.name }, + change_type: 'remove', + timestamp: pt.discarded_at) + end + end + events.sort_by!(&:timestamp) + events.reverse! + + render json: { changes: events.slice(offset, limit).as_json, count: events.size } + end + private def filtered_posts diff --git a/backend/config/routes.rb b/backend/config/routes.rb index 709f1d0..0733991 100644 --- a/backend/config/routes.rb +++ b/backend/config/routes.rb @@ -4,6 +4,7 @@ Rails.application.routes.draw do get 'tags/autocomplete', to: 'tags#autocomplete' get 'tags/name/:name', to: 'tags#show_by_name' get 'posts/random', to: 'posts#random' + get 'posts/changes', to: 'posts#changes' post 'posts/:id/viewed', to: 'posts#viewed' delete 'posts/:id/viewed', to: 'posts#unviewed' get 'preview/title', to: 'preview#title' diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index d1b1e28..2195ca8 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -9,6 +9,7 @@ import { API_BASE_URL } from '@/config' import NicoTagListPage from '@/pages/tags/NicoTagListPage' import NotFound from '@/pages/NotFound' import PostDetailPage from '@/pages/posts/PostDetailPage' +import PostHistoryPage from '@/pages/posts/PostHistoryPage' import PostListPage from '@/pages/posts/PostListPage' import PostNewPage from '@/pages/posts/PostNewPage' import ServiceUnavailable from '@/pages/ServiceUnavailable' @@ -79,6 +80,7 @@ export default (() => { }/> }/> }/> + }/> }/> }/> }/> diff --git a/frontend/src/components/TopNav.tsx b/frontend/src/components/TopNav.tsx index 104f40e..e62be09 100644 --- a/frontend/src/components/TopNav.tsx +++ b/frontend/src/components/TopNav.tsx @@ -30,6 +30,7 @@ export default (({ user }: Props) => { { name: '広場', to: '/posts', subMenu: [ { name: '一覧', to: '/posts' }, { name: '投稿追加', to: '/posts/new' }, + { name: '耕作履歴', to: '/posts/changes' }, { name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] }, { name: 'タグ', to: '/tags', subMenu: [ { name: 'タグ一覧', to: '/tags', visible: false }, diff --git a/frontend/src/components/common/Pagination.tsx b/frontend/src/components/common/Pagination.tsx new file mode 100644 index 0000000..5fb527e --- /dev/null +++ b/frontend/src/components/common/Pagination.tsx @@ -0,0 +1,79 @@ +import { Link, useLocation } from 'react-router-dom' + +import type { FC } from 'react' + +type Props = { page: number + totalPages: number + siblingCount?: number } + + +const range = (start: number, end: number): number[] => + [...Array (end - start + 1).keys ()].map (i => start + i) + + +const getPages = ( + page: number, + total: number, + siblingCount: number, +): (number | '…')[] => { + if (total <= 1) + return [1] + + const first = 1 + const last = total + + const left = Math.max (page - siblingCount, first) + const right = Math.min (page + siblingCount, last) + + const pages: (number | '…')[] = [] + + pages.push (first) + + if (left > first + 1) + pages.push ('…') + + const midStart = Math.max (left, first + 1) + const midEnd = Math.min (right, last - 1) + pages.push (...range (midStart, midEnd)) + + if (right < last - 1) + pages.push ('…') + + if (last !== first) + pages.push (last) + + return pages.filter ((v, i, arr) => i === 0 || v !== arr[i - 1]) +} + + +export default (({ page, totalPages, siblingCount = 4 }) => { + const location = useLocation () + + const buildTo = (p: number) => { + const qs = new URLSearchParams (location.search) + qs.set ('page', String (p)) + return `${ location.pathname }?${ qs.toString () }` + } + + const pages = getPages (page, totalPages, siblingCount) + + return ( + ) +}) satisfies FC diff --git a/frontend/src/pages/posts/PostHistoryPage.tsx b/frontend/src/pages/posts/PostHistoryPage.tsx new file mode 100644 index 0000000..e401b09 --- /dev/null +++ b/frontend/src/pages/posts/PostHistoryPage.tsx @@ -0,0 +1,90 @@ +import axios from 'axios' +import toCamel from 'camelcase-keys' +import { useEffect, useState } from 'react' +import { Helmet } from 'react-helmet-async' +import { Link, useLocation } from 'react-router-dom' + +import TagLink from '@/components/TagLink' +import PageTitle from '@/components/common/PageTitle' +import Pagination from '@/components/common/Pagination' +import MainArea from '@/components/layout/MainArea' +import { API_BASE_URL, SITE_TITLE } from '@/config' + +import type { FC } from 'react' + +import type { PostTagChange } from '@/types' + + +export default (() => { + const [changes, setChanges] = useState ([]) + const [totalPages, setTotalPages] = useState (0) + + const location = useLocation () + const query = new URLSearchParams (location.search) + const id = query.get ('id') + const page = Number (query.get ('page') ?? 1) + const limit = Number (query.get ('limit') ?? 20) + + useEffect (() => { + void (async () => { + const res = await axios.get (`${ API_BASE_URL }/posts/changes`, + { params: { ...(id && { id }), + ...(page && { page }), + ...(limit && { limit }) } }) + const data = toCamel (res.data as any, { deep: true }) as { + changes: PostTagChange[] + count: number } + setChanges (data.changes) + setTotalPages (Math.trunc ((data.count - 1) / limit)) + }) () + }, [location.search]) + + return ( + + + {`耕作履歴 | ${ SITE_TITLE }`} + + + + 耕作履歴 + {Boolean (id) && <>: 投稿 {#{id}}} + + + + + + + + + + + + {changes.map (change => ( + + + + + ))} + +
投稿変更日時
+ + {change.post.title + + + + {`を${ change.changeType === 'add' ? '追加' : '削除' }`} + + {change.user ? ( + + {change.user.name} + ) : 'bot 操作'} +
+ {change.timestamp} +
+ + + ) +}) satisfies FC diff --git a/frontend/src/types.ts b/frontend/src/types.ts index 5904f19..f78c85b 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -29,6 +29,13 @@ export type Post = { originalCreatedFrom: string | null originalCreatedBefore: string | null } +export type PostTagChange = { + post: Post + tag: Tag + user?: User + changeType: 'add' | 'remove' + timestamp: string } + export type SubMenuItem = | { component: ReactNode visible: boolean } From 92d9fe7733f10cd8e692a83ce6afd9c51814f0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Sun, 14 Dec 2025 16:24:04 +0900 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=8B=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E5=AE=9F=E8=A3=85=EF=BC=88#176=EF=BC=89=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #176 完了 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/178 --- frontend/package-lock.json | 43 +++++++ frontend/package.json | 1 + frontend/src/components/TagDetailSidebar.tsx | 123 ++++++++++--------- frontend/src/components/TagSidebar.tsx | 79 +++++++----- frontend/src/components/TopNav.tsx | 78 +++++++----- 5 files changed, 204 insertions(+), 120 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b241081..43fbc44 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -17,6 +17,7 @@ "camelcase-keys": "^9.1.3", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", + "framer-motion": "^12.23.26", "humps": "^2.0.1", "lucide-react": "^0.511.0", "markdown-it": "^14.1.0", @@ -3573,6 +3574,33 @@ "url": "https://github.com/sponsors/rawify" } }, + "node_modules/framer-motion": { + "version": "12.23.26", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.23.26.tgz", + "integrity": "sha512-cPcIhgR42xBn1Uj+PzOyheMtZ73H927+uWPDVhUMqxy8UHt6Okavb6xIz9J/phFUHUj0OncR6UvMfJTXoc/LKA==", + "license": "MIT", + "dependencies": { + "motion-dom": "^12.23.23", + "motion-utils": "^12.23.6", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "@emotion/is-prop-valid": "*", + "react": "^18.0.0 || ^19.0.0", + "react-dom": "^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/is-prop-valid": { + "optional": true + }, + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -5216,6 +5244,21 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/motion-dom": { + "version": "12.23.23", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.23.23.tgz", + "integrity": "sha512-n5yolOs0TQQBRUFImrRfs/+6X4p3Q4n1dUEqt/H58Vx7OW6RF+foWEgmTVDhIWJIMXOuNNL0apKH2S16en9eiA==", + "license": "MIT", + "dependencies": { + "motion-utils": "^12.23.6" + } + }, + "node_modules/motion-utils": { + "version": "12.23.6", + "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.23.6.tgz", + "integrity": "sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==", + "license": "MIT" + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index 747f7ed..cbe44ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,6 +19,7 @@ "camelcase-keys": "^9.1.3", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", + "framer-motion": "^12.23.26", "humps": "^2.0.1", "lucide-react": "^0.511.0", "markdown-it": "^14.1.0", diff --git a/frontend/src/components/TagDetailSidebar.tsx b/frontend/src/components/TagDetailSidebar.tsx index da2c3b8..0006738 100644 --- a/frontend/src/components/TagDetailSidebar.tsx +++ b/frontend/src/components/TagDetailSidebar.tsx @@ -1,3 +1,4 @@ +import { AnimatePresence, motion } from 'framer-motion' import { useEffect, useState } from 'react' import TagLink from '@/components/TagLink' @@ -18,18 +19,23 @@ const renderTagTree = ( tag: Tag, nestLevel: number, path: string, - ): ReactNode[] => { +): ReactNode[] => { const key = `${ path }-${ tag.id }` const self = ( -
  • + -
    • ) + ) return [self, - ...(tag.children - ?.sort ((a, b) => a.name < b.name ? -1 : 1) - .flatMap (child => renderTagTree (child, nestLevel + 1, key)) ?? [])] + ...((tag.children + ?.sort ((a, b) => a.name < b.name ? -1 : 1) + .flatMap (child => renderTagTree (child, nestLevel + 1, key))) + ?? [])] } @@ -70,55 +76,60 @@ export default (({ post }: Props) => { return ( - {CATEGORIES.map ((cat: Category) => cat in tags && ( -
    - {categoryNames[cat]} -
      - {tags[cat].map (tag => renderTagTree (tag, 0, `cat-${ cat }`))} -
    -
    ))} - {post && ( -
    - 情報 -
      -
    • Id.: {post.id}
      • - {/* TODO: uploadedUser の取得を対応したらコメント外す */} - {/* -
    • - <>耕作者: - {post.uploadedUser - ? ( - - {post.uploadedUser.name || '名もなきニジラー'} - ) - : 'bot操作'} -
      • - */} -
    • 耕作日時: {(new Date (post.createdAt)).toLocaleString ()}
      • -
    • - <>リンク: - - {post.url} - -
      • -
    • - {/* TODO: 表示形式きしょすぎるので何とかする */} - <>オリジナルの投稿日時: - {!(post.originalCreatedFrom) && !(post.originalCreatedBefore) - ? '不明' - : ( - <> - {post.originalCreatedFrom - && `${ (new Date (post.originalCreatedFrom)).toLocaleString () } 以降 `} - {post.originalCreatedBefore - && `${ (new Date (post.originalCreatedBefore)).toLocaleString () } より前`} - )} -
      • -
    -
    )} + + {CATEGORIES.map ((cat: Category) => cat in tags && ( + + {categoryNames[cat]} + + + + {tags[cat].map (tag => renderTagTree (tag, 0, `cat-${ cat }`))} + + + ))} + {post && ( +
    + 情報 +
      +
    • Id.: {post.id}
      • + {/* TODO: uploadedUser の取得を対応したらコメント外す */} + {/* +
    • + <>耕作者: + {post.uploadedUser + ? ( + + {post.uploadedUser.name || '名もなきニジラー'} + ) + : 'bot操作'} +
      • + */} +
    • 耕作日時: {(new Date (post.createdAt)).toLocaleString ()}
      • +
    • + <>リンク: + + {post.url} + +
      • +
    • + {/* TODO: 表示形式きしょすぎるので何とかする */} + <>オリジナルの投稿日時: + {!(post.originalCreatedFrom) && !(post.originalCreatedBefore) + ? '不明' + : ( + <> + {post.originalCreatedFrom + && `${ (new Date (post.originalCreatedFrom)).toLocaleString () } 以降 `} + {post.originalCreatedBefore + && `${ (new Date (post.originalCreatedBefore)).toLocaleString () } より前`} + )} +
      • +
    +
    )} +     ) }) satisfies FC diff --git a/frontend/src/components/TagSidebar.tsx b/frontend/src/components/TagSidebar.tsx index a2e00b2..735490d 100644 --- a/frontend/src/components/TagSidebar.tsx +++ b/frontend/src/components/TagSidebar.tsx @@ -1,4 +1,5 @@ import axios from 'axios' +import { AnimatePresence, motion } from 'framer-motion' import { useEffect, useState } from 'react' import { useLocation, useNavigate } from 'react-router-dom' @@ -8,7 +9,6 @@ import SectionTitle from '@/components/common/SectionTitle' import SidebarComponent from '@/components/layout/SidebarComponent' import { API_BASE_URL } from '@/config' import { CATEGORIES } from '@/consts' -import { cn } from '@/lib/utils' import type { FC } from 'react' @@ -61,37 +61,52 @@ export default (({ posts }: Props) => { return ( - + + + {tagsVsbl && ( + + タグ +
      + {CATEGORIES.flatMap (cat => cat in tags ? ( + tags[cat].map (tag => ( +
    • + +
      • ))) : [])} +
    + 関聯 + {posts.length > 0 && ( + { + ev.preventDefault () + void ((async () => { + try + { + const { data } = await axios.get (`${ API_BASE_URL }/posts/random`, + { params: { tags: tagsQuery.split (' ').filter (e => e !== '').join (' '), + match: (anyFlg ? 'any' : 'all') } }) + navigate (`/posts/${ (data as Post).id }`) + } + catch + { + ; + } + }) ()) + }}> + ランダム + )} +     )} +     + - {subItem.name} - )))} - ))} - - - + + {menuOpen && ( + + + {menu.map ((item, i) => ( + + { + if (i !== openItemIdx) + { + ev.preventDefault () + setOpenItemIdx (i) + } + }}> + {item.name} + + {i === openItemIdx && ( + item.subMenu + .filter (subItem => subItem.visible ?? true) + .map ((subItem, j) => 'component' in subItem ? subItem.component : ( + + {subItem.name} + )))} + ))} + + + )} + ) }) satisfies FC From 43a55dbfcfa687cd0065cfe657059a3ff5a4d279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Sun, 14 Dec 2025 16:51:57 +0900 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20#176=20=E3=81=AE=E3=83=90=E3=82=B0?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=EF=BC=88#179=EF=BC=89=20(#180)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #179 完了 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/180 --- frontend/src/components/TagSidebar.tsx | 71 +++++++++++++++----------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/frontend/src/components/TagSidebar.tsx b/frontend/src/components/TagSidebar.tsx index 735490d..b8f5f07 100644 --- a/frontend/src/components/TagSidebar.tsx +++ b/frontend/src/components/TagSidebar.tsx @@ -58,15 +58,52 @@ export default (({ posts }: Props) => { setTags (tagsTmp) }, [posts]) + const TagBlock = ( + <> + タグ +
      + {CATEGORIES.flatMap (cat => cat in tags ? ( + tags[cat].map (tag => ( +
    • + +
      • ))) : [])} +
    + 関聯 + {posts.length > 0 && ( +     { + ev.preventDefault () + void ((async () => { + try + { + const { data } = await axios.get (`${ API_BASE_URL }/posts/random`, + { params: { tags: tagsQuery.split (' ').filter (e => e !== '').join (' '), + match: (anyFlg ? 'any' : 'all') } }) + navigate (`/posts/${ (data as Post).id }`) + } + catch + { + ; + } + }) ()) + }}> + ランダム + )} + ) + return ( +
    + {TagBlock} +
    + {tagsVsbl && ( { animate="visible" exit="hidden" transition={{ duration: .2, ease: 'easeOut' }}> - タグ -
      - {CATEGORIES.flatMap (cat => cat in tags ? ( - tags[cat].map (tag => ( -
    • - -
      • ))) : [])} -
    - 関聯 - {posts.length > 0 && ( - { - ev.preventDefault () - void ((async () => { - try - { - const { data } = await axios.get (`${ API_BASE_URL }/posts/random`, - { params: { tags: tagsQuery.split (' ').filter (e => e !== '').join (' '), - match: (anyFlg ? 'any' : 'all') } }) - navigate (`/posts/${ (data as Post).id }`) - } - catch - { - ; - } - }) ()) - }}> - ランダム - )} + {TagBlock}     )}     @@ -113,7 +122,7 @@ export default (({ posts }: Props) => { dark:text-gray-300 dark:hover:text-gray-100" onClick={ev => { ev.preventDefault () - setTagsVsbl (!(tagsVsbl)) + setTagsVsbl (v => !(v)) }}> {tagsVsbl ? '▲▲▲ タグ一覧を閉じる ▲▲▲' : '▼▼▼ タグ一覧を表示 ▼▼▼'} From 468ef44bf9023459d50f392a6d71b8f7a17b067b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Mon, 15 Dec 2025 01:13:52 +0900 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20#84=20=E3=81=AE=E3=83=90=E3=82=B0?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=EF=BC=88#181=EF=BC=89=20(#182)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #181 バグ #181 #181 #181 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/182 --- backend/lib/tasks/sync_nico.rake | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/backend/lib/tasks/sync_nico.rake b/backend/lib/tasks/sync_nico.rake index 00e309f..d20150c 100644 --- a/backend/lib/tasks/sync_nico.rake +++ b/backend/lib/tasks/sync_nico.rake @@ -27,7 +27,9 @@ namespace :nico do end end - PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each(&:discard!) + PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt| + pt.discard_by!(nil) + end end mysql_user = ENV['MYSQL_USER'] @@ -57,12 +59,14 @@ namespace :nico do end post.save! post.resized_thumbnail! + sync_post_tags!(post, [Tag.tagme.id]) end kept_tags = post.tags.reload kept_non_nico_ids = kept_tags.where.not(category: 'nico').pluck(:id).to_set desired_nico_ids = [] + desired_non_nico_ids = [] datum['tags'].each do |raw| name = "nico:#{ raw }" tag = Tag.find_or_initialize_by(name:) do |t| @@ -70,17 +74,19 @@ namespace :nico do end tag.save! if tag.new_record? desired_nico_ids << tag.id - desired_nico_ids.concat(tag.linked_tags.pluck(:id)) + unless tag.in?(kept_tags) + desired_non_nico_ids.concat(tag.linked_tags.pluck(:id)) + desired_nico_ids.concat(tag.linked_tags.pluck(:id)) + end end desired_nico_ids.uniq! - desired_extra_ids = [] - desired_extra_ids << Tag.tagme.id if kept_tags.size < 10 - desired_extra_ids << Tag.bot.id - desired_extra_ids.compact! - desired_extra_ids.uniq! - - desired_all_ids = kept_non_nico_ids.to_a + desired_nico_ids + desired_extra_ids + desired_all_ids = kept_non_nico_ids.to_a + desired_nico_ids + desired_non_nico_ids.concat(kept_non_nico_ids.to_a) + desired_non_nico_ids.uniq! + if kept_non_nico_ids.to_set != desired_non_nico_ids.to_set + desired_all_ids << Tag.bot.id + end desired_all_ids.uniq! sync_post_tags!(post, desired_all_ids) From 34c227f326287d5f8105499a9b75470e1d2e111b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Sat, 20 Dec 2025 02:36:32 +0900 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E3=82=A2=E3=83=8B=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3=EF=BC=88?= =?UTF-8?q?#183=EF=BC=89=20(#185)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #183 #183 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/185 --- frontend/src/components/TagDetailSidebar.tsx | 2 +- frontend/src/components/TopNav.tsx | 159 +++++++++++++++---- 2 files changed, 129 insertions(+), 32 deletions(-) diff --git a/frontend/src/components/TagDetailSidebar.tsx b/frontend/src/components/TagDetailSidebar.tsx index 0006738..5d02358 100644 --- a/frontend/src/components/TagDetailSidebar.tsx +++ b/frontend/src/components/TagDetailSidebar.tsx @@ -76,7 +76,7 @@ export default (({ post }: Props) => { return ( - + {CATEGORIES.map ((cat: Category) => cat in tags && ( {categoryNames[cat]} diff --git a/frontend/src/components/TopNav.tsx b/frontend/src/components/TopNav.tsx index 35a1a57..9762a3d 100644 --- a/frontend/src/components/TopNav.tsx +++ b/frontend/src/components/TopNav.tsx @@ -1,7 +1,7 @@ import axios from 'axios' import toCamel from 'camelcase-keys' import { AnimatePresence, motion } from 'framer-motion' -import { Fragment, useState, useEffect } from 'react' +import { Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react' import { Link, useLocation } from 'react-router-dom' import Separator from '@/components/MenuSeparator' @@ -20,6 +20,28 @@ type Props = { user: User | null } export default (({ user }: Props) => { const location = useLocation () + const dirRef = useRef<(-1) | 1> (1) + const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([]) + const navRef = useRef (null) + + const measure = () => { + const nav = navRef.current + const el = itemsRef.current[activeIdx] + if (!(nav) || !(el) || activeIdx < 0) + return + + const navRect = nav.getBoundingClientRect () + const elRect = el.getBoundingClientRect () + + setHl ({ left: elRect.left - navRect.left, + width: elRect.width, + visible: true }) + } + + const [hl, setHl] = useState<{ left: number; width: number; visible: boolean }> ({ + left: 0, + width: 0, + visible: false }) const [menuOpen, setMenuOpen] = useState (false) const [openItemIdx, setOpenItemIdx] = useState (-1) const [postCount, setPostCount] = useState (null) @@ -54,6 +76,32 @@ export default (({ user }: Props) => { { 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 (activeIdx) + + if (activeIdx !== prevActiveIdxRef.current) + { + dirRef.current = activeIdx > prevActiveIdxRef.current ? 1 : -1 + prevActiveIdxRef.current = activeIdx + } + + const dir = dirRef.current + + useLayoutEffect (() => { + if (activeIdx < 0) + return + + const raf = requestAnimationFrame (measure) + const onResize = () => requestAnimationFrame (measure) + + addEventListener ('resize', onResize) + return () => { + cancelAnimationFrame (raf) + removeEventListener ('resize', onResize) + } + }, [activeIdx]) + useEffect (() => { const unsubscribe = WikiIdBus.subscribe (setWikiId) return () => unsubscribe () @@ -99,16 +147,26 @@ export default (({ user }: Props) => { ぼざクリ タグ広場 - {menu.map ((item, i) => ( - - {item.name} - - ))} +
    +
    + + {menu.map ((item, i) => ( + { + itemsRef.current[i] = el + }} + className={cn ('relative z-10 flex h-full items-center px-5', + (i === openItemIdx) && 'font-bold')}> + {item.name} + ))} +
    @@ -125,16 +183,33 @@ export default (({ user }: Props) => { -
    - {menu.find (item => location.pathname.startsWith (item.base || item.to))?.subMenu - .filter (item => item.visible ?? true) - .map ((item, i) => 'component' in item ? item.component : ( - - {item.name} - ))} +
    + + ({ 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' }}> + {(menu[activeIdx]?.subMenu ?? []) + .filter (item => item.visible ?? true) + .map ((item, i) => ( + 'component' in item + ? {item.component} + : ( + + {item.name} + )))} + +
    @@ -167,16 +242,38 @@ export default (({ user }: Props) => { }}> {item.name} - {i === openItemIdx && ( - item.subMenu - .filter (subItem => subItem.visible ?? true) - .map ((subItem, j) => 'component' in subItem ? subItem.component : ( - - {subItem.name} - )))} + + + {i === openItemIdx && ( + + {item.subMenu + .filter (subItem => subItem.visible ?? true) + .map ((subItem, j) => ( + 'component' in subItem + ? ( + + {subItem.component} + ) + : ( + + {subItem.name} + )))} + )} + ))} From 0353961a721d39f5fd8b189d8d288013ebcfcb3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Tue, 23 Dec 2025 23:37:58 +0900 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20403=20=E8=A7=A3=E6=B6=88=EF=BC=88#1?= =?UTF-8?q?68=EF=BC=89=20(#187)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #168 #168 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/187 --- frontend/scripts/generate-sitemap.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/scripts/generate-sitemap.js b/frontend/scripts/generate-sitemap.js index f30786c..bf6c9fe 100644 --- a/frontend/scripts/generate-sitemap.js +++ b/frontend/scripts/generate-sitemap.js @@ -19,7 +19,6 @@ const fetchPosts = async tagName => (await axios.get (`${ API_BASE_URL }/posts`, { params: { ...(tagName && { tags: tagName, match: 'all', limit: '20' }) } })).data.posts -const fetchPostIds = async () => (await fetchPosts ()).map (post => post.id) const fetchTags = async () => (await axios.get (`${ API_BASE_URL }/tags`)).data const fetchTagNames = async () => (await fetchTags ()).map (tag => tag.name) @@ -33,7 +32,7 @@ const createPostListOutlet = async tagName => `
    広場
    - ${ (await fetchPosts (tagName)).map (post => ` + ${ (await fetchPosts (tagName)).slice (0, 20).map (post => ` ${ post.title } ` fetchpriority="high" decoding="async" class="object-none w-full h-full" - src="${ post.url }" /> + src="${ post.thumbnail }" /> `).join ('') }
    From cdf04f75145c362c39de5eec65856fb5ca3a48e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=BF=E3=81=A6=E3=82=8B=E3=81=9E?= Date: Thu, 25 Dec 2025 02:51:55 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20Wiki=20=E3=81=AE=20URL=20=E3=81=AB?= =?UTF-8?q?=E3=81=8A=E3=81=91=E3=82=8B=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB?= =?UTF-8?q?=E3=82=92=E5=AE=8C=E5=85=A8=E4=B8=80=E8=87=B4=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=EF=BC=88#100=EF=BC=89=20(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'main' into feature/100 #100 要らんとこ変へてたので直した #100 完了 Co-authored-by: miteruzo Reviewed-on: https://git.miteruzo.com/miteruzo/btrc-hub/pulls/153 --- frontend/src/pages/wiki/WikiDetailPage.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/wiki/WikiDetailPage.tsx b/frontend/src/pages/wiki/WikiDetailPage.tsx index 058a5fc..b5ebd79 100644 --- a/frontend/src/pages/wiki/WikiDetailPage.tsx +++ b/frontend/src/pages/wiki/WikiDetailPage.tsx @@ -36,9 +36,16 @@ export default () => { if (/^\d+$/.test (title)) { void (async () => { - const res = await axios.get (`${ API_BASE_URL }/wiki/${ title }`) - const data = res.data as WikiPage - navigate (`/wiki/${ data.title }`, { replace: true }) + try + { + const res = await axios.get (`${ API_BASE_URL }/wiki/${ title }`) + const data = res.data as WikiPage + navigate (`/wiki/${ encodeURIComponent(data.title) }`, { replace: true }) + } + catch + { + ; + } }) () return @@ -51,6 +58,8 @@ export default () => { `${ API_BASE_URL }/wiki/title/${ encodeURIComponent (title) }`, { params: version ? { version } : { } }) const data = toCamel (res.data as any, { deep: true }) as WikiPage + if (data.title !== title) + navigate (`/wiki/${ encodeURIComponent(data.title) }`, { replace: true }) setWikiPage (data) WikiIdBus.set (data.id) }