From 37ca4593d3c07c6a1c87919b03fa96ff67f0578f Mon Sep 17 00:00:00 2001
From: March 7th <71698422+aiko-chan-ai@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:47:37 +0700
Subject: [PATCH] types(GuildChannelManager): correct fetch return type (v13)

#8551 discord.js
---
 src/managers/GuildChannelManager.js | 2 +-
 typings/index.d.ts                  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/managers/GuildChannelManager.js b/src/managers/GuildChannelManager.js
index 0558187..f45df22 100644
--- a/src/managers/GuildChannelManager.js
+++ b/src/managers/GuildChannelManager.js
@@ -324,7 +324,7 @@ class GuildChannelManager extends CachedManager {
    * Obtains one or more guild channels from Discord, or the channel cache if they're already available.
    * @param {Snowflake} [id] The channel's id
    * @param {BaseFetchOptions} [options] Additional options for this fetch
-   * @returns {Promise<?GuildChannel|Collection<Snowflake, GuildChannel>>}
+   * @returns {Promise<?GuildChannel|ThreadChannel|Collection<Snowflake, ?GuildChannel>>}
    * @example
    * // Fetch all channels from the guild (excluding threads)
    * message.guild.channels.fetch()
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 141405f..d9d8090 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -3696,8 +3696,11 @@ export class GuildChannelManager extends CachedManager<Snowflake, GuildBasedChan
     options?: ChannelWebhookCreateOptions,
   ): Promise<Webhook>;
   public edit(channel: GuildChannelResolvable, data: ChannelData, reason?: string): Promise<GuildChannel>;
-  public fetch(id: Snowflake, options?: BaseFetchOptions): Promise<NonThreadGuildBasedChannel | null>;
-  public fetch(id?: undefined, options?: BaseFetchOptions): Promise<Collection<Snowflake, NonThreadGuildBasedChannel>>;
+  public fetch(id: Snowflake, options?: BaseFetchOptions): Promise<GuildBasedChannel | null>;
+  public fetch(
+    id?: undefined,
+    options?: BaseFetchOptions,
+  ): Promise<Collection<Snowflake, NonThreadGuildBasedChannel | null>>;
   public fetchWebhooks(channel: GuildChannelResolvable): Promise<Collection<Snowflake, Webhook>>;
   public setPosition(
     channel: GuildChannelResolvable,