Merge branch 'fix-handlers-invites' into fix-helpers

src/handlers/invites/INVITE_CREATE.ts

@@ -1,28 +1,13 @@
 import { eventHandlers } from "../../bot.ts";
 import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
-import { DiscordInviteCreate } from "../../types/invites/invite_create.ts";
+import {
+  DiscordInviteCreate,
+  InviteCreate,
+} from "../../types/invites/invite_create.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
-export function handleInviteCreate(payload: DiscordGatewayPayload) {
+export function handleInviteCreate(data: DiscordGatewayPayload) {
-  // TODO: replace with tocamelcase
+  const payload = data.d as DiscordInviteCreate;
-  const {
-    channel_id: channelId,
-    created_at: createdAt,
-    max_age: maxAge,
-    guild_id: guildId,
-    target_user: targetUser,
-    target_user_type: targetUserType,
-    max_uses: maxUses,
-    ...rest
-  } = payload.d as DiscordInviteCreate;
 
-  eventHandlers.inviteCreate?.({
+  eventHandlers.inviteCreate?.(snakeKeysToCamelCase(payload) as InviteCreate);
-    ...rest,
-    channelId,
-    guildId,
-    maxAge,
-    targetUser,
-    targetUserType,
-    maxUses,
-    createdAt,
-  });
 }

src/handlers/invites/INVITE_DELETE.ts

@@ -1,17 +1,13 @@
 import { eventHandlers } from "../../bot.ts";
-import { DiscordInviteDelete } from "../../types/invites/invite_delete.ts";
 import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
+import {
+  DiscordInviteDelete,
+  InviteDelete,
+} from "../../types/invites/invite_delete.ts";
+import { snakeKeysToCamelCase } from "../../util/utils.ts";
 
-export function handleInviteDelete(payload: DiscordGatewayPayload) {
+export function handleInviteDelete(data: DiscordGatewayPayload) {
-  const {
+  const payload = data.d as DiscordInviteDelete;
-    channel_id: channelId,
-    guild_id: guildId,
-    ...rest
-  } = payload.d as DiscordInviteDelete;
 
-  eventHandlers.inviteDelete?.({
+  eventHandlers.inviteDelete?.(snakeKeysToCamelCase(payload) as InviteDelete);
-    ...rest,
-    channelId,
-    guildId,
-  });
 }