diff --git a/backend/app/models/nico_tag_relation.rb b/backend/app/models/nico_tag_relation.rb index ff4f3a6..d2c4a82 100644 --- a/backend/app/models/nico_tag_relation.rb +++ b/backend/app/models/nico_tag_relation.rb @@ -6,6 +6,7 @@ class NicoTagRelation < ApplicationRecord validates :tag_id, presence: true validate :nico_tag_must_be_nico + validate :tag_mustnt_be_nico private 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) }