#428

frontend/src/lib/prefetchers.ts

@@ -10,13 +10,14 @@ import { getHelpArticle,
 import { localeFromPath, localeLanguage, unlocalisedPath } from '@/lib/locales'
 import { fetchPost, fetchPosts, fetchPostChanges } from '@/lib/posts'
 import { helpKeys, postsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
-import { fetchNicoTags, fetchTagByName, fetchTag, fetchTagChanges, fetchTags } from '@/lib/tags'
+import { fetchNicoTags, fetchTag, fetchTagChanges, fetchTags } from '@/lib/tags'
 import { fetchWikiAutolinkCandidates,
 	 fetchWikiPageByReference,
+	 fetchWikiTag,
 	 fetchWikiPages } from '@/lib/wiki'
 
 import type { LocaleCode } from '@/lib/locales'
-import type { Category, FetchPostsOrder, FetchTagsOrder } from '@/types'
+import type { Category, FetchPostsOrder, FetchTagsOrder, WikiTagReference } from '@/types'
 
 type Prefetcher = (qc: QueryClient, url: URL, locale: LocaleCode) => Promise<void>
 
@@ -127,16 +128,18 @@ const prefetchWikiPageShow: Prefetcher = async (qc, url, locale) => {
   }
 
   const effectiveTitle = wikiPage?.title ?? title
+  const tagReference: WikiTagReference = (wikiPage != null || !/^\d+$/.test (title))
+      ? { name: effectiveTitle } : { wikiId: title }
 
-  await qc.prefetchQuery ({
-      queryKey: tagsKeys.show (effectiveTitle, locale),
-      queryFn: () => fetchTagByName (effectiveTitle, locale) })
+  const tag = await qc.fetchQuery ({
+      queryKey: wikiKeys.tag (tagReference, locale),
+      queryFn: () => fetchWikiTag (tagReference, locale) })
 
   if (version)
     return
 
   const p = {
-      tags: effectiveTitle,
+      tags: wikiPage?.title ?? tag?.name ?? title,
       match: 'all',
       page: 1,
       limit: 8,
@@ -172,6 +175,8 @@ const prefetchPostsIndex: Prefetcher = async (qc, url, locale) => {
 
   const keys = {
       tags, match: m, page, limit, url: qURL, title,
+      ...(url.searchParams.get ('tag_refs') && {
+	tagReferences: url.searchParams.get ('tag_refs')! }),
       originalCreatedFrom, originalCreatedTo, createdFrom, createdTo,
       updatedFrom, updatedTo, order }