Merge branch 'main' of https://github.com/discordjs/discord.js into f…

…eat/guide/serialize-markdown-headings
discordjs · May 26, 2023 · 0a2c912 · 0a2c912
2 parents 21a91e1 + 53aa24d
commit 0a2c912
Show file tree

Hide file tree

Showing 28 changed files with 1,434 additions and 1,443 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -17,7 +17,7 @@ nodeLinker: node-modules
 packageExtensions:
   '@storybook/core-common@*':
     dependencies:
-      '@storybook/react-vite': 7.0.12
+      '@storybook/react-vite': 7.0.15
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

diff --git a/apps/guide/package.json b/apps/guide/package.json
@@ -48,13 +48,13 @@
 		"@discordjs/ui": "workspace:^",
 		"@react-icons/all-files": "^4.1.0",
 		"@vercel/analytics": "^1.0.1",
-		"@vercel/edge-config": "^0.1.10",
+		"@vercel/edge-config": "^0.1.11",
 		"@vercel/og": "^0.5.4",
 		"ariakit": "^2.0.0-next.44",
 		"cmdk": "^0.2.0",
 		"contentlayer": "^0.3.2",
 		"github-slugger": "^2.0.0",
-		"next": "^13.4.2",
+		"next": "^13.4.3",
 		"next-contentlayer": "^0.3.2",
 		"next-themes": "^0.2.1",
 		"react": "^18.2.0",
@@ -66,34 +66,34 @@
 		"sharp": "^0.32.1"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "^13.4.2",
+		"@next/bundle-analyzer": "^13.4.3",
 		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.4.3",
 		"@types/html-escaper": "^3.0.0",
-		"@types/node": "18.16.9",
+		"@types/node": "18.16.14",
 		"@types/react": "^18.2.6",
 		"@types/react-dom": "^18.2.4",
-		"@unocss/cli": "^0.51.13",
-		"@unocss/eslint-config": "^0.51.13",
-		"@unocss/reset": "^0.51.13",
+		"@unocss/cli": "^0.52.3",
+		"@unocss/eslint-config": "^0.52.3",
+		"@unocss/reset": "^0.52.3",
 		"@vitejs/plugin-react": "^4.0.0",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@vitest/coverage-c8": "^0.31.1",
 		"concurrently": "^8.0.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
-		"happy-dom": "^9.18.3",
+		"happy-dom": "^9.20.1",
 		"hast-util-to-string": "^2.0.0",
 		"hastscript": "^7.2.0",
 		"html-escaper": "^3.0.3",
 		"lighthouse": "^10.2.0",
 		"prettier": "^2.8.8",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"unocss": "^0.51.13",
-		"vercel": "^29.3.0",
-		"vitest": "^0.31.0"
+		"unocss": "^0.52.3",
+		"vercel": "^29.4.0",
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=18.13.0"

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -49,19 +49,19 @@
 		"@discordjs/api-extractor-utils": "workspace:^",
 		"@discordjs/scripts": "workspace:^",
 		"@discordjs/ui": "workspace:^",
-		"@microsoft/api-extractor-model": "7.26.9",
+		"@microsoft/api-extractor-model": "7.27.0",
 		"@microsoft/tsdoc": "0.14.2",
 		"@planetscale/database": "1.7.0",
 		"@react-icons/all-files": "^4.1.0",
 		"@vercel/analytics": "^1.0.1",
-		"@vercel/edge-config": "^0.1.10",
+		"@vercel/edge-config": "^0.1.11",
 		"@vercel/og": "^0.5.4",
 		"ariakit": "^2.0.0-next.44",
 		"bright": "^0.8.2",
 		"class-variance-authority": "^0.6.0",
 		"cmdk": "^0.2.0",
-		"meilisearch": "^0.32.3",
-		"next": "^13.4.2",
+		"meilisearch": "^0.32.4",
+		"next": "^13.4.3",
 		"next-mdx-remote": "^4.4.1",
 		"next-themes": "^0.2.1",
 		"react": "^18.2.0",
@@ -75,30 +75,30 @@
 		"swr": "^2.1.5"
 	},
 	"devDependencies": {
-		"@next/bundle-analyzer": "^13.4.2",
+		"@next/bundle-analyzer": "^13.4.3",
 		"@testing-library/react": "^14.0.0",
 		"@testing-library/user-event": "^14.4.3",
-		"@types/node": "18.16.9",
+		"@types/node": "18.16.14",
 		"@types/react": "^18.2.6",
 		"@types/react-dom": "^18.2.4",
-		"@unocss/cli": "^0.51.13",
-		"@unocss/eslint-config": "^0.51.13",
-		"@unocss/reset": "^0.51.13",
+		"@unocss/cli": "^0.52.3",
+		"@unocss/eslint-config": "^0.52.3",
+		"@unocss/reset": "^0.52.3",
 		"@vitejs/plugin-react": "^4.0.0",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@vitest/coverage-c8": "^0.31.1",
 		"concurrently": "^8.0.1",
 		"cpy-cli": "^4.2.0",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
-		"happy-dom": "^9.18.3",
+		"happy-dom": "^9.20.1",
 		"lighthouse": "^10.2.0",
 		"prettier": "^2.8.8",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vercel": "^29.3.0",
-		"vitest": "^0.31.0"
+		"vercel": "^29.4.0",
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=18.13.0"

diff --git a/package.json b/package.json
@@ -55,11 +55,11 @@
 		"is-ci": "^3.0.1",
 		"lint-staged": "^13.2.2",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"unocss": "^0.51.13",
-		"vercel": "^29.3.0",
-		"vitest": "^0.31.0"
+		"unocss": "^0.52.3",
+		"vercel": "^29.4.0",
+		"vitest": "^0.31.1"
 	},
 	"resolutions": {
 		"@microsoft/tsdoc-config@~0.16.1": "patch:@microsoft/tsdoc-config@npm%3A0.16.2#./.yarn/patches/@microsoft-tsdoc-config-npm-0.16.2-30fd115d09.patch",

diff --git a/packages/actions/package.json b/packages/actions/package.json
@@ -44,21 +44,21 @@
 		"@actions/core": "^1.10.0",
 		"@actions/glob": "^0.4.0",
 		"@planetscale/database": "^1.7.0",
-		"tslib": "^2.5.0",
+		"tslib": "^2.5.2",
 		"undici": "^5.22.1"
 	},
 	"devDependencies": {
-		"@types/node": "16.18.30",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@types/node": "16.18.32",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/api-extractor-utils/package.json b/packages/api-extractor-utils/package.json
@@ -32,18 +32,18 @@
 	},
 	"homepage": "https://discord.js.org",
 	"dependencies": {
-		"@microsoft/api-extractor-model": "7.26.9",
+		"@microsoft/api-extractor-model": "7.27.0",
 		"@microsoft/tsdoc": "0.14.2"
 	},
 	"devDependencies": {
-		"@types/node": "16.18.30",
+		"@types/node": "16.18.32",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4"
 	},
 	"engines": {

diff --git a/packages/brokers/package.json b/packages/brokers/package.json
@@ -64,18 +64,18 @@
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.0.0",
-		"@microsoft/api-extractor": "^7.34.9",
-		"@types/node": "16.18.30",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@microsoft/api-extractor": "^7.35.0",
+		"@types/node": "16.18.32",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/builders/package.json b/packages/builders/package.json
@@ -62,24 +62,24 @@
 		"discord-api-types": "^0.37.42",
 		"fast-deep-equal": "^3.1.3",
 		"ts-mixer": "^6.0.3",
-		"tslib": "^2.5.0"
+		"tslib": "^2.5.2"
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.0.0",
-		"@microsoft/api-extractor": "^7.34.9",
-		"@types/node": "16.18.30",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@microsoft/api-extractor": "^7.35.0",
+		"@types/node": "16.18.32",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
 		"downlevel-dts": "^0.11.0",
 		"esbuild-plugin-version-injector": "^1.1.0",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/collection/package.json b/packages/collection/package.json
@@ -53,19 +53,19 @@
 	"homepage": "https://discord.js.org",
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.0.0",
-		"@microsoft/api-extractor": "^7.34.9",
-		"@types/node": "16.18.30",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@microsoft/api-extractor": "^7.35.0",
+		"@types/node": "16.18.32",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.1.0",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=16.9.0"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -63,19 +63,19 @@
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.0.0",
-		"@microsoft/api-extractor": "^7.34.9",
-		"@types/node": "18.16.9",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@microsoft/api-extractor": "^7.35.0",
+		"@types/node": "18.16.14",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
 		"esbuild-plugin-version-injector": "^1.1.0",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
-		"turbo": "^1.9.5",
+		"turbo": "^1.9.8",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=18.12.0"

diff --git a/packages/create-discord-bot/package.json b/packages/create-discord-bot/package.json
@@ -51,18 +51,18 @@
 	},
 	"devDependencies": {
 		"@favware/cliff-jumper": "^2.0.0",
-		"@microsoft/api-extractor": "^7.34.9",
-		"@types/node": "16.18.30",
+		"@microsoft/api-extractor": "^7.35.0",
+		"@types/node": "16.18.32",
 		"@types/validate-npm-package-name": "^4.0.0",
-		"@vitest/coverage-c8": "^0.31.0",
+		"@vitest/coverage-c8": "^0.31.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.41.0",
 		"eslint-config-neon": "^0.1.47",
 		"eslint-formatter-pretty": "^5.0.0",
 		"prettier": "^2.8.8",
 		"tsup": "^6.7.0",
 		"typescript": "^5.0.4",
-		"vitest": "^0.31.0"
+		"vitest": "^0.31.1"
 	},
 	"engines": {
 		"node": ">=18.16.0"

diff --git a/packages/discord.js/package.json b/packages/discord.js/package.json
@@ -61,22 +61,22 @@
     "discord-api-types": "^0.37.42",
     "fast-deep-equal": "^3.1.3",
     "lodash.snakecase": "^4.1.1",
-    "tslib": "^2.5.0",
+    "tslib": "^2.5.2",
     "undici": "^5.22.1",
     "ws": "^8.13.0"
   },
   "devDependencies": {
     "@discordjs/docgen": "workspace:^",
     "@favware/cliff-jumper": "^2.0.0",
-    "@types/node": "16.18.30",
+    "@types/node": "16.18.32",
     "dtslint": "^4.2.1",
-    "eslint": "^8.40.0",
+    "eslint": "^8.41.0",
     "eslint-formatter-pretty": "^5.0.0",
     "jest": "^29.5.0",
     "prettier": "^2.8.8",
     "tsd": "^0.28.1",
     "tslint": "^6.1.3",
-    "turbo": "^1.9.5",
+    "turbo": "^1.9.8",
     "typescript": "^5.0.4"
   },
   "engines": {

diff --git a/packages/discord.js/src/managers/GuildChannelManager.js b/packages/discord.js/src/managers/GuildChannelManager.js
@@ -468,8 +468,17 @@ class GuildChannelManager extends CachedManager {
    *   .catch(console.error);
    */
   async fetchActiveThreads(cache = true) {
-    const raw = await this.client.rest.get(Routes.guildActiveThreads(this.guild.id));
-    return GuildTextThreadManager._mapThreads(raw, this.client, { guild: this.guild, cache });
+    const data = await this.rawFetchGuildActiveThreads();
+    return GuildTextThreadManager._mapThreads(data, this.client, { guild: this.guild, cache });
+  }
+
+  /**
+   * `GET /guilds/{guild.id}/threads/active`
+   * @private
+   * @returns {Promise<RESTGetAPIGuildThreadsResult>}
+   */
+  rawFetchGuildActiveThreads() {
+    return this.client.rest.get(Routes.guildActiveThreads(this.guild.id));
   }
 
   /**