* now allow returning query type postID when there's multiple param query by post id to match with 66e2ec1

* now will return query type `empty` only when all params is set to default value
@ `currentQueryType().clearedParams()`

* now allow querying with type `search` with no unique param `fid` or type `empty` @ `checkParams()`
@ `getQueryFormDeps()`
@ `utils/post/queryForm/index.ts`

* replace `ApiPosts.response.forum` from object to array `forums` to match with 5bf8736
* remove `ApiPosts.response.type` to match with 83e9953
@ `api/types.ts`

* now will only add forum name or thread title when they're not nil in `firstThread()` @ `utils/post/seo/index.ts`
* replace prop `firstPostPageForum` with `firstPostPageForumName` @ `<OgImagePost>` & `utils/post/seo/index.ts`
@ fe

Author: n0099

fe/src/api/types.ts

@@ -30,8 +30,7 @@ export type ApiPosts = Api<CursorPagination & {
         matchQueryPostCount: Record<PostType, UInt>,
         notMatchQueryParentPostCount: Record<Exclude<PostType, 'subRely'>, UInt>
     },
-    type: 'index' | 'search',
-    forum: Pick<ArrayElement<ApiForums['response']>, 'fid' | 'name'>,
+    forums: Record<Fid, string>,
     threads: Array<Thread & {
         replies: Array<Reply & {
             subReplies: SubReply[]

fe/src/components/OgImage/Post.vue

@@ -2,7 +2,7 @@
 <div class="flex flex-row justify-between size-screen">
     <div class="flex-1 flex-col basis-1/2 m-6">
         <p>{{ useSiteConfig().name }} {{ routePath }}</p>
-        <h2>{{ firstPostPageForum?.name }}吧</h2>
+        <h2 v-if="firstPostPageForumName !== undefined">{{ firstPostPageForumName }}吧</h2>
         <template v-if="currentQueryType !== 'postID'">
             <p class="m-0">右侧为查询结果中第一张图片（不一定来自第一条帖子）</p>
             <p class="m-0">下方为查询结果中第一条主题帖/回复帖/楼中楼</p>
@@ -30,7 +30,7 @@ import type { UnwrapRef } from 'vue';
 const { firstThread, firstPostPage } = defineProps<{
     routePath: string,
     firstPostPage?: ApiPosts['response'],
-    firstPostPageForum?: ApiPosts['response']['forum'],
+    firstPostPageForumName?: string,
     firstThread?: ArrayElement<ApiPosts['response']['threads']>,
     currentQueryType: UnwrapRef<QueryFormDeps['currentQueryType']>
 }>();

fe/src/utils/post/queryForm/index.ts

@@ -30,23 +30,17 @@ export const getQueryFormDeps = () => {
 
     const currentQueryType = computed(() => {
         const clearedParams = clearedParamsDefaultValue(); // not including unique params
-        if (_.isEmpty(clearedParams)) { // is there no other params
-            // ignore the post type param since index query (postID or fid) doesn't restrict them
-            const clearedUniqueParams = _.omit(clearedUniqueParamsDefaultValue(), 'postTypes');
-            if (_.isEmpty(clearedUniqueParams)) {
-                return 'empty'; // only fill unique param postTypes and/or orderBy doesn't query anything
-            } else if (clearedUniqueParams.fid !== undefined) {
-                // note when query with postTypes and/or orderBy param, the route will go params instead of fid
+        if (_.isEmpty(clearedParams)) {
+            const clearedUniqueParams = clearedUniqueParamsDefaultValue();
+            if (_.isEmpty(clearedUniqueParams))
+                return 'empty';
+            if (clearedUniqueParams.fid !== undefined)
                 return 'fid';
-            }
         }
 
         // is there no other params except post id params
         if (_.isEmpty(_.reject(clearedParams, isPostIDParam))
 
-            // is there only one post id param
-            && _.filter(clearedParams, isPostIDParam).length === 1
-
             // is all post ID params doesn't own any sub param
             && _.chain(clearedParams).map('subParam').filter().isEmpty().value())
             return 'postID';
@@ -83,25 +77,10 @@ export const getQueryFormDeps = () => {
         // check query type
         isFidInvalid.value = false;
         const clearedUniqueParams = clearedUniqueParamsDefaultValue();
-        switch (currentQueryType.value) {
-            case 'empty':
-                notyShow('warning', '请选择贴吧或/并输入查询参数<br>勿只选择帖子类型参数');
-
-                return false; // exit early
-            case 'postID':
-                if (clearedUniqueParams.fid !== undefined) {
-                    uniqueParams.value.fid.value = 0; // reset fid to default,
-                    notyShow('info', '已移除按帖索引查询所不需要的查询贴吧参数');
-                    await router.push(generateRoute()); // update route to match new params without fid
-                }
-                break;
-            case 'search':
-                if (clearedUniqueParams.fid === undefined) {
-                    isFidInvalid.value = true; // search query require fid param
-                    notyShow('warning', '搜索查询必须指定查询贴吧');
-                }
-                break;
-            case 'fid':
+        if (currentQueryType.value === 'postID' && clearedUniqueParams.fid !== undefined) {
+            uniqueParams.value.fid.value = 0; // reset fid to default,
+            notyShow('info', '已移除按帖索引查询所不需要的查询贴吧参数');
+            await router.push(generateRoute()); // update route to match new params without fid
         }
 
         const isRequiredPostTypes = (current: PostType[], required?: ObjValues<RequiredPostTypes>): required is undefined => {
@@ -111,10 +90,9 @@ export const getQueryFormDeps = () => {
         const requiredPostTypesToString = (required: NonNullable<ObjValues<RequiredPostTypes>>) => required.join(' | ');
         const postTypes = _.sortBy(uniqueParams.value.postTypes.value);
 
-        // check params required post types, index query doesn't restrict on post types
         invalidParamsIndex.value = []; // reset to prevent duplicate indexes
+        // check params required post types, query by post id or fid doesn't restrict on post types
         if (currentQueryType.value !== 'postID' && currentQueryType.value !== 'fid') {
-            /** we don't {@link Array.filter()} here for post types validate */
             params.value.map(clearParamDefaultValue).forEach((param, paramIndex) => {
                 if (param?.name === undefined || param.value === undefined) {
                     invalidParamsIndex.value.push(paramIndex);

fe/src/utils/post/seo/index.ts

@@ -6,24 +6,30 @@ export const usePostsSEO = (
 ) => {
     const route = useRoute();
     const firstPostPage = computed(() => data.value?.pages[0]);
-    const firstPostPageForum = computed(() => firstPostPage.value?.forum);
+    const firstPostPageForumName = computed((): string | null => {
+        if (firstPostPage.value?.forums === undefined)
+            return null;
+
+        const forumNames = Object.values(firstPostPage.value.forums);
+        if (forumNames.length === 1)
+            return forumNames[0];
+
+        return null;
+    });
     const firstThread = computed(() => firstPostPage.value?.threads[0]);
     useHead({
         title: computed(() => {
-            if (firstPostPage.value === undefined)
-                return '帖子查询';
-            switch (currentQueryType.value) {
-                case 'fid':
-                case 'search':
-                    return `${firstPostPageForum.value?.name}吧 - 帖子查询`;
-                case 'postID':
-                    return `${firstThread.value?.title} - ${firstPostPageForum.value?.name}吧 - 帖子查询`;
-                case 'empty':
+            const titleParts = ['帖子查询'];
+            if (currentQueryType.value !== 'empty') {
+                if (['search', 'fid'].includes(currentQueryType.value) && firstPostPageForumName.value !== null)
+                    titleParts.unshift(`${firstPostPageForumName.value}吧`);
+                if (currentQueryType.value === 'postID' && firstThread.value?.title !== undefined)
+                    titleParts.unshift(firstThread.value.title);
             }
 
-            return '帖子查询';
+            return titleParts.join(' - ');
         })
     });
-    defineOgImageComponent('Post', { routePath: route.path, firstPostPage, firstPostPageForum, firstThread, currentQueryType });
+    defineOgImageComponent('Post', { routePath: route.path, firstPostPage, firstPostPageForumName, firstThread, currentQueryType });
     usePostsSchemaOrg(data);
 };