fix(guild): allow to pass query into get

discordjs · Feb 21, 2024 · 92f7b3d · 92f7b3d
1 parent 5988453
commit 92f7b3d
Showing 1 changed file with 5 additions and 32 deletions.
diff --git a/packages/core/src/api/guild.ts b/packages/core/src/api/guild.ts
@@ -104,16 +104,6 @@ import {
 export class GuildsAPI {
 	public constructor(private readonly rest: REST) {}
 
-	/**
-	 * Fetches a guild
-	 *
-	 * @see {@link https://discord.com/developers/docs/resources/guild#get-guild}
-	 * @param guildId - The id of the guild
-	 * @param options - The options for fetching the guild
-	 * @deprecated Use the overload with a query instead.
-	 */
-	public async get(guildId: Snowflake, { signal }?: Pick<RequestData, 'signal'>): Promise<RESTGetAPIGuildResult>;
-
 	/**
 	 * Fetches a guild
 	 *
@@ -122,28 +112,11 @@ export class GuildsAPI {
 	 * @param query - The query options for fetching the guild
 	 * @param options - The options for fetching the guild
 	 */
-	public async get(
-		guildId: Snowflake,
-		query?: RESTGetAPIGuildQuery,
-		options?: Pick<RequestData, 'signal'>,
-	): Promise<RESTGetAPIGuildResult>;
-
-	public async get(
-		guildId: Snowflake,
-		queryOrOptions: Pick<RequestData, 'signal'> | RESTGetAPIGuildQuery = {},
-		options: Pick<RequestData, 'signal'> = {},
-	) {
-		const requestData: RequestData = {
-			signal: ('signal' in queryOrOptions ? queryOrOptions : options).signal,
-		};
-
-		const query = 'with_counts' in queryOrOptions ? makeURLSearchParams(queryOrOptions) : undefined;
-
-		if (query) {
-			requestData.query = query;
-		}
-
-		return this.rest.get(Routes.guild(guildId), requestData) as Promise<RESTGetAPIGuildResult>;
+	public async get(guildId: Snowflake, query: RESTGetAPIGuildQuery = {}, { signal }: Pick<RequestData, 'signal'> = {}) {
+		return this.rest.get(Routes.guild(guildId), {
+			query: makeURLSearchParams(query),
+			signal,
+		}) as Promise<RESTGetAPIGuildResult>;
 	}
 
 	/**