From c46e9515d6069f0930fa464894375f122630cbb6 Mon Sep 17 00:00:00 2001
From: MARCROCK22 <57925328+MARCROCK22@users.noreply.github.com>
Date: Thu, 25 Apr 2024 17:06:53 -0400
Subject: [PATCH] fix: objectToLower & objectToSnake types

---
 src/commands/applications/menucontext.ts |  4 ++--
 src/common/shorters/guilds.ts            |  4 ++--
 src/common/types/util.ts                 | 28 ++++++++++++++++++++++--
 src/structures/AutoModerationRule.ts     |  4 ++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/commands/applications/menucontext.ts b/src/commands/applications/menucontext.ts
index 7265f55..697a9e4 100644
--- a/src/commands/applications/menucontext.ts
+++ b/src/commands/applications/menucontext.ts
@@ -1,4 +1,4 @@
-import { ApplicationCommandType, MessageFlags } from 'discord-api-types/v10';
+import { type APIMessage, ApplicationCommandType, MessageFlags } from 'discord-api-types/v10';
 import type { ContextMenuCommand, ReturnCache, WebhookMessage } from '../..';
 import {
 	toSnakeCase,
@@ -50,7 +50,7 @@ export class MenuCommandContext<
 		switch (this.interaction.data.type) {
 			case ApplicationCommandType.Message: {
 				const data = this.interaction.data.resolved.messages[this.interaction.data.targetId as Lowercase<string>];
-				return new Message(this.client, toSnakeCase(data)) as never;
+				return new Message(this.client, toSnakeCase(data) as APIMessage) as never;
 			}
 			case ApplicationCommandType.User: {
 				const data = this.interaction.data.resolved.users[this.interaction.data.targetId as Lowercase<string>];
diff --git a/src/common/shorters/guilds.ts b/src/common/shorters/guilds.ts
index 2afcc70..49d2bb9 100644
--- a/src/common/shorters/guilds.ts
+++ b/src/common/shorters/guilds.ts
@@ -10,7 +10,7 @@ import type {
 	RESTPostAPIGuildChannelJSONBody,
 	RESTPostAPIGuildsJSONBody,
 } from 'discord-api-types/v10';
-import type { ObjectToLower } from '..';
+import { toSnakeCase, type ObjectToLower } from '..';
 import { resolveFiles } from '../../builders';
 import {
 	AnonymousGuild,
@@ -267,7 +267,7 @@ export class GuildShorter extends BaseShorter {
 				return this.client.proxy
 					.guilds(guildId)
 					['auto-moderation'].rules(ruleId)
-					.patch({ body, reason })
+					.patch({ body: toSnakeCase(body), reason })
 					.then(rule => new AutoModerationRule(this.client, rule));
 			},
 		};
diff --git a/src/common/types/util.ts b/src/common/types/util.ts
index 786c8e0..a639839 100644
--- a/src/common/types/util.ts
+++ b/src/common/types/util.ts
@@ -104,17 +104,41 @@ export type ObjectToLower<T> = Identify<{
 		? Identify<ObjectToLower<T[K][0]>[]>
 		: T[K] extends object
 		  ? Identify<ObjectToLower<T[K]>>
-		  : T[K];
+		  : AuxIsStrictlyUndefined<T[K]> extends true
+			  ? undefined
+			  : ObjectToLowerUndefined<T[K]>;
 }>;
 
+export type ObjectToLowerUndefined<T> = T extends unknown[]
+	? ObjectToLower<T[0]>[]
+	: Identify<{
+			[K in keyof T as CamelCase<Exclude<K, symbol | number>>]?: T[K] extends unknown[]
+				? ObjectToLower<T[K][0]>[]
+				: T[K] extends object
+				  ? ObjectToLower<T[K]>
+				  : T[K];
+	  }>;
+
 export type ObjectToSnake<T> = Identify<{
 	[K in keyof T as SnakeCase<Exclude<K, symbol | number>>]: T[K] extends unknown[]
 		? Identify<ObjectToSnake<T[K][0]>[]>
 		: T[K] extends object
 		  ? Identify<ObjectToSnake<T[K]>>
-		  : T[K];
+		  : AuxIsStrictlyUndefined<T[K]> extends true
+			  ? undefined
+			  : ObjectToSnakeUndefined<T[K]>;
 }>;
 
+export type ObjectToSnakeUndefined<T> = T extends unknown[]
+	? ObjectToSnake<T[0]>[]
+	: Identify<{
+			[K in keyof T as SnakeCase<Exclude<K, symbol | number>>]?: T[K] extends unknown[]
+				? ObjectToSnake<T[K][0]>[]
+				: T[K] extends object
+				  ? ObjectToSnake<T[K]>
+				  : T[K];
+	  }>;
+
 export type UnionToTuple<U, A extends any[] = []> = (U extends void ? void : (arg: () => U) => never) extends (
 	arg: infer I,
 ) => void
diff --git a/src/structures/AutoModerationRule.ts b/src/structures/AutoModerationRule.ts
index 46e6a8e..1d3d038 100644
--- a/src/structures/AutoModerationRule.ts
+++ b/src/structures/AutoModerationRule.ts
@@ -4,7 +4,7 @@ import type {
 	RESTPostAPIAutoModerationRuleJSONBody,
 } from 'discord-api-types/v10';
 import type { UsingClient } from '../commands';
-import type { MethodContext, ObjectToLower } from '../common';
+import { toCamelCase, type MethodContext, type ObjectToLower } from '../common';
 import { DiscordBase } from './extra/DiscordBase';
 
 export interface AutoModerationRule extends ObjectToLower<APIAutoModerationRule> {}
@@ -41,7 +41,7 @@ export class AutoModerationRule extends DiscordBase<APIAutoModerationRule> {
 			delete: (ruleId: string, reason?: string) => client.guilds.moderation.delete(guildId, ruleId, reason),
 			fetch: (ruleId: string) => client.guilds.moderation.fetch(guildId, ruleId),
 			edit: (ruleId: string, body: RESTPatchAPIAutoModerationRuleJSONBody, reason?: string) =>
-				client.guilds.moderation.edit(guildId, ruleId, body, reason),
+				client.guilds.moderation.edit(guildId, ruleId, toCamelCase(body), reason),
 		};
 	}
 }