diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json index 9371a1e..a8a134a 100644 --- a/.yarn/sdks/eslint/package.json +++ b/.yarn/sdks/eslint/package.json @@ -1,6 +1,6 @@ { "name": "eslint", - "version": "8.44.0-sdk", + "version": "8.52.0-sdk", "main": "./lib/api.js", "type": "commonjs" } diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json index ac602d0..e936f36 100644 --- a/.yarn/sdks/prettier/package.json +++ b/.yarn/sdks/prettier/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "2.8.8-sdk", + "version": "3.0.3-sdk", "main": "./index.js", "type": "commonjs" } diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json index c965b44..deb3c54 100644 --- a/.yarn/sdks/typescript/package.json +++ b/.yarn/sdks/typescript/package.json @@ -1,6 +1,6 @@ { "name": "typescript", - "version": "5.1.6-sdk", + "version": "5.2.2-sdk", "main": "./lib/typescript.js", "type": "commonjs" } diff --git a/package.json b/package.json index 5f80780..8e4da7b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@commitlint/cli": "^18.0.0", "@commitlint/config-conventional": "^18.0.0", "@types/json-bigint": "^1.0.3", - "@types/node": "20.8.7", + "@types/node": "^20.8.7", "@types/ws": "^8.5.8", "@types/xml2js": "^0.4.13", "@typescript-eslint/eslint-plugin": "^6.8.0", diff --git a/src/command/messagecotextmenu/ForcePin.ts b/src/command/messagecotextmenu/ForcePin.ts index e0fd490..0260078 100644 --- a/src/command/messagecotextmenu/ForcePin.ts +++ b/src/command/messagecotextmenu/ForcePin.ts @@ -91,8 +91,6 @@ export default { userId: interaction.targetMessage.author.id, latestMessageId: message_.id, latestChannelId: message_.channelId, - avatarURL: messageUser.extDefaultAvatarURL({ extension: 'webp' }), - username: messageUser.displayName, }; await forcePin.set(interaction.targetMessage.channelId, data); }); @@ -116,8 +114,6 @@ export default { userId: interaction.targetMessage.author.id, latestMessageId: message_.id, latestChannelId: message_.channelId, - avatarURL: messageUser.extDefaultAvatarURL({ extension: 'webp' }), - username: messageUser.displayName, }; await forcePin.set(interaction.targetMessage.channelId, data); }); diff --git a/src/messages/ForcePin.ts b/src/messages/ForcePin.ts index 357e433..62f8f74 100644 --- a/src/messages/ForcePin.ts +++ b/src/messages/ForcePin.ts @@ -40,15 +40,13 @@ export default async function (message: Message) { userId: data.userId, latestMessageId: message_.id, latestChannelId: message_.channelId, - avatarURL: user_.extDefaultAvatarURL({ extension: 'webp' }), - username: user_.displayName, }; await botData.forcePin.set(data.latestChannelId, setData); }) : webhook .send({ - avatarURL: data.avatarURL, - username: data.username, + avatarURL: user_.extDefaultAvatarURL({ extension: 'webp' }), + username: user_.displayName, embeds: data.embeds, content: data.content, files: data.attachments, @@ -61,8 +59,6 @@ export default async function (message: Message) { userId: data.userId, latestMessageId: message_.id, latestChannelId: message_.channelId, - avatarURL: data.avatarURL, - username: data.username, }; await botData.forcePin.set(data.latestChannelId, setData); }); diff --git a/src/utils/ForcePinDataType.ts b/src/utils/ForcePinDataType.ts index a74ac99..ed3130c 100644 --- a/src/utils/ForcePinDataType.ts +++ b/src/utils/ForcePinDataType.ts @@ -7,6 +7,4 @@ export interface ForcePinDataType { content: string; latestMessageId: string; latestChannelId: string; - avatarURL: string; - username: string; } diff --git a/src/utils/interactionExtrans.ts b/src/utils/interactionExtrans.ts index 47c3a63..8a6d597 100644 --- a/src/utils/interactionExtrans.ts +++ b/src/utils/interactionExtrans.ts @@ -9,6 +9,7 @@ import { ButtonInteraction, RoleSelectMenuInteraction, ModalSubmitInteraction, + Message, } from 'discord.js'; declare module 'discord.js' { interface ChatInputCommandInteraction { diff --git a/src/utils/permission.ts b/src/utils/permission.ts index a2ffeaf..e388afb 100644 --- a/src/utils/permission.ts +++ b/src/utils/permission.ts @@ -95,5 +95,5 @@ export const translatePermission = (permissionFlags: PermissionFlags[] | Permiss '4398046511104': 'サウンドボードを使用', '35184372088832': '外部のサウンドの使用', '70368744177664': 'ボイスメッセージを送信', - }[flag.toString()]), + })[flag.toString()], ); diff --git a/yarn.lock b/yarn.lock index 6566f27..13dde6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -728,7 +728,14 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:20.8.7": +"@types/node@npm:^18.11.9, @types/node@npm:^18.17.15": + version: 18.18.6 + resolution: "@types/node@npm:18.18.6" + checksum: a847639b8455fd3dfa6dbc2917274c82c9db789f1d41aaf69f94ac6c9e54c3c1dd29be6e1e1ccd7c17e54db3d78d7011bc4e70544c6447ceca253dccc0a187e1 + languageName: node + linkType: hard + +"@types/node@npm:^20.8.7": version: 20.8.7 resolution: "@types/node@npm:20.8.7" dependencies: @@ -737,13 +744,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.11.9, @types/node@npm:^18.17.15": - version: 18.18.6 - resolution: "@types/node@npm:18.18.6" - checksum: a847639b8455fd3dfa6dbc2917274c82c9db789f1d41aaf69f94ac6c9e54c3c1dd29be6e1e1ccd7c17e54db3d78d7011bc4e70544c6447ceca253dccc0a187e1 - languageName: node - linkType: hard - "@types/normalize-package-data@npm:^2.4.0": version: 2.4.1 resolution: "@types/normalize-package-data@npm:2.4.1" @@ -1209,7 +1209,7 @@ __metadata: "@commitlint/config-conventional": ^18.0.0 "@napi-rs/canvas": ^0.1.44 "@types/json-bigint": ^1.0.3 - "@types/node": 20.8.7 + "@types/node": ^20.8.7 "@types/ws": ^8.5.8 "@types/xml2js": ^0.4.13 "@typescript-eslint/eslint-plugin": ^6.8.0