Merge branch 'release/cake' into develop

This commit is contained in:
Siwoo Jeon 2024-09-30 22:26:44 +09:00
commit 9c1375ca7d
Signed by: migan
GPG key ID: 036E9A8C5E8E48DA
4 changed files with 25 additions and 8 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "muffinbot", "name": "muffinbot",
"version": "4.0.0-pudding.d240929a", "version": "4.0.0-pudding.d240930a",
"main": "dist/index.js", "main": "dist/index.js",
"private": true, "private": true,
"dependencies": { "dependencies": {
@ -15,8 +15,7 @@
"dokdo": "^1.0.1", "dokdo": "^1.0.1",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"mysql2": "^3.11.3", "mysql2": "^3.11.3",
"semver": "^7.6.3", "semver": "^7.6.3"
"undici": "^6.19.8"
}, },
"devDependencies": { "devDependencies": {
"@eslint/eslintrc": "^3.1.0", "@eslint/eslintrc": "^3.1.0",

View file

@ -40,7 +40,7 @@ class DeleteLearnCommand extends Command {
}, },
}) })
if (!deleteDatas) { if (deleteDatas.length === 0) {
return await msg.reply('해당하는 걸 찾ㅈ을 수 없어요.') return await msg.reply('해당하는 걸 찾ㅈ을 수 없어요.')
} }
@ -70,7 +70,14 @@ class DeleteLearnCommand extends Command {
type: ComponentType.StringSelect, type: ComponentType.StringSelect,
customId: `${CUSTOM_ID}@${msg.author.id}`, customId: `${CUSTOM_ID}@${msg.author.id}`,
placeholder: '지울 데이터를 선택해ㅈ주세요', placeholder: '지울 데이터를 선택해ㅈ주세요',
options, options: [
...options,
{
label: '❌ 취소',
description: '아무것도 삭제하지 않아요.',
value: `${CUSTOM_ID}-cancel`,
},
],
}, },
], ],
}, },

View file

@ -32,6 +32,18 @@ class DeleteLearnHandler extends InteractionHandler {
const db = this.container.database const db = this.container.database
const decimalRegexp = /^[0-9]/g const decimalRegexp = /^[0-9]/g
if (id === 'cancel')
return interaction.editReply({
embeds: [
{
title: '삭제',
description: '아무것도 삭제하지 않았어요.',
color: 0x00ff00,
},
],
components: [],
})
const itemId = interaction.component.options.map(item => const itemId = interaction.component.options.map(item =>
item.value.endsWith(`${id}`) ? item.label.match(decimalRegexp)![0] : null, item.value.endsWith(`${id}`) ? item.label.match(decimalRegexp)![0] : null,
) )
@ -46,7 +58,7 @@ class DeleteLearnHandler extends InteractionHandler {
embeds: [ embeds: [
{ {
title: '삭제', title: '삭제',
description: `${Number(itemId!)}번을 정상적으로 삭제하ㅇ였어요.`, description: `${Number(itemId[0]!)}번을 정상적으로 삭제하ㅇ였어요.`,
timestamp: new Date().toISOString(), timestamp: new Date().toISOString(),
color: this.container.embedColor, color: this.container.embedColor,
}, },

View file

@ -2927,7 +2927,6 @@ __metadata:
semver: "npm:^7.6.3" semver: "npm:^7.6.3"
tsup: "npm:^8.3.0" tsup: "npm:^8.3.0"
typescript: "npm:^5.6.2" typescript: "npm:^5.6.2"
undici: "npm:^6.19.8"
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@ -3909,7 +3908,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"undici@npm:6.19.8, undici@npm:^6.19.8": "undici@npm:6.19.8":
version: 6.19.8 version: 6.19.8
resolution: "undici@npm:6.19.8" resolution: "undici@npm:6.19.8"
checksum: 10c0/07fd8520bce7e34ea29c07ef0de27b734183042cdb4e2f1262cd1fb9b755a6b04ff2471040395dfb1770fb7786069a97c5178bcf706b80a34075994f46feb37c checksum: 10c0/07fd8520bce7e34ea29c07ef0de27b734183042cdb4e2f1262cd1fb9b755a6b04ff2471040395dfb1770fb7786069a97c5178bcf706b80a34075994f46feb37c