Merge branch 'main' into discord.js/rename-error

Author: kodiakhq[bot]

packages/actions/package.json

@@ -47,7 +47,7 @@
 		"@vitest/coverage-c8": "^0.23.4",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.24.0",
-		"eslint-config-neon": "^0.1.33",
+		"eslint-config-neon": "^0.1.34",
 		"prettier": "^2.7.1",
 		"tsup": "^6.2.3",
 		"typescript": "^4.8.4",

packages/api-extractor-utils/package.json

@@ -38,7 +38,7 @@
 		"@types/node": "^16.11.64",
 		"cross-env": "^7.0.3",
 		"eslint": "^8.24.0",
-		"eslint-config-neon": "^0.1.33",
+		"eslint-config-neon": "^0.1.34",
 		"prettier": "^2.7.1",
 		"tsup": "^6.2.3",
 		"typescript": "^4.8.4"

packages/builders/package.json

@@ -69,7 +69,7 @@
 		"cross-env": "^7.0.3",
 		"downlevel-dts": "^0.10.1",
 		"eslint": "^8.24.0",
-		"eslint-config-neon": "^0.1.33",
+		"eslint-config-neon": "^0.1.34",
 		"prettier": "^2.7.1",
 		"tsup": "^6.2.3",
 		"typescript": "^4.8.4",

packages/collection/package.json

@@ -57,7 +57,7 @@
 		"cross-env": "^7.0.3",
 		"downlevel-dts": "^0.10.1",
 		"eslint": "^8.24.0",
-		"eslint-config-neon": "^0.1.33",
+		"eslint-config-neon": "^0.1.34",
 		"prettier": "^2.7.1",
 		"tsup": "^6.2.3",
 		"typescript": "^4.8.4",

packages/discord.js/src/index.js

@@ -186,3 +186,4 @@ exports.WebSocket = require('./WebSocket');
 __exportStar(require('discord-api-types/v10'), exports);
 __exportStar(require('@discordjs/builders'), exports);
 __exportStar(require('@discordjs/rest'), exports);
+__exportStar(require('@discordjs/util'), exports);

packages/discord.js/src/managers/CategoryChannelChildManager.js

@@ -53,6 +53,8 @@ class CategoryChannelChildManager extends DataManager {
    * @property {GuildForumTagData[]} [availableTags] The tags that can be used in this channel (forum only).
    * @property {DefaultReactionEmoji} [defaultReactionEmoji]
    * The emoji to show in the add reaction button on a thread in a guild forum channel.
+   * @property {ThreadAutoArchiveDuration} [defaultAutoArchiveDuration]
+   * The default auto archive duration for all new threads in this channel
    * @property {SortOrderType} [defaultSortOrder] The default sort order mode used to order posts (forum only).
    * @property {string} [reason] Reason for creating the new channel
    */

packages/discord.js/src/managers/GuildChannelManager.js

@@ -141,6 +141,7 @@ class GuildChannelManager extends CachedManager {
     videoQualityMode,
     availableTags,
     defaultReactionEmoji,
+    defaultAutoArchiveDuration,
     defaultSortOrder,
     reason,
   }) {
@@ -163,6 +164,7 @@ class GuildChannelManager extends CachedManager {
         video_quality_mode: videoQualityMode,
         available_tags: availableTags?.map(availableTag => transformGuildForumTag(availableTag)),
         default_reaction_emoji: defaultReactionEmoji && transformGuildDefaultReaction(defaultReactionEmoji),
+        default_auto_archive_duration: defaultAutoArchiveDuration,
         default_sort_order: defaultSortOrder,
       },
       reason,

packages/discord.js/src/structures/Message.js

@@ -541,6 +541,9 @@ class Message extends Base {
    * @property {CollectorFilter} [filter] The filter applied to this collector
    * @property {number} [time] Time to wait for an interaction before rejecting
    * @property {ComponentType} [componentType] The type of component interaction to collect
+   * @property {number} [idle] Time to wait without another message component interaction before ending the collector
+   * @property {boolean} [dispose] Whether to remove the message component interaction after collecting
+   * @property {InteractionResponse} [InteractionResponse] The interaction response to collect interactions from
    */
 
   /**

packages/discord.js/typings/index.d.ts

@@ -1750,7 +1750,7 @@ export class Message<InGuild extends boolean = boolean> extends Base {
   public toJSON(): unknown;
   public toString(): string;
   public unpin(reason?: string): Promise<Message<InGuild>>;
-  public inGuild(): this is Message<true> & this;
+  public inGuild(): this is Message<true>;
 }
 
 export class AttachmentBuilder {
@@ -4252,6 +4252,7 @@ export interface CategoryCreateChannelOptions {
   videoQualityMode?: VideoQualityMode;
   availableTags?: GuildForumTagData[];
   defaultReactionEmoji?: DefaultReactionEmoji;
+  defaultAutoArchiveDuration?: ThreadAutoArchiveDuration;
   defaultSortOrder?: SortOrderType;
   reason?: string;
 }

packages/discord.js/typings/index.test-d.ts

@@ -309,6 +309,11 @@ declare const assertIsMessage: (m: Promise<Message>) => void;
 
 client.on('messageCreate', async message => {
   const { client, channel } = message;
+
+  if (!message.inGuild() && message.partial) {
+    expectNotType<never>(message);
+  }
+
   expectType<Client<true>>(client);
   assertIsMessage(channel.send('string'));
   assertIsMessage(channel.send({}));