diff --git "a/taehui-fe/src/app/\133language\135/want/components/WantInput.tsx" "b/taehui-fe/src/app/\133language\135/want/components/WantInput.tsx" index 5ed31b7..dd82816 100644 --- "a/taehui-fe/src/app/\133language\135/want/components/WantInput.tsx" +++ "b/taehui-fe/src/app/\133language\135/want/components/WantInput.tsx" @@ -26,7 +26,7 @@ const onWant = () => { if (textInput) { - to(`/want/${wantVariety}/${encodeURIComponent(textInput)}?page=1`); + to(`/want/${wantVariety}/${encodeURIComponent(textInput)}`); } }; diff --git a/taehui-fe/src/app/www/logic/want.ts b/taehui-fe/src/app/www/logic/want.ts index e14ed0e..24f4d93 100644 --- a/taehui-fe/src/app/www/logic/want.ts +++ b/taehui-fe/src/app/www/logic/want.ts @@ -8,7 +8,7 @@ page: number, viewUnit: number, ) => { - return dbWantEssay(wantInput, page, viewUnit); + return await dbWantEssay(wantInput, page, viewUnit); }; export const wantComment = async ( diff --git a/taehui-fe/src/app/www/system/DB.ts b/taehui-fe/src/app/www/system/DB.ts index 8cc0b11..ebb9311 100644 --- a/taehui-fe/src/app/www/system/DB.ts +++ b/taehui-fe/src/app/www/system/DB.ts @@ -781,38 +781,34 @@ page: number, viewUnit: number, ) { - return getDB(async (db) => { - return Promise.all( - ( - await db.query< - { - Forum_ID: string; - Essay_ID: number; - Avatar_ID: string; - Avatar_Name: string; - Date: string; - Text: string; - }[] - >( - `SELECT Forum_ID, tn_comment.Essay_ID, tn_comment.Avatar_ID, Avatar_Name, tn_comment.Date, tn_comment.Text - FROM tn_essay, tn_comment, tn_avatar - WHERE tn_essay.Essay_ID = tn_comment.Essay_ID AND tn_comment.Avatar_ID = tn_avatar.Avatar_ID AND MATCH(tn_comment.Text) AGAINST(? IN BOOLEAN MODE) - ORDER BY tn_comment.Date DESC - LIMIT ?, ?`, - [wantInput, (page - 1) * viewUnit, viewUnit], - ) - ).map(async (data) => { - return { - forumID: data["Forum_ID"], - essayID: Number(data["Essay_ID"]), - avatarID: data["Avatar_ID"], - avatarName: data["Avatar_Name"], - date: data["Date"], - text: data["Text"], - }; - }), - ); - }); + return getDB(async (db) => + ( + await db.query< + { + Forum_ID: string; + Essay_ID: number; + Avatar_ID: string; + Avatar_Name: string; + Date: string; + Text: string; + }[] + >( + `SELECT Forum_ID, tn_comment.Essay_ID, tn_comment.Avatar_ID, Avatar_Name, tn_comment.Date, tn_comment.Text + FROM tn_essay, tn_comment, tn_avatar + WHERE tn_essay.Essay_ID = tn_comment.Essay_ID AND tn_comment.Avatar_ID = tn_avatar.Avatar_ID AND MATCH(tn_comment.Text) AGAINST(? IN BOOLEAN MODE) + ORDER BY tn_comment.Date DESC + LIMIT ?, ?`, + [wantInput, (page - 1) * viewUnit, viewUnit], + ) + ).map((data) => ({ + forumID: data["Forum_ID"], + essayID: Number(data["Essay_ID"]), + avatarID: data["Avatar_ID"], + avatarName: data["Avatar_Name"], + date: data["Date"], + text: data["Text"], + })), + ); } export async function postEssayHit( diff --git "a/taehui-fe/src/app/www/want/\133wantVariety\135/\133textInput\135/route.ts" "b/taehui-fe/src/app/www/want/\133wantVariety\135/\133textInput\135/route.ts" index 47100e4..9f149fb 100644 --- "a/taehui-fe/src/app/www/want/\133wantVariety\135/\133textInput\135/route.ts" +++ "b/taehui-fe/src/app/www/want/\133wantVariety\135/\133textInput\135/route.ts" @@ -1,21 +1,18 @@ -import logIP from "@/app/www/media/logIP"; import { wantComment, wantEssay } from "@/app/www/logic/want"; +import logIP from "@/app/www/media/logIP"; export const GET = logIP( async ( { nextUrl: { searchParams } }, { params: { wantVariety, textInput } }, ) => { - const page = searchParams.get("page"); - if (!page) { - return new Response(undefined, { status: 400 }); - } + const page = Number(searchParams.get("page") ?? "1"); switch (wantVariety) { case "essay": - return Response.json(await wantEssay(textInput, Number(page), 10)); + return Response.json(await wantEssay(textInput, page, 10)); case "comment": - return Response.json(await wantComment(textInput, Number(page), 10)); + return Response.json(await wantComment(textInput, page, 10)); default: return new Response(undefined, { status: 400 }); }