chore: update code

discordjs · Aug 23, 2023 · 5174e95 · 5174e95
1 parent 3450ad2
commit 5174e95
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/...ilders/src/interactions/slashCommands/mixins/ApplicationCommandOptionChannelTypesMixin.ts b/...ilders/src/interactions/slashCommands/mixins/ApplicationCommandOptionChannelTypesMixin.ts
@@ -17,7 +17,6 @@ const allowedChannelTypes = [
 	ChannelType.PrivateThread,
 	ChannelType.GuildStageVoice,
 	ChannelType.GuildForum,
-	// @ts-expect-error: discord-api-types.
 	ChannelType.GuildMedia,
 ] as const;
 

diff --git a/packages/discord.js/src/util/Channels.js b/packages/discord.js/src/util/Channels.js
@@ -70,8 +70,7 @@ function createChannel(client, data, guild, { allowUnknownGuild } = {}) {
         case ChannelType.GuildForum:
           channel = new (getForumChannel())(guild, data, client);
           break;
-        // TODO: ChannelType.GuildMedia
-        case 16:
+        case ChannelType.GuildMedia:
           channel = new (getMediaChannel())(guild, data, client);
           break;
       }

diff --git a/packages/discord.js/src/util/Util.js b/packages/discord.js/src/util/Util.js
@@ -163,8 +163,13 @@ function makePlainError(err) {
   };
 }
 
-// TODO: ChannelType.GuildMedia
-const TextSortableGroupTypes = [ChannelType.GuildText, ChannelType.GuildAnnouncement, ChannelType.GuildForum, 16];
+const TextSortableGroupTypes = [
+  ChannelType.GuildText,
+  ChannelType.GuildAnnouncement,
+  ChannelType.GuildForum,
+  ChannelType.GuildMedia,
+];
+
 const VoiceSortableGroupTypes = [ChannelType.GuildVoice, ChannelType.GuildStageVoice];
 const CategorySortableGroupTypes = [ChannelType.GuildCategory];
 
@@ -182,8 +187,7 @@ function getSortableGroupTypes(type) {
     case ChannelType.GuildText:
     case ChannelType.GuildAnnouncement:
     case ChannelType.GuildForum:
-    case 16:
-      // TODO: ChannelType.GuildMedia
+    case ChannelType.GuildMedia:
       return TextSortableGroupTypes;
     case ChannelType.GuildVoice:
     case ChannelType.GuildStageVoice:

diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
@@ -894,7 +894,6 @@ export interface MappedChannelCategoryTypes {
   [ChannelType.GuildText]: TextChannel;
   [ChannelType.GuildStageVoice]: StageChannel;
   [ChannelType.GuildForum]: ForumChannel;
-  // @ts-expect-error discord-api-types.
   [ChannelType.GuildMedia]: MediaChannel;
 }
 
@@ -907,8 +906,6 @@ export type CategoryChannelType = Exclude<
   | ChannelType.PrivateThread
   | ChannelType.GuildCategory
   | ChannelType.GuildDirectory
-  // TODO: https://github.com/discordjs/discord.js/pull/9662
-  | ChannelType.GuildMedia
 >;
 
 export class CategoryChannel extends GuildChannel {
@@ -2400,7 +2397,6 @@ export class ThreadOnlyChannel extends TextBasedChannelMixin(GuildChannel, true,
   'createMessageComponentCollector',
   'awaitMessageComponent',
 ]) {
-  // @ts-expect-error: discord-api-types.
   public type: ChannelType.GuildForum | ChannelType.GuildMedia;
   public threads: GuildForumThreadManager;
   public availableTags: GuildForumTag[];
@@ -2430,8 +2426,7 @@ export class ForumChannel extends ThreadOnlyChannel {
   public setDefaultForumLayout(defaultForumLayout: ForumLayoutType, reason?: string): Promise<this>;
 }
 
-export class MediaChannel extends ForumChannel {
-  // @ts-expect-error: discord-api-types.
+export class MediaChannel extends ThreadOnlyChannel {
   public type: ChannelType.GuildMedia;
 }
 

diff --git a/packages/discord.js/typings/index.test-d.ts b/packages/discord.js/typings/index.test-d.ts
@@ -1539,7 +1539,6 @@ declare const guildChannelManager: GuildChannelManager;
   expectType<Promise<NewsChannel>>(guildChannelManager.create({ name: 'name', type: ChannelType.GuildAnnouncement }));
   expectType<Promise<StageChannel>>(guildChannelManager.create({ name: 'name', type: ChannelType.GuildStageVoice }));
   expectType<Promise<ForumChannel>>(guildChannelManager.create({ name: 'name', type: ChannelType.GuildForum }));
-  // @ts-expect-error discord-api-types.
   expectType<Promise<MediaChannel>>(guildChannelManager.create({ name: 'name', type: ChannelType.GuildMedia }));
 
   expectType<Promise<Collection<Snowflake, NonThreadGuildBasedChannel | null>>>(guildChannelManager.fetch());
@@ -1923,10 +1922,7 @@ client.on('interactionCreate', async interaction => {
       expectType<ForumChannel | VoiceChannel | null>(
         interaction.options.getChannel('test', false, [ChannelType.GuildForum, ChannelType.GuildVoice]),
       );
-      expectType<MediaChannel>(
-        // @ts-expect-error discord-api-types.
-        interaction.options.getChannel('test', true, [ChannelType.MediaChannel]),
-      );
+      expectType<MediaChannel>(interaction.options.getChannel('test', true, [ChannelType.GuildMedia]));
     } else {
       // @ts-expect-error
       consumeCachedCommand(interaction);