From 724f09b4f765085589cfdd9c1f6210d53b7e35d5 Mon Sep 17 00:00:00 2001 From: ayntee Date: Wed, 10 Mar 2021 20:27:12 +0400 Subject: [PATCH] refactor(handlers/guild): rename roles option to includeRoles (#654) --- src/api/handlers/guild.ts | 16 ++++++++-------- src/types/guild.ts | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/api/handlers/guild.ts b/src/api/handlers/guild.ts index d880098a5..182ef9c45 100644 --- a/src/api/handlers/guild.ts +++ b/src/api/handlers/guild.ts @@ -38,7 +38,11 @@ import { import { Collection } from "../../util/collection.ts"; import { endpoints } from "../../util/constants.ts"; import { botHasPermission, calculateBits } from "../../util/permissions.ts"; -import { formatImageURL, urlToBase64 } from "../../util/utils.ts"; +import { + camelKeysToSnakeCase, + formatImageURL, + urlToBase64, +} from "../../util/utils.ts"; import { requestAllMembers } from "../../ws/shard_manager.ts"; import { cacheHandlers } from "../controllers/cache.ts"; import { Guild, Member, structures } from "../structures/mod.ts"; @@ -544,7 +548,7 @@ export async function getPruneCount(guildID: string, options?: PruneOptions) { const result = await RequestManager.get( endpoints.GUILD_PRUNE(guildID), - { ...options, include_roles: options?.roles?.join(",") }, + camelKeysToSnakeCase(options ?? {}), ) as PrunePayload; return result.pruned; @@ -557,7 +561,7 @@ export async function getPruneCount(guildID: string, options?: PruneOptions) { */ export async function pruneMembers( guildID: string, - { roles, computePruneCount, ...options }: PruneOptions, + options: PruneOptions, ) { if (options.days && options.days < 1) throw new Error(Errors.PRUNE_MIN_DAYS); if (options.days && options.days > 30) throw new Error(Errors.PRUNE_MAX_DAYS); @@ -569,11 +573,7 @@ export async function pruneMembers( const result = await RequestManager.post( endpoints.GUILD_PRUNE(guildID), - { - ...options, - compute_prune_count: computePruneCount, - include_roles: roles, - }, + camelKeysToSnakeCase(options), ); return result; diff --git a/src/types/guild.ts b/src/types/guild.ts index 8350f152c..d21af079c 100644 --- a/src/types/guild.ts +++ b/src/types/guild.ts @@ -582,7 +582,7 @@ export interface PruneOptions { /** Whether 'pruned' is returned, discouraged for large guilds. Default: true */ computePruneCount?: boolean; /** Role(s) to include */ - roles?: string[]; + includeRoles?: string[]; } export interface VoiceState {