From 208b098ba2e17f696c6818b963e4046cbbaa72f0 Mon Sep 17 00:00:00 2001 From: ITOH <72305210+itohatweb@users.noreply.github.com> Date: Fri, 30 Apr 2021 21:53:17 +0200 Subject: [PATCH] fix some errors --- src/handlers/voice/VOICE_STATE_UPDATE.ts | 11 +++-------- src/helpers/discovery/valid_discovery_term.ts | 4 ++-- src/helpers/messages/send_message.ts | 4 ++-- src/types/discovery/validate_discovery_search_term.ts | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/handlers/voice/VOICE_STATE_UPDATE.ts b/src/handlers/voice/VOICE_STATE_UPDATE.ts index e5915d28e..127d9619f 100644 --- a/src/handlers/voice/VOICE_STATE_UPDATE.ts +++ b/src/handlers/voice/VOICE_STATE_UPDATE.ts @@ -2,16 +2,11 @@ import { eventHandlers } from "../../bot.ts"; import { cacheHandlers } from "../../cache.ts"; import { structures } from "../../structures/mod.ts"; import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import { - DiscordVoiceState, - VoiceState, -} from "../../types/voice/voice_state.ts"; -import { snakeKeysToCamelCase } from "../../util/utils.ts"; +import { VoiceState } from "../../types/voice/voice_state.ts"; export async function handleVoiceStateUpdate(data: DiscordGatewayPayload) { - const payload = snakeKeysToCamelCase( - data.d as DiscordVoiceState, - ); + const payload = data.d as VoiceState; + if (!payload.guildId) return; const guild = await cacheHandlers.get("guilds", payload.guildId); diff --git a/src/helpers/discovery/valid_discovery_term.ts b/src/helpers/discovery/valid_discovery_term.ts index 824af8528..5a96016af 100644 --- a/src/helpers/discovery/valid_discovery_term.ts +++ b/src/helpers/discovery/valid_discovery_term.ts @@ -1,9 +1,9 @@ import { rest } from "../../rest/rest.ts"; -import { DiscordValidateDiscoverySearchTerm } from "../../types/discovery/validate_discovery_search_term.ts"; +import { ValidateDiscoverySearchTerm } from "../../types/discovery/validate_discovery_search_term.ts"; import { endpoints } from "../../util/constants.ts"; export async function validDiscoveryTerm(term: string) { - const result = await rest.runMethod( + const result = await rest.runMethod( "get", endpoints.DISCOVERY_VALID_TERM, { term }, diff --git a/src/helpers/messages/send_message.ts b/src/helpers/messages/send_message.ts index 73d00246f..68e261861 100644 --- a/src/helpers/messages/send_message.ts +++ b/src/helpers/messages/send_message.ts @@ -4,7 +4,7 @@ import { structures } from "../../structures/mod.ts"; import { DiscordChannelTypes } from "../../types/channels/channel_types.ts"; import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; import { CreateMessage } from "../../types/messages/create_message.ts"; -import { DiscordMessage, Message } from "../../types/messages/message.ts"; +import { Message } from "../../types/messages/message.ts"; import { Errors } from "../../types/misc/errors.ts"; import { PermissionStrings } from "../../types/permissions/permission_strings.ts"; import { endpoints } from "../../util/constants.ts"; @@ -96,7 +96,7 @@ export async function sendMessage( const result = await rest.runMethod( "post", endpoints.CHANNEL_MESSAGES(channelId), - camelKeysToSnakeCase({ + camelKeysToSnakeCase({ ...content, ...(content.messageReference?.messageId ? { diff --git a/src/types/discovery/validate_discovery_search_term.ts b/src/types/discovery/validate_discovery_search_term.ts index 184b533d8..ff230f5ac 100644 --- a/src/types/discovery/validate_discovery_search_term.ts +++ b/src/types/discovery/validate_discovery_search_term.ts @@ -1,6 +1,5 @@ +// TODO: add docs link export interface ValidateDiscoverySearchTerm { /** Whether the provided term is valid */ valid: boolean; } - -export type DiscordValidateDiscoverySearchTerm = ValidateDiscoverySearchTerm;