🔀🚀 Merge pull request #7 from dodok8/dodok8/issue3

dodok8/issue3

.devcontainer/devcontainer.json

@@ -3,5 +3,14 @@
   "features": {
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/shyim/devcontainers-features/bun:0": {},
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint",
+        "oven.bun-vscode"
+      ]
+    }
   }
 }

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "oven.bun-vscode"
+  ]
+}

index.ts

@@ -1,5 +1,5 @@
 import { Client, Interaction } from 'discord.js'
-import commands from './src/commands'
+import commands from './src/aladin'
 
 const client = new Client({
   intents: [],

src/@types/aladin-request.d.ts

@@ -0,0 +1,47 @@
+type QueryType =
+  | {
+      name: '제목+저자'
+      value: 'Keyword'
+    }
+  | {
+      name: '제목'
+      value: 'Title'
+    }
+  | {
+      name: '저자'
+      value: 'Author'
+    }
+  | {
+      name: '출판사'
+      value: 'Publisher'
+    }
+
+type SearchTarget =
+  | {
+      name: '도서'
+      value: 'Book'
+    }
+  | {
+      name: '외국도서'
+      value: 'Foreign'
+    }
+  | {
+      name: '음반'
+      value: 'Music'
+    }
+  | {
+      name: 'dvd'
+      value: 'DVD'
+    }
+  | {
+      name: '중고'
+      value: 'Used'
+    }
+  | {
+      name: '전자책'
+      value: 'eBook'
+    }
+  | {
+      name: '통합검색'
+      value: 'All'
+    }

src/@types/aladin.d.ts → src/@types/aladin-response.d.ts

@@ -1,4 +1,4 @@
-type ItemSearchResult = {
+type ItemSearchResponse = {
   version: string
   logo: string
   title: string

src/commands/itemSearch.ts → src/aladin.ts

@@ -1,9 +1,10 @@
-import { ApplicationCommandOptionType, EmbedBuilder, time } from 'discord.js'
-import type { SlashCommand } from '../@types/discord'
+import { ApplicationCommandOptionType, EmbedBuilder } from 'discord.js'
+import type { SlashCommand } from './@types/discord'
 import ky from 'ky'
+import { generateUrlQueryForType } from './utils'
 
 //The option names should be all lowercased,
-export const itemSearch: SlashCommand = {
+const aladin: SlashCommand = {
   name: 'aladin',
   description: '상품 검색',
   options: [
@@ -19,11 +20,9 @@ export const itemSearch: SlashCommand = {
       description: '몇 건의 검색을 볼지 정합니다.',
       type: ApplicationCommandOptionType.Integer,
     },
-    // TODO: 이 부분 고치기, 응답의 link로 접근하면 글자가 깨져서 들어가는 증상이 있다.
     {
       name: '검색어-종류',
-      description:
-        '검색어 종류, 현재 전체 목록 보기는 기본값인 제목+저자만 지원합니다.',
+      description: '검색어 종류',
       type: ApplicationCommandOptionType.String,
       required: false,
       choices: [
@@ -83,35 +82,42 @@ export const itemSearch: SlashCommand = {
     },
   ],
   execute: async (_, interaction) => {
-    const count = interaction.options.get('개수')?.value || 5
-    const query = interaction.options.get('검색어')?.value
-    const queryType = interaction.options.get('검색어-종류')?.value || 'Keyword'
-    const searchTarget = interaction.options.get('검색-대상')?.value || 'All'
+    const count = (interaction.options.get('개수')?.value || 5) as number
+    const query = interaction.options.get('검색어')?.value as string
+    const queryType = (interaction.options.get('검색어-종류')?.value ||
+      'Keyword') as QueryType['value']
+    const searchTarget = (interaction.options.get('검색-대상')?.value ||
+      'All') as SearchTarget['value']
+
     const URL = `http://www.aladin.co.kr/ttb/api/ItemSearch.aspx?ttbkey=${
       process.env.ALADIN_TOKEN
     }&Query=${encodeURI(
       String(query)
     )}&QueryType=${queryType}&MaxResults=${count}&start=1&SearchTarget=${searchTarget}&output=js&Version=20131101`
 
     try {
-      const data = await ky.get(URL).json<ItemSearchResult>()
+      const data = await ky.get(URL).json<ItemSearchResponse>()
 
       const { item, totalResults } = data
       const bookInfos = item.map((i: any): [string, string] => [
         `${i.title} | ${i.author}`,
         i.link,
       ])
-
+      console.log(
+        `http://www.aladin.co.kr/search/wsearchresult.aspx?KeyWord=${encodeURI(
+          String(query)
+        )}&SearchTarget=${searchTarget}&${generateUrlQueryForType(queryType)}`
+      )
       const embed = new EmbedBuilder()
         .setAuthor({
           name: '알라딘 도서검색',
           iconURL: 'https://image.aladin.co.kr/img/m/2018/shopping_app1.png',
         })
         .setTitle(`검색결과 : ${query}`)
         .setURL(
-          `http://www.aladin.co.kr/search/wsearchresult.aspx?KeyWord=${encodeURI(
+          `http://www.aladin.co.kr/search/wsearchresult.aspx?SearchWord=${encodeURI(
             String(query)
-          )}&SearchTarget=${searchTarget}`
+          )}&SearchTarget=${searchTarget}&${generateUrlQueryForType(queryType)}`
         )
         .setDescription(`총 ${totalResults}건 검색`)
         .addFields(
@@ -128,7 +134,8 @@ export const itemSearch: SlashCommand = {
       await interaction.followUp({
         embeds: [embed],
       })
-    } catch {
+    } catch (err) {
+      console.error(err)
       const embed = new EmbedBuilder()
         .setAuthor({
           name: '알라딘 도서검색',
@@ -146,3 +153,7 @@ export const itemSearch: SlashCommand = {
 }
 
 // https://embed.dan.onl/
+
+const availableCommands = [aladin]
+
+export default availableCommands

src/utils.ts

@@ -0,0 +1,24 @@
+const queryParameters = [
+  'chkKeyTitle',
+  'chkKeyAuthor',
+  'chkKeyPublisher',
+  'chkKeyISBN',
+  'chkKeyTag',
+  // NOTE: 이 두 쿼리는 어디 다 쓰는 지 모르겠음.
+  'chkKeyToc',
+  'chkKeySubject',
+]
+
+const queryTypeSettings = {
+  Keyword: ['chkKeyTitle', 'chkKeyAuthor'],
+  Title: ['chkKeyTitle'],
+  Author: ['chkKeyAuthor'],
+  Publisher: ['chkKeyPublisher'],
+}
+
+export const generateUrlQueryForType = (queryType: QueryType['value']) => {
+  const activeParameters = queryTypeSettings[queryType] || []
+  return queryParameters
+    .map((param) => `${param}=${activeParameters.includes(param) ? 'on' : ''}`)
+    .join('&')
+}