From 86dab688e6d56f72b65848028ebb31b90ed8acc0 Mon Sep 17 00:00:00 2001 From: Jeroen Claassens Date: Mon, 9 Sep 2024 11:05:19 +0200 Subject: [PATCH] fix: update for latest discord.js (#799) * fix: update for latest discord.js * chore: and a commit that i don't know the reason of... --- package.json | 4 +- packages/discord-utilities/package.json | 2 +- .../lib/PaginatedMessages/PaginatedMessage.ts | 4 +- .../src/lib/type-guards.ts | 13 +- yarn.lock | 141 +++++++++--------- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 05e5bc9f48..d601be8f4e 100644 --- a/package.json +++ b/package.json @@ -35,8 +35,8 @@ "@vitest/coverage-v8": "^2.0.5", "concurrently": "^8.2.2", "cz-conventional-changelog": "^3.3.0", - "discord-api-types": "^0.37.98", - "discord.js": "^14.15.3", + "discord-api-types": "0.37.97", + "discord.js": "^14.16.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", diff --git a/packages/discord-utilities/package.json b/packages/discord-utilities/package.json index 16f7d9e305..00eb47c880 100644 --- a/packages/discord-utilities/package.json +++ b/packages/discord-utilities/package.json @@ -62,7 +62,7 @@ "access": "public" }, "dependencies": { - "discord-api-types": "^0.37.98" + "discord-api-types": "0.37.97" }, "devDependencies": { "@favware/cliff-jumper": "^4.1.0", diff --git a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts index 34684b8e3e..010a657da3 100644 --- a/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts +++ b/packages/discord.js-utilities/src/lib/PaginatedMessages/PaginatedMessage.ts @@ -27,7 +27,7 @@ import { type User } from 'discord.js'; import { MessageBuilder } from '../builders/MessageBuilder'; -import { isAnyInteraction, isGuildBasedChannel, isMessageInstance, isStageChannel } from '../type-guards'; +import { isAnyInteraction, isGuildBasedChannel, isMessageInstance, isTextBasedChannel } from '../type-guards'; import type { AnyInteractableInteraction } from '../utility-types'; import type { EmbedResolvable, @@ -1451,7 +1451,7 @@ export class PaginatedMessage { ephemeral: false }); } - } else if (!isStageChannel(messageOrInteraction.channel)) { + } else if (isTextBasedChannel(messageOrInteraction.channel)) { this.response = await messageOrInteraction.channel.send({ ...page, content: page.content ?? undefined }); } } diff --git a/packages/discord.js-utilities/src/lib/type-guards.ts b/packages/discord.js-utilities/src/lib/type-guards.ts index c78c05df75..4d44cb128c 100644 --- a/packages/discord.js-utilities/src/lib/type-guards.ts +++ b/packages/discord.js-utilities/src/lib/type-guards.ts @@ -155,11 +155,18 @@ export function isPrivateThreadChannel(channel: ChannelTypes | Nullish): channel * Checks whether a given channel is a {@link TextBasedChannelTypes}. This means it has a `send` method. * @param channel The channel to check. */ -export function isTextBasedChannel(channel: ChannelTypes | Nullish): channel is TextBasedChannelTypes { - if (isNullish(channel) || isStageChannel(channel)) return false; +export function isTextBasedChannel(channel: ChannelTypes | Nullish): channel is Exclude { + if ( + isNullish(channel) || // + channel.partial || + isGroupChannel(channel as Channel | PartialDMChannel | Nullish) || + isStageChannel(channel) + ) { + return false; + } // eslint-disable-next-line @typescript-eslint/unbound-method - return !isNullish((channel as Exclude).send); + return !isNullish((channel as Exclude).send); } /** diff --git a/yarn.lock b/yarn.lock index a962e08747..ebecf8861c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -325,18 +325,18 @@ __metadata: languageName: node linkType: hard -"@discordjs/builders@npm:^1.8.1, @discordjs/builders@npm:^1.8.2": - version: 1.8.2 - resolution: "@discordjs/builders@npm:1.8.2" +"@discordjs/builders@npm:^1.8.1, @discordjs/builders@npm:^1.9.0": + version: 1.9.0 + resolution: "@discordjs/builders@npm:1.9.0" dependencies: - "@discordjs/formatters": "npm:^0.4.0" - "@discordjs/util": "npm:^1.1.0" - "@sapphire/shapeshift": "npm:^3.9.7" - discord-api-types: "npm:0.37.83" + "@discordjs/formatters": "npm:^0.5.0" + "@discordjs/util": "npm:^1.1.1" + "@sapphire/shapeshift": "npm:^4.0.0" + discord-api-types: "npm:0.37.97" fast-deep-equal: "npm:^3.1.3" ts-mixer: "npm:^6.0.4" - tslib: "npm:^2.6.2" - checksum: 10/64de3c72fdde202cc168ae5e42c05df44d3a4323cc1706fa667077b5bef1d60cf10d8e871bd4c758140432252f3c9c2747370f56fa0ff08c55669cb0a1e516d7 + tslib: "npm:^2.6.3" + checksum: 10/8d45f4919355237d8e442df7a98cec49fcd9dcdcb193cdbb88dbc8775d5cb25f6451317a40542921ab54649a9e9fc801e781617f290634db78ae3cd91454ccd3 languageName: node linkType: hard @@ -347,47 +347,47 @@ __metadata: languageName: node linkType: hard -"@discordjs/collection@npm:^2.1.0": - version: 2.1.0 - resolution: "@discordjs/collection@npm:2.1.0" - checksum: 10/386b508a0ed55614a8c32990a16eaaae4c9289172ce06fc7489b91932c593f7485fb62afd13cf71ad762ba927e73233ed63a8d6c8884de949cf1dfaa8ca391e8 +"@discordjs/collection@npm:^2.1.0, @discordjs/collection@npm:^2.1.1": + version: 2.1.1 + resolution: "@discordjs/collection@npm:2.1.1" + checksum: 10/2bf815120929e20bdcc94a7d0a9c0e567ef859b8cc502f5ecddaeae31ba3457711df708ab200ac6e86ffccab31f796192860f8ad609a9ddc2cdd7ffe5825a266 languageName: node linkType: hard -"@discordjs/formatters@npm:^0.4.0": - version: 0.4.0 - resolution: "@discordjs/formatters@npm:0.4.0" +"@discordjs/formatters@npm:^0.5.0": + version: 0.5.0 + resolution: "@discordjs/formatters@npm:0.5.0" dependencies: - discord-api-types: "npm:0.37.83" - checksum: 10/dbc75cf1048c928ddefb3d3f6268f8c153fce3030ef08afad06b7e2b1cd407451069eef1bcd903fc654d5e02fd1bf26372e12da41496182eb8fbee3dab87a83c + discord-api-types: "npm:0.37.97" + checksum: 10/71643849aef40cdbee997739cad95fcd2e803800fd8db9c8decffd9bbfc37467b0ca1dd8dd827d4bd34651c2b0944e93aea0879f9db6b7f03bdc24fbc07928bf languageName: node linkType: hard -"@discordjs/rest@npm:^2.3.0": - version: 2.3.0 - resolution: "@discordjs/rest@npm:2.3.0" +"@discordjs/rest@npm:^2.3.0, @discordjs/rest@npm:^2.4.0": + version: 2.4.0 + resolution: "@discordjs/rest@npm:2.4.0" dependencies: - "@discordjs/collection": "npm:^2.1.0" - "@discordjs/util": "npm:^1.1.0" - "@sapphire/async-queue": "npm:^1.5.2" + "@discordjs/collection": "npm:^2.1.1" + "@discordjs/util": "npm:^1.1.1" + "@sapphire/async-queue": "npm:^1.5.3" "@sapphire/snowflake": "npm:^3.5.3" - "@vladfrangu/async_event_emitter": "npm:^2.2.4" - discord-api-types: "npm:0.37.83" + "@vladfrangu/async_event_emitter": "npm:^2.4.6" + discord-api-types: "npm:0.37.97" magic-bytes.js: "npm:^1.10.0" - tslib: "npm:^2.6.2" - undici: "npm:6.13.0" - checksum: 10/55932ed31248f3b02e819fb2e197eb223862d29894f8b0271d8451c5d8226ae9f398d65234f299bdd5e8597ca8e287ad82867d9b85d54070b6ff172ad3e22ee9 + tslib: "npm:^2.6.3" + undici: "npm:6.19.8" + checksum: 10/aca81c02f24b953400425d0ba96b96bf1a7b9a42aa9ccff021ea795cd9bed3fa36586a921720569a88cceb659507a76084b72c28f08b931121ea0e4b292a1431 languageName: node linkType: hard -"@discordjs/util@npm:^1.1.0": - version: 1.1.0 - resolution: "@discordjs/util@npm:1.1.0" - checksum: 10/ce76daa238a4675e3fa081579645debb19df1028ed7c0a518ad81837ae5b17ee8eea8da22bb8d3671b5e5384f315a2972cc0f64d829531cc54fe2afecc0acb79 +"@discordjs/util@npm:^1.1.0, @discordjs/util@npm:^1.1.1": + version: 1.1.1 + resolution: "@discordjs/util@npm:1.1.1" + checksum: 10/3c8ae0c47fcf124e13bfef6232cf4564c35da9ac6b95b63888458c6662742e387324cdafa6207d625415553a5d05fc854f106c726a00c8e81c3414fd5e7eaf2c languageName: node linkType: hard -"@discordjs/ws@npm:^1.1.1": +"@discordjs/ws@npm:1.1.1": version: 1.1.1 resolution: "@discordjs/ws@npm:1.1.1" dependencies: @@ -1286,7 +1286,7 @@ __metadata: languageName: node linkType: hard -"@sapphire/async-queue@npm:^1.5.2, @sapphire/async-queue@workspace:packages/async-queue": +"@sapphire/async-queue@npm:^1.5.2, @sapphire/async-queue@npm:^1.5.3, @sapphire/async-queue@workspace:packages/async-queue": version: 0.0.0-use.local resolution: "@sapphire/async-queue@workspace:packages/async-queue" dependencies: @@ -1359,7 +1359,7 @@ __metadata: dependencies: "@favware/cliff-jumper": "npm:^4.1.0" "@vitest/coverage-v8": "npm:^2.0.5" - discord-api-types: "npm:^0.37.98" + discord-api-types: "npm:0.37.97" tsup: "npm:^8.2.4" tsx: "npm:^4.19.0" typedoc: "npm:^0.25.13" @@ -1614,13 +1614,13 @@ __metadata: languageName: unknown linkType: soft -"@sapphire/shapeshift@npm:^3.9.7": - version: 3.9.7 - resolution: "@sapphire/shapeshift@npm:3.9.7" +"@sapphire/shapeshift@npm:^4.0.0": + version: 4.0.0 + resolution: "@sapphire/shapeshift@npm:4.0.0" dependencies: fast-deep-equal: "npm:^3.1.3" lodash: "npm:^4.17.21" - checksum: 10/f90f8e25920fe953a5231aa65f24829e1f2ecb26dcac7a09ff1a1f3cb988f174e27b3ac82fc4f6368891edff8ad6f90ee78cf5c0cab3038fd2714d02eba4eb0c + checksum: 10/71437388066ca19a521f94f3066633010a5b3e24d9da1c07664389b9b02635af502b81236af92f24bb4c0f312a93b0f4ac544391afd464c2e98e6f93e2a4ded0 languageName: node linkType: hard @@ -2097,10 +2097,10 @@ __metadata: languageName: node linkType: hard -"@vladfrangu/async_event_emitter@npm:^2.2.4": - version: 2.2.4 - resolution: "@vladfrangu/async_event_emitter@npm:2.2.4" - checksum: 10/06de49380dc47fe712768b0e49286e54a114de962da36ef021d4b03fcff7ec8338b46179d8b3eba4c0e02b2926bbf1e6ea0f9c6c08f6f081361947a7f6719ce9 +"@vladfrangu/async_event_emitter@npm:^2.2.4, @vladfrangu/async_event_emitter@npm:^2.4.6": + version: 2.4.6 + resolution: "@vladfrangu/async_event_emitter@npm:2.4.6" + checksum: 10/6a329441bbd36bb8bdc8c49f18328abf724834597c8cab56b5741f18fa167a010bb841bc9ec3638b6b73c6692b85d0de724612b0a416b523650574576fd1a197 languageName: node linkType: hard @@ -3059,30 +3059,30 @@ __metadata: languageName: node linkType: hard -"discord-api-types@npm:^0.37.98": - version: 0.37.98 - resolution: "discord-api-types@npm:0.37.98" - checksum: 10/972bdcc6d15e60ea12d35b6da784dd434254d58b036d4218ccd6fcde5be78c63586c1c85e26bcedaacd97ece057efc6130fdef0d3d8279e3d6bc67e66a7b61bd +"discord-api-types@npm:0.37.97": + version: 0.37.97 + resolution: "discord-api-types@npm:0.37.97" + checksum: 10/94eea4b95ebb7ab89cce325c5c5654ce7fd3f1e17efa997fd375b7fe81cd5e872c097cf98cfc9d4d7ff233c924f501d812516a048913023bde02f3bbba21849b languageName: node linkType: hard -"discord.js@npm:^14.15.3": - version: 14.15.3 - resolution: "discord.js@npm:14.15.3" +"discord.js@npm:^14.16.1": + version: 14.16.1 + resolution: "discord.js@npm:14.16.1" dependencies: - "@discordjs/builders": "npm:^1.8.2" + "@discordjs/builders": "npm:^1.9.0" "@discordjs/collection": "npm:1.5.3" - "@discordjs/formatters": "npm:^0.4.0" - "@discordjs/rest": "npm:^2.3.0" - "@discordjs/util": "npm:^1.1.0" - "@discordjs/ws": "npm:^1.1.1" + "@discordjs/formatters": "npm:^0.5.0" + "@discordjs/rest": "npm:^2.4.0" + "@discordjs/util": "npm:^1.1.1" + "@discordjs/ws": "npm:1.1.1" "@sapphire/snowflake": "npm:3.5.3" - discord-api-types: "npm:0.37.83" + discord-api-types: "npm:0.37.97" fast-deep-equal: "npm:3.1.3" lodash.snakecase: "npm:4.1.1" - tslib: "npm:2.6.2" - undici: "npm:6.13.0" - checksum: 10/b18decbe8a0f1a3f569eb144be2a7039a08068131be2760190ac70fefdeb255cfed10ee0368e488f6c38d53d190c2988a6cc50c7db57a802cf54bb20cc47dc2e + tslib: "npm:^2.6.3" + undici: "npm:6.19.8" + checksum: 10/e75d0f8dd1a8e9aae313e016ba88d0c4b75dfe502663b08edae94cc99936f634e5647022bae71f517b6233d44af2a8bd4cabbe53db398e954116178b196030c4 languageName: node linkType: hard @@ -6231,8 +6231,8 @@ __metadata: "@vitest/coverage-v8": "npm:^2.0.5" concurrently: "npm:^8.2.2" cz-conventional-changelog: "npm:^3.3.0" - discord-api-types: "npm:^0.37.98" - discord.js: "npm:^14.15.3" + discord-api-types: "npm:0.37.97" + discord.js: "npm:^14.16.1" eslint: "npm:^8.57.0" eslint-config-prettier: "npm:^9.1.0" eslint-plugin-prettier: "npm:^5.2.1" @@ -6878,13 +6878,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.6.2": - version: 2.6.2 - resolution: "tslib@npm:2.6.2" - checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca - languageName: node - linkType: hard - "tslib@npm:^1.8.1": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -6892,7 +6885,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.1.0, tslib@npm:^2.6.2, tslib@npm:^2.7.0": +"tslib@npm:^2.1.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3, tslib@npm:^2.7.0": version: 2.7.0 resolution: "tslib@npm:2.7.0" checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 @@ -7149,10 +7142,10 @@ __metadata: languageName: node linkType: hard -"undici@npm:6.13.0": - version: 6.13.0 - resolution: "undici@npm:6.13.0" - checksum: 10/4ec2038e95779d4f1114a5dcf5bc74ec59c7fc76f6287f8a6bea6d69113f0190e6d41cc6e14409b5d912b0a92ce910b33bfa05808f40b6bf2b802b58b427f2cf +"undici@npm:6.19.8": + version: 6.19.8 + resolution: "undici@npm:6.19.8" + checksum: 10/19ae4ba38b029a664d99fd330935ef59136cf99edb04ed821042f27b5a9e84777265fb744c8a7abc83f2059afb019446c69a4ebef07bbc0ed6b2de8d67ef4090 languageName: node linkType: hard