From 9eeb8e26fbca24e26ab8baf9bbdef8478b565967 Mon Sep 17 00:00:00 2001 From: ITOH Date: Sun, 14 Nov 2021 21:53:29 +0100 Subject: [PATCH] never ever come with snake_case again for dd --- .github/CONTRIBUTING.md | 6 +- src/bot.ts | 28 +- src/cache.ts | 2 +- src/handlers/channels/CHANNEL_CREATE.ts | 2 +- src/handlers/channels/CHANNEL_DELETE.ts | 2 +- src/handlers/channels/CHANNEL_PINS_UPDATE.ts | 4 +- src/handlers/channels/CHANNEL_UPDATE.ts | 2 +- .../channels/STAGE_INSTANCE_CREATE.ts | 4 +- .../channels/STAGE_INSTANCE_DELETE.ts | 4 +- .../channels/STAGE_INSTANCE_UPDATE.ts | 4 +- src/handlers/channels/THREAD_CREATE.ts | 4 +- src/handlers/channels/THREAD_DELETE.ts | 2 +- src/handlers/channels/THREAD_LIST_SYNC.ts | 4 +- .../channels/THREAD_MEMBERS_UPDATE.ts | 4 +- src/handlers/channels/THREAD_MEMBER_UPDATE.ts | 4 +- src/handlers/channels/THREAD_UPDATE.ts | 2 +- src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts | 4 +- src/handlers/guilds/GUILD_BAN_ADD.ts | 4 +- src/handlers/guilds/GUILD_BAN_REMOVE.ts | 4 +- src/handlers/guilds/GUILD_CREATE.ts | 2 +- src/handlers/guilds/GUILD_DELETE.ts | 4 +- .../guilds/GUILD_INTEGRATIONS_UPDATE.ts | 4 +- src/handlers/guilds/GUILD_LOADED_DD.ts | 2 +- src/handlers/guilds/GUILD_UPDATE.ts | 2 +- .../integrations/INTEGRATION_CREATE.ts | 4 +- .../integrations/INTEGRATION_DELETE.ts | 4 +- .../integrations/INTEGRATION_UPDATE.ts | 4 +- .../interactions/INTERACTION_CREATE.ts | 2 +- src/handlers/invites/INVITE_CREATE.ts | 4 +- src/handlers/invites/INVITE_DELETE.ts | 4 +- src/handlers/members/GUILD_MEMBERS_CHUNK.ts | 4 +- src/handlers/members/GUILD_MEMBER_ADD.ts | 4 +- src/handlers/members/GUILD_MEMBER_REMOVE.ts | 4 +- src/handlers/members/GUILD_MEMBER_UPDATE.ts | 4 +- src/handlers/messages/MESSAGE_CREATE.ts | 2 +- src/handlers/messages/MESSAGE_DELETE.ts | 4 +- src/handlers/messages/MESSAGE_DELETE_BULK.ts | 4 +- src/handlers/messages/MESSAGE_REACTION_ADD.ts | 4 +- .../messages/MESSAGE_REACTION_REMOVE.ts | 6 +- .../messages/MESSAGE_REACTION_REMOVE_ALL.ts | 4 +- .../messages/MESSAGE_REACTION_REMOVE_EMOJI.ts | 4 +- src/handlers/messages/MESSAGE_UPDATE.ts | 2 +- src/handlers/misc/PRESENCE_UPDATE.ts | 4 +- src/handlers/misc/READY.ts | 2 +- src/handlers/misc/TYPING_START.ts | 4 +- src/handlers/misc/USER_UPDATE.ts | 2 +- src/handlers/roles/GUILD_ROLE_CREATE.ts | 4 +- src/handlers/roles/GUILD_ROLE_DELETE.ts | 4 +- src/handlers/roles/GUILD_ROLE_UPDATE.ts | 4 +- src/handlers/voice/VOICE_SERVER_UPDATE.ts | 4 +- src/handlers/voice/VOICE_STATE_UPDATE.ts | 4 +- src/handlers/webhooks/WEBHOOKS_UPDATE.ts | 4 +- .../channels/channelOverwriteHasPermission.ts | 8 +- src/helpers/channels/cloneChannel.ts | 2 +- src/helpers/channels/createChannel.ts | 6 +- src/helpers/channels/createStageInstance.ts | 4 +- .../{delete_channel.ts => deleteChannel.ts} | 0 src/helpers/channels/editChannel.ts | 2 +- src/helpers/channels/followChannel.ts | 2 +- src/helpers/channels/getStageInstance.ts | 2 +- src/helpers/channels/startTyping.ts | 2 +- src/helpers/channels/swapChannels.ts | 2 +- src/helpers/channels/threads/editThread.ts | 2 +- ...getActiveThread.ts => getActiveThreads.ts} | 2 +- ...rchivedThread.ts => getArchivedThreads.ts} | 6 +- .../channels/threads/getThreadMember.ts | 2 +- .../channels/threads/getThreadMembers.ts | 2 +- src/helpers/channels/threads/mod.ts | 30 +- .../threads/startThreadWithMessage.ts | 2 +- .../threads/startThreadWithoutMessage.ts | 2 +- .../{unlockThreaad.ts => unlockThread.ts} | 0 src/helpers/channels/updateBotVoiceState.ts | 4 +- src/helpers/channels/updateStageInstance.ts | 4 +- .../discovery/addDiscoverySubcategory.ts | 2 +- src/helpers/discovery/editDiscovery.ts | 4 +- .../discovery/getDiscoveryCategories.ts | 2 +- src/helpers/discovery/get_discovery.ts | 2 +- src/helpers/discovery/validDiscoveryTerm.ts | 2 +- src/helpers/emojis/createEmoji.ts | 2 +- src/helpers/emojis/editEmoji.ts | 2 +- src/helpers/guilds/createGuild.ts | 2 +- src/helpers/guilds/editGuild.ts | 2 +- src/helpers/guilds/editWelcomeScreen.ts | 33 +- src/helpers/guilds/editWidget.ts | 2 +- src/helpers/guilds/getAuditLogs.ts | 4 +- .../guilds/getAvailableVoiceRegions.ts | 2 +- src/helpers/guilds/getGuildPreview.ts | 2 +- src/helpers/guilds/getPruneCount.ts | 2 +- src/helpers/guilds/getVanityURL.ts | 2 +- src/helpers/guilds/getVoiceRegions.ts | 2 +- src/helpers/guilds/getWelcomeScreen.ts | 2 +- src/helpers/guilds/getWidget.ts | 2 +- src/helpers/guilds/getWidgetImageURL.ts | 2 +- src/helpers/guilds/getWidgetSettings.ts | 2 +- src/helpers/guilds/guildBannerURL.ts | 8 +- src/helpers/guilds/guildIconURL.ts | 8 +- src/helpers/guilds/guildSplashURL.ts | 12 +- .../batchEditSlashCommandPermissions.ts | 4 +- .../commands/createSlashCommand.ts | 6 +- .../commands/editSlashCommandPermissions.ts | 4 +- .../commands/editSlashResponse.ts | 12 +- .../interactions/commands/getSlashCommand.ts | 2 +- .../commands/getSlashCommandPermission.ts | 2 +- .../commands/getSlashCommandPermissions.ts | 2 +- .../interactions/commands/getSlashCommands.ts | 2 +- .../commands/upsertSlashCommand.ts | 6 +- .../commands/upsertSlashCommands.ts | 4 +- .../followups/editFollowupMessage.ts | 12 +- .../interactions/sendInteractionResponse.ts | 10 +- src/helpers/invites/createInvite.ts | 4 +- src/helpers/invites/deleteInvite.ts | 2 +- src/helpers/invites/getChannelInvites.ts | 2 +- src/helpers/invites/getInvite.ts | 4 +- src/helpers/invites/getInvites.ts | 2 +- src/helpers/members/avatarURL.ts | 8 +- src/helpers/members/banMember.ts | 2 +- src/helpers/members/editMember.ts | 6 +- src/helpers/members/fetchMembers.ts | 10 +- src/helpers/members/getDmChannel.ts | 2 +- src/helpers/members/getMember.ts | 2 +- src/helpers/members/getMembers.ts | 6 +- src/helpers/members/pruneMembers.ts | 2 +- src/helpers/members/searchMembers.ts | 4 +- .../{delete_messages.ts => deleteMessages.ts} | 0 src/helpers/messages/editMessage.ts | 6 +- src/helpers/messages/getMessages.ts | 2 +- src/helpers/messages/getReactions.ts | 2 +- src/helpers/messages/sendMessage.ts | 12 +- src/helpers/misc/editBotStatus.ts | 6 +- src/helpers/misc/getGatewayBot.ts | 2 +- src/helpers/mod.ts | 293 +++++++++--------- src/helpers/roles/createRole.ts | 2 +- src/helpers/roles/editRole.ts | 2 +- .../templates/createGuildFromTemplate.ts | 2 +- src/helpers/templates/editGuildTemplate.ts | 2 +- src/helpers/voice/connectToVoiceChannel.ts | 6 +- src/helpers/webhooks/createWebhook.ts | 2 +- src/helpers/webhooks/editWebhook.ts | 2 +- src/helpers/webhooks/editWebhookMessage.ts | 12 +- src/helpers/webhooks/editWebhookWithToken.ts | 2 +- src/helpers/webhooks/sendWebhook.ts | 8 +- src/rest/createRequestBody.ts | 2 +- src/rest/mod.ts | 20 +- src/rest/processGlobalQueue.ts | 14 +- src/rest/rest.ts | 18 +- src/rest/{run_method.ts => runMethod.ts} | 0 src/rest/{simplify_url.ts => simplifyUrl.ts} | 0 src/transformers/activity.ts | 4 +- src/transformers/application.ts | 4 +- .../applicationCommandPermission.ts | 6 +- src/transformers/auditlogEntry.ts | 6 +- src/transformers/channel.ts | 16 +- src/transformers/component.ts | 10 +- src/transformers/embed.ts | 4 +- src/transformers/guild.ts | 2 +- src/transformers/integration.ts | 6 +- src/transformers/interaction.ts | 6 +- src/transformers/invite.ts | 4 +- src/transformers/member.ts | 12 +- src/transformers/message.ts | 16 +- src/transformers/mod.ts | 2 +- src/transformers/presence.ts | 2 +- src/transformers/team.ts | 6 +- src/transformers/thread.ts | 13 +- src/transformers/voiceState.ts | 2 +- src/transformers/webhook.ts | 4 +- src/types/activity/activity.ts | 16 +- .../{activity_types.ts => activityTypes.ts} | 0 src/types/activity/mod.ts | 20 +- src/types/activity/presenceUpdate.ts | 2 +- src/types/applications/application.ts | 4 +- src/types/applications/mod.ts | 2 +- src/types/auditLog/auditLog.ts | 2 +- src/types/auditLog/auditLogEntry.ts | 8 +- src/types/auditLog/getGuildAuditLog.ts | 4 +- src/types/auditLog/mod.ts | 12 +- src/types/channels/channel.ts | 18 +- src/types/channels/channelTypes.ts | 5 +- src/types/channels/mod.ts | 32 +- src/types/channels/modifyChannel.ts | 8 +- src/types/channels/overwrite.ts | 6 +- .../channels/threads/listActiveThreads.ts | 2 +- src/types/channels/threads/startThread.ts | 7 +- src/types/channels/threads/threadListSync.ts | 2 +- .../channels/threads/threadMembersUpdate.ts | 2 +- src/types/codes/gatewayOpcodes.ts | 5 +- src/types/codes/mod.ts | 16 +- src/types/codes/rpcCloseEventCodes.ts | 5 +- src/types/codes/voiceCloseEventCodes.ts | 5 +- src/types/discordeno/createSlashCommand.ts | 2 +- src/types/discordeno/editWebhookMessage.ts | 2 +- src/types/discordeno/interactionResponse.ts | 2 +- src/types/discordeno/mod.ts | 8 +- src/types/discovery/discoveryCategory.ts | 2 +- src/types/discovery/mod.ts | 14 +- src/types/embeds/embed.ts | 18 +- src/types/embeds/embedTypes.ts | 2 +- src/types/embeds/mod.ts | 16 +- src/types/emojis/mod.ts | 6 +- src/types/gateway/gatewayIntents.ts | 5 +- src/types/gateway/getGatewayBot.ts | 2 +- src/types/gateway/identify.ts | 4 +- .../gateway/identifyConnectionProperties.ts | 4 +- src/types/gateway/mod.ts | 16 +- src/types/gateway/ready.ts | 2 +- src/types/gateway/statusUpdate.ts | 2 +- src/types/guilds/createGuild.ts | 16 +- src/types/guilds/createGuildChannel.ts | 4 +- src/types/guilds/createGuildRole.ts | 2 +- .../guilds/explicitContentFilterLevels.ts | 5 +- .../guilds/{get_guild.ts => getGuild.ts} | 0 src/types/guilds/getGuildWidgetImage.ts | 4 +- src/types/guilds/guild.ts | 40 +-- src/types/guilds/guildFeatures.ts | 5 +- src/types/guilds/guildPreview.ts | 4 +- src/types/guilds/mod.ts | 72 ++--- src/types/guilds/modifyGuild.ts | 20 +- src/types/guilds/modifyGuildRole.ts | 2 +- src/types/guilds/modifyGuildWelcomeScreen.ts | 2 +- src/types/guilds/premiumTiers.ts | 5 +- ...voice_state.ts => updateSelfVoiceState.ts} | 0 src/types/guilds/verificationLevels.ts | 5 +- src/types/guilds/welcomeScreen.ts | 2 +- src/types/integrations/integration.ts | 8 +- src/types/integrations/mod.ts | 12 +- .../commands/applicationCommand.ts | 4 +- .../applicationCommandCallbackData.ts | 2 +- .../applicationCommandCreateUpdateDelete.ts | 2 +- .../applicationCommandInteractionData.ts | 6 +- ...applicationCommandInteractionDataOption.ts | 2 +- ...plicationCommandInteractionDataResolved.ts | 2 +- .../commands/applicationCommandOption.ts | 8 +- .../commands/applicationCommandOptionTypes.ts | 5 +- .../commands/applicationCommandPermissions.ts | 4 +- .../commands/applicationCommandTypes.ts | 5 +- .../createGlobalApplicationCommand.ts | 4 +- .../commands/createGuildApplicationCommand.ts | 2 +- .../commands/editGlobalApplicationCommand.ts | 4 +- .../commands/editGuildApplicationCommand.ts | 2 +- .../guildApplicationCommandPermissions.ts | 2 +- src/types/interactions/interaction.ts | 6 +- .../interactions/interactionGuildMember.ts | 2 +- src/types/interactions/interactionResponse.ts | 6 +- .../interactions/interactionResponseTypes.ts | 5 +- src/types/interactions/messageInteraction.ts | 4 +- src/types/interactions/mod.ts | 44 +-- src/types/invites/createChannelInvite.ts | 4 +- src/types/invites/invite.ts | 6 +- src/types/invites/inviteCreate.ts | 4 +- src/types/invites/inviteStageInstance.ts | 2 +- src/types/invites/mod.ts | 14 +- src/types/invites/targetTypes.ts | 5 +- src/types/members/guildMemberAdd.ts | 2 +- src/types/members/guildMembersChunk.ts | 4 +- src/types/members/mod.ts | 18 +- src/types/messages/allowedMentions.ts | 4 +- src/types/messages/components/actionRow.ts | 4 +- .../messages/components/buttonComponent.ts | 9 +- src/types/messages/components/buttonData.ts | 4 +- src/types/messages/components/buttonStyles.ts | 5 +- .../messages/components/messageComponents.ts | 6 +- src/types/messages/components/selectData.ts | 4 +- src/types/messages/components/selectMenu.ts | 6 +- src/types/messages/createMessage.ts | 8 +- src/types/messages/editMessage.ts | 6 +- src/types/messages/message.ts | 22 +- src/types/messages/messageActivity.ts | 4 +- src/types/messages/messageActivityTypes.ts | 5 +- src/types/messages/messageReactionAdd.ts | 2 +- src/types/messages/messageReactionRemove.ts | 2 +- .../messages/messageReactionRemoveAll.ts | 2 +- .../messages/messageReactionRemoveEmoji.ts | 2 +- src/types/messages/messageSticker.ts | 4 +- .../messages/messageStickerFormatTypes.ts | 5 +- src/types/messages/messageStickerItem.ts | 4 +- src/types/messages/mod.ts | 56 ++-- src/types/misc/imageFormat.ts | 2 +- src/types/misc/imageSize.ts | 2 +- src/types/misc/mod.ts | 6 +- src/types/misc/typingStart.ts | 2 +- src/types/mod.ts | 2 +- src/types/oauth2/botAuthQuery.ts | 4 +- .../getCurrentAuthorizationInformation.ts | 4 +- src/types/oauth2/mod.ts | 4 +- src/types/oauth2/scopes.ts | 2 +- .../permissions/bitwisePermissionFlags.ts | 5 +- src/types/permissions/mod.ts | 6 +- src/types/permissions/permissionStrings.ts | 4 +- src/types/permissions/role.ts | 2 +- src/types/teams/mod.ts | 4 +- src/types/teams/team.ts | 2 +- src/types/teams/teamMember.ts | 4 +- src/types/templates/mod.ts | 4 +- src/types/users/connection.ts | 4 +- src/types/users/mod.ts | 12 +- src/types/users/premiumTypes.ts | 5 +- src/types/users/user.ts | 10 +- src/types/users/visibilityTypes.ts | 5 +- src/types/voice/mod.ts | 8 +- src/types/voice/voiceState.ts | 2 +- src/types/webhooks/editWebhookMessage.ts | 6 +- src/types/webhooks/executeWebhook.ts | 4 +- src/types/webhooks/mod.ts | 12 +- src/types/webhooks/webhook.ts | 6 +- ...discordWebhookTypes.ts => webhookTypes.ts} | 0 src/util/mod.ts | 4 +- src/util/permissions.ts | 10 +- src/util/utils.ts | 42 ++- src/ws/StartGatewayOptions.ts | 4 +- src/ws/createShard.ts | 28 +- src/ws/handleOnMessage.ts | 18 +- src/ws/heartbeat.ts | 6 +- src/ws/identify.ts | 4 +- src/ws/mod.ts | 16 +- src/ws/resharder.ts | 2 +- src/ws/resume.ts | 7 +- src/ws/{spawn_shards.ts => spawnShards.ts} | 0 src/ws/ws.ts | 4 +- tests/helpers/channels/categoryChannels.ts | 4 +- .../channels/channelOverwriteHasPermission.ts | 12 +- tests/helpers/channels/createChannel.ts | 6 +- .../channels/deleteChannelOverwrite.ts | 12 +- tests/helpers/guilds/createGuild.ts | 4 +- tests/helpers/guilds/deleteGuild.ts | 2 - tests/helpers/guilds/editGuild.ts | 2 - .../guilds/getAvailableVoiceRegions.ts | 4 - tests/helpers/guilds/getBan.ts | 5 +- tests/helpers/guilds/getBans.ts | 10 +- tests/helpers/guilds/getGuild.ts | 3 - tests/helpers/members/ban.ts | 2 +- tests/helpers/messages/sendMessage.ts | 22 +- tests/local.ts | 4 +- tests/mod.ts | 58 ++-- tests/util/validateLength.ts | 2 +- 334 files changed, 1121 insertions(+), 1214 deletions(-) rename src/helpers/channels/{delete_channel.ts => deleteChannel.ts} (100%) rename src/helpers/channels/threads/{getActiveThread.ts => getActiveThreads.ts} (97%) rename src/helpers/channels/threads/{getArchivedThread.ts => getArchivedThreads.ts} (95%) rename src/helpers/channels/threads/{unlockThreaad.ts => unlockThread.ts} (100%) rename src/helpers/messages/{delete_messages.ts => deleteMessages.ts} (100%) rename src/rest/{run_method.ts => runMethod.ts} (100%) rename src/rest/{simplify_url.ts => simplifyUrl.ts} (100%) rename src/types/activity/{activity_types.ts => activityTypes.ts} (100%) rename src/types/guilds/{get_guild.ts => getGuild.ts} (100%) rename src/types/guilds/{update_self_voice_state.ts => updateSelfVoiceState.ts} (100%) rename src/types/webhooks/{discordWebhookTypes.ts => webhookTypes.ts} (100%) rename src/ws/{spawn_shards.ts => spawnShards.ts} (100%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6cdd3cb57..4fa1288e8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -69,10 +69,10 @@ export interface User { /** The user's email */ email?: string | null; /** The flags on a user's account */ - flags?: DiscordUserFlags; + flags?: UserFlags; /** The type of Nitro subscription on a user's account */ - premiumType?: DiscordPremiumTypes; + premiumType?: PremiumTypes; /** The public flags on a user's account */ - publicFlags?: DiscordUserFlags; + publicFlags?: UserFlags; } ``` diff --git a/src/bot.ts b/src/bot.ts index ce5afaa05..3ca1c5691 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -11,8 +11,8 @@ import { simplifyUrl, } from "./rest/mod.ts"; import type { RestPayload, RestRateLimitedPath, RestRequest } from "./rest/rest.ts"; -import { DiscordGatewayIntents, Intents } from "./types/gateway/gateway_intents.ts"; -import { GetGatewayBot } from "./types/gateway/get_gateway_bot.ts"; +import { GatewayIntents, Intents } from "./types/gateway/gatewayIntents.ts"; +import { GetGatewayBot } from "./types/gateway/getGatewayBot.ts"; import { bigintToSnowflake, snowflakeToBigint } from "./util/bigint.ts"; import { Collection } from "./util/collection.ts"; import { @@ -42,7 +42,7 @@ import { USER_AGENT, } from "./util/constants.ts"; import { Errors } from "./types/discordeno/errors.ts"; -import { DiscordGatewayPayload, GatewayDispatchEventNames, GatewayPayload } from "./types/gateway/gateway_payload.ts"; +import { DiscordGatewayPayload, GatewayDispatchEventNames, GatewayPayload } from "./types/gateway/gatewayPayload.ts"; import { closeWS, handleOnMessage, @@ -57,7 +57,7 @@ import { DiscordenoShard, processGatewayQueue, } from "./ws/mod.ts"; -import { validateLength } from "./util/validate_length.ts"; +import { validateLength } from "./util/validateLength.ts"; import { delay, formatImageURL, @@ -68,7 +68,7 @@ import { validateSlashOptions, } from "./util/utils.ts"; import { iconBigintToHash, iconHashToBigInt } from "./util/hash.ts"; -import { calculateShardId } from "./util/calculate_shard_id.ts"; +import { calculateShardId } from "./util/calculateShardId.ts"; import * as handlers from "./handlers/mod.ts"; import { DiscordenoInteraction, transformInteraction } from "./transformers/interaction.ts"; import { DiscordenoIntegration, transformIntegration } from "./transformers/integration.ts"; @@ -81,7 +81,7 @@ import { DiscordenoEmoji, transformEmoji } from "./transformers/emoji.ts"; import { transformActivity } from "./transformers/activity.ts"; import { DiscordenoPresence, transformPresence } from "./transformers/presence.ts"; import { DiscordReady } from "./types/gateway/ready.ts"; -import { urlToBase64 } from "./util/url_to_base64.ts"; +import { urlToBase64 } from "./util/urlToBase64.ts"; import { transformAttachment } from "./transformers/attachment.ts"; import { transformEmbed } from "./transformers/embed.ts"; import { transformComponent } from "./transformers/component.ts"; @@ -90,7 +90,7 @@ import { transformThread } from "./transformers/thread.ts"; import { transformWebhook } from "./transformers/webhook.ts"; import { transformAuditlogEntry } from "./transformers/auditlogEntry.ts"; import { transformApplicationCommandPermission } from "./transformers/applicationCommandPermission.ts"; -import { StatusUpdate } from "./types/gateway/status_update.ts"; +import { StatusUpdate } from "./types/gateway/statusUpdate.ts"; import { calculateBits, calculatePermissions } from "./util/permissions.ts"; type CacheOptions = @@ -113,7 +113,7 @@ export function createBot( applicationId: options.applicationId || options.botId, token: `Bot ${options.token}`, events: createEventHandlers(options.events), - intents: options.intents.reduce((bits, next) => (bits |= DiscordGatewayIntents[next]), 0), + intents: options.intents.reduce((bits, next) => (bits |= GatewayIntents[next]), 0), botGatewayData: options.botGatewayData, activeGuildIds: new Set(), constants: createBotConstants(), @@ -125,7 +125,7 @@ export function createBot( // @ts-ignore itoh cache types plz bot.cache = createCache(bot as Bot, options.cache); - return bot as unknown as Bot; + return (bot as unknown) as Bot; } export function createEventHandlers(events: Partial): EventHandlers { @@ -372,7 +372,7 @@ export function createGatewayManager( $device: options.$device ?? "Discordeno", intents: (Array.isArray(options.intents) - ? options.intents.reduce((bits, next) => (bits |= DiscordGatewayIntents[next]), 0) + ? options.intents.reduce((bits, next) => (bits |= GatewayIntents[next]), 0) : options.intents) ?? 0, shard: options.shard ?? [0, options.shardsRecommended ?? 1], urlWSS: options.urlWSS ?? "wss://gateway.discord.gg/?v=9&encoding=json", @@ -419,7 +419,7 @@ export interface CreateBotOptions { botId: bigint; applicationId?: bigint; events: Partial; - intents: (keyof typeof DiscordGatewayIntents)[]; + intents: (keyof typeof GatewayIntents)[]; botGatewayData?: GetGatewayBot; rest?: Omit; handleDiscordPayload?: GatewayManager["handleDiscordPayload"]; @@ -443,7 +443,7 @@ export interface Bot { applicationId: bigint; token: string; - intents: DiscordGatewayIntents; + intents: GatewayIntents; urlWSS: string; botGatewayData?: GetGatewayBot; utils: ReturnType; @@ -466,7 +466,6 @@ export interface Helpers { addReactions: typeof helpers.addReactions; addRole: typeof helpers.addRole; avatarURL: typeof helpers.avatarURL; - ban: typeof helpers.ban; banMember: typeof helpers.banMember; batchEditSlashCommandPermissions: typeof helpers.batchEditSlashCommandPermissions; channelOverwriteHasPermission: typeof helpers.channelOverwriteHasPermission; @@ -632,7 +631,6 @@ export function createBaseHelpers(options: Partial) { addReactions: options.addReactions || helpers.addReactions, addRole: options.addRole || helpers.addRole, avatarURL: options.avatarURL || helpers.avatarURL, - ban: options.ban || helpers.ban, banMember: options.banMember || helpers.banMember, batchEditSlashCommandPermissions: options.batchEditSlashCommandPermissions || helpers.batchEditSlashCommandPermissions, @@ -865,7 +863,7 @@ export interface GatewayManager { $os: string; $browser: string; $device: string; - intents: number | (keyof typeof DiscordGatewayIntents)[]; + intents: number | (keyof typeof GatewayIntents)[]; shard: [number, number]; presence?: Omit; diff --git a/src/cache.ts b/src/cache.ts index 3cdd49215..6f20b06ad 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -4,7 +4,7 @@ import type { DiscordenoGuild } from "./transformers/guild.ts"; import type { DiscordenoMember, DiscordenoUser } from "./transformers/member.ts"; import type { DiscordenoMessage } from "./transformers/message.ts"; import { DiscordenoPresence } from "./transformers/presence.ts"; -import { GuildMember } from "./types/members/guild_member.ts"; +import { GuildMember } from "./types/members/guildMember.ts"; import { Collection } from "./util/collection.ts"; function messageSweeper(bot: Bot, message: DiscordenoMessage) { diff --git a/src/handlers/channels/CHANNEL_CREATE.ts b/src/handlers/channels/CHANNEL_CREATE.ts index 1e1e08a8e..f3ba05270 100644 --- a/src/handlers/channels/CHANNEL_CREATE.ts +++ b/src/handlers/channels/CHANNEL_CREATE.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../types/channels/channel.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/handlers/channels/CHANNEL_DELETE.ts b/src/handlers/channels/CHANNEL_DELETE.ts index 0c74582bf..babb58d7e 100644 --- a/src/handlers/channels/CHANNEL_DELETE.ts +++ b/src/handlers/channels/CHANNEL_DELETE.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../types/channels/channel.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/channels/CHANNEL_PINS_UPDATE.ts b/src/handlers/channels/CHANNEL_PINS_UPDATE.ts index 8ee62c07e..4b100b88e 100644 --- a/src/handlers/channels/CHANNEL_PINS_UPDATE.ts +++ b/src/handlers/channels/CHANNEL_PINS_UPDATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { ChannelPinsUpdate } from "../../types/channels/channel_pins_update.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { ChannelPinsUpdate } from "../../types/channels/channelPinsUpdate.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleChannelPinsUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/CHANNEL_UPDATE.ts b/src/handlers/channels/CHANNEL_UPDATE.ts index 2e0449ab3..f5af206a1 100644 --- a/src/handlers/channels/CHANNEL_UPDATE.ts +++ b/src/handlers/channels/CHANNEL_UPDATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; import type { Channel } from "../../types/channels/channel.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleChannelUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/STAGE_INSTANCE_CREATE.ts b/src/handlers/channels/STAGE_INSTANCE_CREATE.ts index 519d97047..ac77f9d79 100644 --- a/src/handlers/channels/STAGE_INSTANCE_CREATE.ts +++ b/src/handlers/channels/STAGE_INSTANCE_CREATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { StageInstance } from "../../types/channels/stage_instance.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleStageInstanceCreate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/STAGE_INSTANCE_DELETE.ts b/src/handlers/channels/STAGE_INSTANCE_DELETE.ts index 64ea6d2be..a9c0014d8 100644 --- a/src/handlers/channels/STAGE_INSTANCE_DELETE.ts +++ b/src/handlers/channels/STAGE_INSTANCE_DELETE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { StageInstance } from "../../types/channels/stage_instance.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleStageInstanceDelete(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts b/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts index e30ff830d..cb4f997d3 100644 --- a/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts +++ b/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { StageInstance } from "../../types/channels/stage_instance.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleStageInstanceUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/THREAD_CREATE.ts b/src/handlers/channels/THREAD_CREATE.ts index 94bb873e8..db69897cc 100644 --- a/src/handlers/channels/THREAD_CREATE.ts +++ b/src/handlers/channels/THREAD_CREATE.ts @@ -1,9 +1,9 @@ import { Bot } from "../../bot.ts"; import { Channel } from "../../types/channels/channel.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; -export async function handleThreadCreate(bot: Bot, data: DiscordGatewayPayload) { +export async function handleThreadCreate(bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as SnakeCasedPropertiesDeep; // bot.events.threadCreate(bot, payload); diff --git a/src/handlers/channels/THREAD_DELETE.ts b/src/handlers/channels/THREAD_DELETE.ts index 171230943..82e41d922 100644 --- a/src/handlers/channels/THREAD_DELETE.ts +++ b/src/handlers/channels/THREAD_DELETE.ts @@ -1,7 +1,7 @@ // import { eventHandlers } from "../../bot.ts"; // import { cacheHandlers } from "../../cache.ts"; import { Channel } from "../../types/channels/channel.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadDelete(data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/THREAD_LIST_SYNC.ts b/src/handlers/channels/THREAD_LIST_SYNC.ts index 167ae9349..407b2e4b5 100644 --- a/src/handlers/channels/THREAD_LIST_SYNC.ts +++ b/src/handlers/channels/THREAD_LIST_SYNC.ts @@ -1,7 +1,7 @@ // import { eventHandlers } from "../../bot.ts"; // import { cacheHandlers } from "../../cache.ts"; -import { ThreadListSync } from "../../types/channels/threads/thread_list_sync.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { ThreadListSync } from "../../types/channels/threads/threadListSync.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; // import { channelToThread } from "../../util/transformers/channel_to_thread.ts"; import { Collection } from "../../util/collection.ts"; diff --git a/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts b/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts index 4a7030097..ef2a7a139 100644 --- a/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts +++ b/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts @@ -1,7 +1,7 @@ // import { eventHandlers } from "../../bot.ts"; // import { cacheHandlers } from "../../cache.ts"; -import { ThreadMembersUpdate } from "../../types/channels/threads/thread_members_update.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { ThreadMembersUpdate } from "../../types/channels/threads/threadMembersUpdate.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; // import { threadMembersUpdateModified } from "../../util/transformers/thread_members_update_modified.ts"; diff --git a/src/handlers/channels/THREAD_MEMBER_UPDATE.ts b/src/handlers/channels/THREAD_MEMBER_UPDATE.ts index fce3dfd92..be696bb7e 100644 --- a/src/handlers/channels/THREAD_MEMBER_UPDATE.ts +++ b/src/handlers/channels/THREAD_MEMBER_UPDATE.ts @@ -1,7 +1,7 @@ // import { eventHandlers } from "../../bot.ts"; // import { cacheHandlers } from "../../cache.ts"; -import { ThreadMember } from "../../types/channels/threads/thread_member.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { ThreadMember } from "../../types/channels/threads/threadMember.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; export async function handleThreadMemberUpdate(data: DiscordGatewayPayload) { diff --git a/src/handlers/channels/THREAD_UPDATE.ts b/src/handlers/channels/THREAD_UPDATE.ts index ee772ce85..41a61727a 100644 --- a/src/handlers/channels/THREAD_UPDATE.ts +++ b/src/handlers/channels/THREAD_UPDATE.ts @@ -1,7 +1,7 @@ // import { eventHandlers } from "../../bot.ts"; // import { cacheHandlers } from "../../cache.ts"; import { Channel } from "../../types/channels/channel.ts"; -import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; // import { channelToThread } from "../../util/transformers/channel_to_thread.ts"; diff --git a/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts b/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts index d5917da1e..bd9db7c6a 100644 --- a/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts +++ b/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { GuildEmojisUpdate } from "../../types/emojis/guild_emojis_update.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { GuildEmojisUpdate } from "../../types/emojis/guildEmojisUpdate.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; import { Collection } from "../../util/collection.ts"; diff --git a/src/handlers/guilds/GUILD_BAN_ADD.ts b/src/handlers/guilds/GUILD_BAN_ADD.ts index 5b81e9b57..67206ff40 100644 --- a/src/handlers/guilds/GUILD_BAN_ADD.ts +++ b/src/handlers/guilds/GUILD_BAN_ADD.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildBanAddRemove } from "../../types/guilds/guild_ban_add_remove.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildBanAddRemove } from "../../types/guilds/guildBanAddRemove.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildBanAdd(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/guilds/GUILD_BAN_REMOVE.ts b/src/handlers/guilds/GUILD_BAN_REMOVE.ts index 45c7d1b74..b2d26f5e0 100644 --- a/src/handlers/guilds/GUILD_BAN_REMOVE.ts +++ b/src/handlers/guilds/GUILD_BAN_REMOVE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildBanAddRemove } from "../../types/guilds/guild_ban_add_remove.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildBanAddRemove } from "../../types/guilds/guildBanAddRemove.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildBanRemove(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/guilds/GUILD_CREATE.ts b/src/handlers/guilds/GUILD_CREATE.ts index 3581f6e7a..cda31cabe 100644 --- a/src/handlers/guilds/GUILD_CREATE.ts +++ b/src/handlers/guilds/GUILD_CREATE.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Guild } from "../../types/guilds/guild.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/guilds/GUILD_DELETE.ts b/src/handlers/guilds/GUILD_DELETE.ts index 0e8de9e23..fee609421 100644 --- a/src/handlers/guilds/GUILD_DELETE.ts +++ b/src/handlers/guilds/GUILD_DELETE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { UnavailableGuild } from "../../types/guilds/unavailable_guild.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { UnavailableGuild } from "../../types/guilds/unavailableGuild.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildDelete(bot: Bot, data: DiscordGatewayPayload, shardId: number) { diff --git a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts index 3bc9be951..013c6456f 100644 --- a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts +++ b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildIntegrationsUpdate } from "../../types/integrations/guild_integrations_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildIntegrationsUpdate } from "../../types/integrations/guildIntegrationsUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildIntegrationsUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/guilds/GUILD_LOADED_DD.ts b/src/handlers/guilds/GUILD_LOADED_DD.ts index a62b9ae72..ca988fb99 100644 --- a/src/handlers/guilds/GUILD_LOADED_DD.ts +++ b/src/handlers/guilds/GUILD_LOADED_DD.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Guild } from "../../types/guilds/guild.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/guilds/GUILD_UPDATE.ts b/src/handlers/guilds/GUILD_UPDATE.ts index 168d348e4..52ab69f23 100644 --- a/src/handlers/guilds/GUILD_UPDATE.ts +++ b/src/handlers/guilds/GUILD_UPDATE.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Guild } from "../../types/guilds/guild.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/integrations/INTEGRATION_CREATE.ts b/src/handlers/integrations/INTEGRATION_CREATE.ts index c298ddf46..549e15588 100644 --- a/src/handlers/integrations/INTEGRATION_CREATE.ts +++ b/src/handlers/integrations/INTEGRATION_CREATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { IntegrationCreateUpdate } from "../../types/integrations/integration_create_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { IntegrationCreateUpdate } from "../../types/integrations/integrationCreateUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleIntegrationCreate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/integrations/INTEGRATION_DELETE.ts b/src/handlers/integrations/INTEGRATION_DELETE.ts index aaf3f93ab..fc8ef77eb 100644 --- a/src/handlers/integrations/INTEGRATION_DELETE.ts +++ b/src/handlers/integrations/INTEGRATION_DELETE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { IntegrationDelete } from "../../types/integrations/integration_delete.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { IntegrationDelete } from "../../types/integrations/integrationDelete.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleIntegrationDelete(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/integrations/INTEGRATION_UPDATE.ts b/src/handlers/integrations/INTEGRATION_UPDATE.ts index c36b8d958..2de0aea0f 100644 --- a/src/handlers/integrations/INTEGRATION_UPDATE.ts +++ b/src/handlers/integrations/INTEGRATION_UPDATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { IntegrationCreateUpdate } from "../../types/integrations/integration_create_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { IntegrationCreateUpdate } from "../../types/integrations/integrationCreateUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleIntegrationUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/interactions/INTERACTION_CREATE.ts b/src/handlers/interactions/INTERACTION_CREATE.ts index 56aac522b..dde1d8685 100644 --- a/src/handlers/interactions/INTERACTION_CREATE.ts +++ b/src/handlers/interactions/INTERACTION_CREATE.ts @@ -1,5 +1,5 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Interaction } from "../../types/interactions/interaction.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/invites/INVITE_CREATE.ts b/src/handlers/invites/INVITE_CREATE.ts index 4ce57ca7b..9fcd2d3fa 100644 --- a/src/handlers/invites/INVITE_CREATE.ts +++ b/src/handlers/invites/INVITE_CREATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { InviteCreate } from "../../types/invites/invite_create.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { InviteCreate } from "../../types/invites/inviteCreate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleInviteCreate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/invites/INVITE_DELETE.ts b/src/handlers/invites/INVITE_DELETE.ts index 45d45247c..2fadb7e86 100644 --- a/src/handlers/invites/INVITE_DELETE.ts +++ b/src/handlers/invites/INVITE_DELETE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { InviteDelete } from "../../types/invites/invite_delete.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { InviteDelete } from "../../types/invites/inviteDelete.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleInviteDelete(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/members/GUILD_MEMBERS_CHUNK.ts b/src/handlers/members/GUILD_MEMBERS_CHUNK.ts index 8db74180b..62b5dfc25 100644 --- a/src/handlers/members/GUILD_MEMBERS_CHUNK.ts +++ b/src/handlers/members/GUILD_MEMBERS_CHUNK.ts @@ -1,7 +1,7 @@ import { Bot } from "../../bot.ts"; import { statusTypes } from "../../transformers/presence.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildMembersChunk } from "../../types/members/guild_members_chunk.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildMembersChunk } from "../../types/members/guildMembersChunk.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildMembersChunk(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/members/GUILD_MEMBER_ADD.ts b/src/handlers/members/GUILD_MEMBER_ADD.ts index 86fae5f33..68e5aa38d 100644 --- a/src/handlers/members/GUILD_MEMBER_ADD.ts +++ b/src/handlers/members/GUILD_MEMBER_ADD.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildMemberAdd } from "../../types/members/guild_member_add.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildMemberAdd } from "../../types/members/guildMemberAdd.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildMemberAdd(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/members/GUILD_MEMBER_REMOVE.ts b/src/handlers/members/GUILD_MEMBER_REMOVE.ts index 1ab13e320..3d1b6e39d 100644 --- a/src/handlers/members/GUILD_MEMBER_REMOVE.ts +++ b/src/handlers/members/GUILD_MEMBER_REMOVE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildMemberRemove } from "../../types/members/guild_member_remove.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildMemberRemove } from "../../types/members/guildMemberRemove.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; import { snowflakeToBigint } from "../../util/bigint.ts"; diff --git a/src/handlers/members/GUILD_MEMBER_UPDATE.ts b/src/handlers/members/GUILD_MEMBER_UPDATE.ts index 1424bc5ed..a9377d07b 100644 --- a/src/handlers/members/GUILD_MEMBER_UPDATE.ts +++ b/src/handlers/members/GUILD_MEMBER_UPDATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildMemberUpdate } from "../../types/members/guild_member_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildMemberUpdate } from "../../types/members/guildMemberUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildMemberUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_CREATE.ts b/src/handlers/messages/MESSAGE_CREATE.ts index 4769be7a5..1dbf3dba6 100644 --- a/src/handlers/messages/MESSAGE_CREATE.ts +++ b/src/handlers/messages/MESSAGE_CREATE.ts @@ -1,5 +1,5 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Message } from "../../types/messages/message.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/messages/MESSAGE_DELETE.ts b/src/handlers/messages/MESSAGE_DELETE.ts index 0aea5be65..21172c115 100644 --- a/src/handlers/messages/MESSAGE_DELETE.ts +++ b/src/handlers/messages/MESSAGE_DELETE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageDelete } from "../../types/messages/message_delete.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageDelete } from "../../types/messages/messageDelete.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageDelete(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_DELETE_BULK.ts b/src/handlers/messages/MESSAGE_DELETE_BULK.ts index 90ae2319a..5c450a801 100644 --- a/src/handlers/messages/MESSAGE_DELETE_BULK.ts +++ b/src/handlers/messages/MESSAGE_DELETE_BULK.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageDeleteBulk } from "../../types/messages/message_delete_bulk.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageDeleteBulk } from "../../types/messages/messageDeleteBulk.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageDeleteBulk(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_REACTION_ADD.ts b/src/handlers/messages/MESSAGE_REACTION_ADD.ts index 86550e251..71c04e253 100644 --- a/src/handlers/messages/MESSAGE_REACTION_ADD.ts +++ b/src/handlers/messages/MESSAGE_REACTION_ADD.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageReactionAdd } from "../../types/messages/message_reaction_add.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageReactionAdd } from "../../types/messages/messageReactionAdd.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageReactionAdd(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts index c44b65c98..69b8b0fc1 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts @@ -1,6 +1,6 @@ -import { Bot, } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageReactionRemove } from "../../types/messages/message_reaction_remove.ts"; +import { Bot } from "../../bot.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageReactionRemove } from "../../types/messages/messageReactionRemove.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageReactionRemove(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts index 1a7e5e35b..417001433 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageReactionRemoveAll } from "../../types/messages/message_reaction_remove_all.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageReactionRemoveAll } from "../../types/messages/messageReactionRemoveAll.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageReactionRemoveAll(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts b/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts index 6a63e970c..342f23bfa 100644 --- a/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts +++ b/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { MessageReactionRemoveEmoji } from "../../types/messages/message_reaction_remove_emoji.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { MessageReactionRemoveEmoji } from "../../types/messages/messageReactionRemoveEmoji.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleMessageReactionRemoveEmoji(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/messages/MESSAGE_UPDATE.ts b/src/handlers/messages/MESSAGE_UPDATE.ts index e529d0317..1f368cd9e 100644 --- a/src/handlers/messages/MESSAGE_UPDATE.ts +++ b/src/handlers/messages/MESSAGE_UPDATE.ts @@ -1,5 +1,5 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { Message } from "../../types/messages/message.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/misc/PRESENCE_UPDATE.ts b/src/handlers/misc/PRESENCE_UPDATE.ts index 6c90e6799..248e05a90 100644 --- a/src/handlers/misc/PRESENCE_UPDATE.ts +++ b/src/handlers/misc/PRESENCE_UPDATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { PresenceUpdate } from "../../types/activity/presence_update.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { PresenceUpdate } from "../../types/activity/presenceUpdate.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handlePresenceUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/misc/READY.ts b/src/handlers/misc/READY.ts index d0528e2df..1dc8ef24c 100644 --- a/src/handlers/misc/READY.ts +++ b/src/handlers/misc/READY.ts @@ -1,5 +1,5 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { DiscordReady } from "../../types/gateway/ready.ts"; export function handleReady(bot: Bot, data: DiscordGatewayPayload, shardId: number) { diff --git a/src/handlers/misc/TYPING_START.ts b/src/handlers/misc/TYPING_START.ts index d7886e2ae..aa7f522ca 100644 --- a/src/handlers/misc/TYPING_START.ts +++ b/src/handlers/misc/TYPING_START.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { TypingStart } from "../../types/misc/typing_start.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { TypingStart } from "../../types/misc/typingStart.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export function handleTypingStart(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/misc/USER_UPDATE.ts b/src/handlers/misc/USER_UPDATE.ts index c194cc11e..afb5cf58d 100644 --- a/src/handlers/misc/USER_UPDATE.ts +++ b/src/handlers/misc/USER_UPDATE.ts @@ -1,5 +1,5 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; import type { User } from "../../types/users/user.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/roles/GUILD_ROLE_CREATE.ts b/src/handlers/roles/GUILD_ROLE_CREATE.ts index 773bba64c..b5d8c197d 100644 --- a/src/handlers/roles/GUILD_ROLE_CREATE.ts +++ b/src/handlers/roles/GUILD_ROLE_CREATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildRoleCreate } from "../../types/guilds/guild_role_create.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildRoleCreate } from "../../types/guilds/guildRoleCreate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildRoleCreate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/roles/GUILD_ROLE_DELETE.ts b/src/handlers/roles/GUILD_ROLE_DELETE.ts index 9f3480095..bde34292f 100644 --- a/src/handlers/roles/GUILD_ROLE_DELETE.ts +++ b/src/handlers/roles/GUILD_ROLE_DELETE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildRoleDelete } from "../../types/guilds/guild_role_delete.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildRoleDelete } from "../../types/guilds/guildRoleDelete.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildRoleDelete(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/roles/GUILD_ROLE_UPDATE.ts b/src/handlers/roles/GUILD_ROLE_UPDATE.ts index e928737f2..c2d0d8eda 100644 --- a/src/handlers/roles/GUILD_ROLE_UPDATE.ts +++ b/src/handlers/roles/GUILD_ROLE_UPDATE.ts @@ -1,6 +1,6 @@ import { Bot } from "../../bot.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { GuildRoleUpdate } from "../../types/guilds/guild_role_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { GuildRoleUpdate } from "../../types/guilds/guildRoleUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; export async function handleGuildRoleUpdate(bot: Bot, data: DiscordGatewayPayload) { diff --git a/src/handlers/voice/VOICE_SERVER_UPDATE.ts b/src/handlers/voice/VOICE_SERVER_UPDATE.ts index edaedf6ba..b706eae57 100644 --- a/src/handlers/voice/VOICE_SERVER_UPDATE.ts +++ b/src/handlers/voice/VOICE_SERVER_UPDATE.ts @@ -1,7 +1,7 @@ import { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { VoiceServerUpdate } from "../../types/voice/voice_server_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { VoiceServerUpdate } from "../../types/voice/voiceServerUpdate.ts"; export async function handleVoiceServerUpdate(bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as SnakeCasedPropertiesDeep; diff --git a/src/handlers/voice/VOICE_STATE_UPDATE.ts b/src/handlers/voice/VOICE_STATE_UPDATE.ts index 59b2a7c31..f447589e8 100644 --- a/src/handlers/voice/VOICE_STATE_UPDATE.ts +++ b/src/handlers/voice/VOICE_STATE_UPDATE.ts @@ -1,5 +1,5 @@ -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { VoiceState } from "../../types/voice/voice_state.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { VoiceState } from "../../types/voice/voiceState.ts"; import { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/handlers/webhooks/WEBHOOKS_UPDATE.ts b/src/handlers/webhooks/WEBHOOKS_UPDATE.ts index 3994fd226..266ca8357 100644 --- a/src/handlers/webhooks/WEBHOOKS_UPDATE.ts +++ b/src/handlers/webhooks/WEBHOOKS_UPDATE.ts @@ -1,5 +1,5 @@ -import type { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts"; -import type { WebhookUpdate } from "../../types/webhooks/webhooks_update.ts"; +import type { DiscordGatewayPayload } from "../../types/gateway/gatewayPayload.ts"; +import type { WebhookUpdate } from "../../types/webhooks/webhooksUpdate.ts"; import { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/channels/channelOverwriteHasPermission.ts b/src/helpers/channels/channelOverwriteHasPermission.ts index aeb064bd2..429d6aeb0 100644 --- a/src/helpers/channels/channelOverwriteHasPermission.ts +++ b/src/helpers/channels/channelOverwriteHasPermission.ts @@ -1,7 +1,7 @@ import { separateOverwrites } from "../../transformers/channel.ts"; import type { DiscordOverwrite } from "../../types/channels/overwrite.ts"; -import { DiscordBitwisePermissionFlags } from "../../types/permissions/bitwise_permission_flags.ts"; -import type { PermissionStrings } from "../../types/permissions/permission_strings.ts"; +import { BitwisePermissionFlags } from "../../types/permissions/bitwisePermissionFlags.ts"; +import type { PermissionStrings } from "../../types/permissions/permissionStrings.ts"; /** Checks if a channel overwrite for a user id or a role id has permission in this channel */ export function channelOverwriteHasPermission( @@ -24,10 +24,10 @@ export function channelOverwriteHasPermission( return permissions.every((perm) => { const [type, id, allowBits, denyBits] = separateOverwrites(overwrite); - if (BigInt(denyBits) & BigInt(DiscordBitwisePermissionFlags[perm])) { + if (BigInt(denyBits) & BigInt(BitwisePermissionFlags[perm])) { return false; } - if (BigInt(allowBits) & BigInt(DiscordBitwisePermissionFlags[perm])) { + if (BigInt(allowBits) & BigInt(BitwisePermissionFlags[perm])) { return true; } }); diff --git a/src/helpers/channels/cloneChannel.ts b/src/helpers/channels/cloneChannel.ts index 644f3f064..5eb14825a 100644 --- a/src/helpers/channels/cloneChannel.ts +++ b/src/helpers/channels/cloneChannel.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; import { DiscordenoChannel, separateOverwrites } from "../../transformers/channel.ts"; -import type { CreateGuildChannel } from "../../types/guilds/create_guild_channel.ts"; +import type { CreateGuildChannel } from "../../types/guilds/createGuildChannel.ts"; /** Create a copy of a channel */ export async function cloneChannel(bot: Bot, channel: DiscordenoChannel, reason?: string) { diff --git a/src/helpers/channels/createChannel.ts b/src/helpers/channels/createChannel.ts index f876dc0f4..541b1aeda 100644 --- a/src/helpers/channels/createChannel.ts +++ b/src/helpers/channels/createChannel.ts @@ -1,6 +1,6 @@ import type { Channel } from "../../types/channels/channel.ts"; -import { DiscordChannelTypes } from "../../types/channels/channel_types.ts"; -import type { CreateGuildChannel, DiscordCreateGuildChannel } from "../../types/guilds/create_guild_channel.ts"; +import { ChannelTypes } from "../../types/channels/channelTypes.ts"; +import type { CreateGuildChannel, DiscordCreateGuildChannel } from "../../types/guilds/createGuildChannel.ts"; import type { Bot } from "../../bot.ts"; /** Create a channel in your server. Bot needs MANAGE_CHANNEL permissions in the server. */ @@ -28,7 +28,7 @@ export async function createChannel(bot: Bot, guildId: bigint, options?: CreateG allow: perm.allow ? bot.utils.calculateBits(perm.allow) : "0", deny: perm.deny ? bot.utils.calculateBits(perm.deny) : "0", })), - type: options?.type || DiscordChannelTypes.GuildText, + type: options?.type || ChannelTypes.GuildText, reason, } : {} diff --git a/src/helpers/channels/createStageInstance.ts b/src/helpers/channels/createStageInstance.ts index b41bdcc15..d32522c5e 100644 --- a/src/helpers/channels/createStageInstance.ts +++ b/src/helpers/channels/createStageInstance.ts @@ -1,6 +1,6 @@ -import type { StageInstance } from "../../types/channels/stage_instance.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; import type { Bot } from "../../bot.ts"; -import { PrivacyLevel } from "../../types/channels/privacy_level.ts"; +import { PrivacyLevel } from "../../types/channels/privacyLevel.ts"; /** Creates a new Stage instance associated to a Stage channel. Requires the user to be a moderator of the Stage channel. */ export async function createStageInstance(bot: Bot, channelId: bigint, topic: string, privacyLevel?: PrivacyLevel) { diff --git a/src/helpers/channels/delete_channel.ts b/src/helpers/channels/deleteChannel.ts similarity index 100% rename from src/helpers/channels/delete_channel.ts rename to src/helpers/channels/deleteChannel.ts diff --git a/src/helpers/channels/editChannel.ts b/src/helpers/channels/editChannel.ts index 2f1eba0d7..68b3fc494 100644 --- a/src/helpers/channels/editChannel.ts +++ b/src/helpers/channels/editChannel.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../types/channels/channel.ts"; -import type { ModifyChannel } from "../../types/channels/modify_channel.ts"; +import type { ModifyChannel } from "../../types/channels/modifyChannel.ts"; import type { Bot } from "../../bot.ts"; import { DiscordenoChannel } from "../../transformers/channel.ts"; diff --git a/src/helpers/channels/followChannel.ts b/src/helpers/channels/followChannel.ts index 22cf8a41b..82948cead 100644 --- a/src/helpers/channels/followChannel.ts +++ b/src/helpers/channels/followChannel.ts @@ -1,4 +1,4 @@ -import type { FollowedChannel } from "../../types/channels/followed_channel.ts"; +import type { FollowedChannel } from "../../types/channels/followedChannel.ts"; import type { Bot } from "../../bot.ts"; /** Follow a News Channel to send messages to a target channel. Requires the `MANAGE_WEBHOOKS` permission in the target channel. Returns the webhook id. */ diff --git a/src/helpers/channels/getStageInstance.ts b/src/helpers/channels/getStageInstance.ts index 2f72542de..6cded1faa 100644 --- a/src/helpers/channels/getStageInstance.ts +++ b/src/helpers/channels/getStageInstance.ts @@ -1,4 +1,4 @@ -import type { StageInstance } from "../../types/channels/stage_instance.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; import type { Bot } from "../../bot.ts"; /** Gets the stage instance associated with the Stage channel, if it exists. */ diff --git a/src/helpers/channels/startTyping.ts b/src/helpers/channels/startTyping.ts index 0c5d78b1a..b33a21563 100644 --- a/src/helpers/channels/startTyping.ts +++ b/src/helpers/channels/startTyping.ts @@ -1,4 +1,4 @@ -import { DiscordChannelTypes } from "../../types/channels/channel_types.ts"; +import { ChannelTypes } from "../../types/channels/channelTypes.ts"; import type { Bot } from "../../bot.ts"; /** diff --git a/src/helpers/channels/swapChannels.ts b/src/helpers/channels/swapChannels.ts index aeaa58503..d6725d39d 100644 --- a/src/helpers/channels/swapChannels.ts +++ b/src/helpers/channels/swapChannels.ts @@ -1,4 +1,4 @@ -import type { ModifyGuildChannelPositions } from "../../types/guilds/modify_guild_channel_position.ts"; +import type { ModifyGuildChannelPositions } from "../../types/guilds/modifyGuildChannelPosition.ts"; import type { Bot } from "../../bot.ts"; /** Modify the positions of channels on the guild. Requires MANAGE_CHANNELS permission. */ diff --git a/src/helpers/channels/threads/editThread.ts b/src/helpers/channels/threads/editThread.ts index 76e3b2194..4d3952d09 100644 --- a/src/helpers/channels/threads/editThread.ts +++ b/src/helpers/channels/threads/editThread.ts @@ -1,4 +1,4 @@ -import type { ModifyThread } from "../../../types/channels/threads/modify_thread.ts"; +import type { ModifyThread } from "../../../types/channels/threads/modifyThread.ts"; import type { Bot } from "../../../bot.ts"; // import { channelToThread } from "../../../util/transformers/channel_to_thread.ts"; diff --git a/src/helpers/channels/threads/getActiveThread.ts b/src/helpers/channels/threads/getActiveThreads.ts similarity index 97% rename from src/helpers/channels/threads/getActiveThread.ts rename to src/helpers/channels/threads/getActiveThreads.ts index ca6335099..ab45f59ff 100644 --- a/src/helpers/channels/threads/getActiveThread.ts +++ b/src/helpers/channels/threads/getActiveThreads.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../../bot.ts"; -import type { ListActiveThreads } from "../../../types/channels/threads/list_active_threads.ts"; +import type { ListActiveThreads } from "../../../types/channels/threads/listActiveThreads.ts"; import { Collection } from "../../../util/collection.ts"; // import { channelToThread } from "../../../util/transformers/channel_to_thread.ts"; diff --git a/src/helpers/channels/threads/getArchivedThread.ts b/src/helpers/channels/threads/getArchivedThreads.ts similarity index 95% rename from src/helpers/channels/threads/getArchivedThread.ts rename to src/helpers/channels/threads/getArchivedThreads.ts index fa6409ffd..6edb59215 100644 --- a/src/helpers/channels/threads/getArchivedThread.ts +++ b/src/helpers/channels/threads/getArchivedThreads.ts @@ -1,6 +1,6 @@ -import { ListActiveThreads } from "../../../types/channels/threads/list_active_threads.ts"; -import { ListPublicArchivedThreads } from "../../../types/channels/threads/list_public_archived_threads.ts"; -import { PermissionStrings } from "../../../types/permissions/permission_strings.ts"; +import { ListActiveThreads } from "../../../types/channels/threads/listActiveThreads.ts"; +import { ListPublicArchivedThreads } from "../../../types/channels/threads/listPublicArchivedThreads.ts"; +import { PermissionStrings } from "../../../types/permissions/permissionStrings.ts"; import { Collection } from "../../../util/collection.ts"; import type { Bot } from "../../../bot.ts"; // import { channelToThread } from "../../../util/transformers/channel_to_thread.ts"; diff --git a/src/helpers/channels/threads/getThreadMember.ts b/src/helpers/channels/threads/getThreadMember.ts index dd670748f..ff409fb58 100644 --- a/src/helpers/channels/threads/getThreadMember.ts +++ b/src/helpers/channels/threads/getThreadMember.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../../bot.ts"; -import { ThreadMember } from "../../../types/channels/threads/thread_member.ts"; +import { ThreadMember } from "../../../types/channels/threads/threadMember.ts"; /** Returns thread members objects that are members of the thread. */ export async function getThreadMember(bot: Bot, threadId: bigint, userId: bigint) { diff --git a/src/helpers/channels/threads/getThreadMembers.ts b/src/helpers/channels/threads/getThreadMembers.ts index 7c122111c..90eb0a19a 100644 --- a/src/helpers/channels/threads/getThreadMembers.ts +++ b/src/helpers/channels/threads/getThreadMembers.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../../bot.ts"; -import { ThreadMember } from "../../../types/channels/threads/thread_member.ts"; +import { ThreadMember } from "../../../types/channels/threads/threadMember.ts"; /** Returns thread members objects that are members of the thread. */ export async function getThreadMembers(bot: Bot, threadId: bigint) { diff --git a/src/helpers/channels/threads/mod.ts b/src/helpers/channels/threads/mod.ts index 291cac7f0..b414dd54e 100644 --- a/src/helpers/channels/threads/mod.ts +++ b/src/helpers/channels/threads/mod.ts @@ -1,15 +1,15 @@ -export * from "./add_to_thread.ts"; -export * from "./archive_thread.ts"; -export * from "./delete_thread.ts"; -export * from "./edit_thread.ts"; -export * from "./get_active_threads.ts"; -export * from "./get_archived_threads.ts"; -export * from "./get_thread_members.ts"; -export * from "./join_thread.ts"; -export * from "./leave_thread.ts"; -export * from "./lock_thread.ts"; -export * from "./remove_thread_member.ts"; -export * from "./start_private_thread.ts"; -export * from "./start_thread.ts"; -export * from "./unarchive_thread.ts"; -export * from "./unlock_thread.ts"; +export * from "./addToThread.ts"; +export * from "./archiveThread.ts"; +export * from "./deleteThread.ts"; +export * from "./editThread.ts"; +export * from "./getActiveThreads.ts"; +export * from "./getArchivedThreads.ts"; +export * from "./getThreadMembers.ts"; +export * from "./joinThread.ts"; +export * from "./leaveThread.ts"; +export * from "./lockThread.ts"; +export * from "./removeThreadMember.ts"; +export * from "./startThreadWithoutMessage.ts"; +export * from "./startThreadWithMessage.ts"; +export * from "./unarchiveThread.ts"; +export * from "./unlockThread.ts"; diff --git a/src/helpers/channels/threads/startThreadWithMessage.ts b/src/helpers/channels/threads/startThreadWithMessage.ts index dcb7ddd13..15ebe9f51 100644 --- a/src/helpers/channels/threads/startThreadWithMessage.ts +++ b/src/helpers/channels/threads/startThreadWithMessage.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../../types/channels/channel.ts"; -import type { StartThreadWithMessage } from "../../../types/channels/threads/start_thread.ts"; +import type { StartThreadWithMessage } from "../../../types/channels/threads/startThread.ts"; import type { Bot } from "../../../bot.ts"; /** Creates a new public thread from an existing message. Returns a thread channel. */ diff --git a/src/helpers/channels/threads/startThreadWithoutMessage.ts b/src/helpers/channels/threads/startThreadWithoutMessage.ts index 824670ebe..8498239a0 100644 --- a/src/helpers/channels/threads/startThreadWithoutMessage.ts +++ b/src/helpers/channels/threads/startThreadWithoutMessage.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../../types/channels/channel.ts"; -import type { StartThreadWithoutMessage } from "../../../types/channels/threads/start_thread.ts"; +import type { StartThreadWithoutMessage } from "../../../types/channels/threads/startThread.ts"; import type { Bot } from "../../../bot.ts"; /** Creates a new private thread. Returns a thread channel. */ diff --git a/src/helpers/channels/threads/unlockThreaad.ts b/src/helpers/channels/threads/unlockThread.ts similarity index 100% rename from src/helpers/channels/threads/unlockThreaad.ts rename to src/helpers/channels/threads/unlockThread.ts diff --git a/src/helpers/channels/updateBotVoiceState.ts b/src/helpers/channels/updateBotVoiceState.ts index 412c3219f..c03756206 100644 --- a/src/helpers/channels/updateBotVoiceState.ts +++ b/src/helpers/channels/updateBotVoiceState.ts @@ -1,5 +1,5 @@ -import type { UpdateOthersVoiceState } from "../../types/guilds/update_others_voice_state.ts"; -import type { UpdateSelfVoiceState } from "../../types/guilds/update_self_voice_state.ts"; +import type { UpdateOthersVoiceState } from "../../types/guilds/updateOthersVoiceState.ts"; +import type { UpdateSelfVoiceState } from "../../types/guilds/updateSelfVoiceState.ts"; import type { Bot } from "../../bot.ts"; /** diff --git a/src/helpers/channels/updateStageInstance.ts b/src/helpers/channels/updateStageInstance.ts index a8216f89d..3232baa51 100644 --- a/src/helpers/channels/updateStageInstance.ts +++ b/src/helpers/channels/updateStageInstance.ts @@ -1,6 +1,6 @@ -import type { StageInstance } from "../../types/channels/stage_instance.ts"; +import type { StageInstance } from "../../types/channels/stageInstance.ts"; import type { Bot } from "../../bot.ts"; -import { ChannelTypes } from "../../types/channels/channel_types.ts"; +import { ChannelTypes } from "../../types/channels/channelTypes.ts"; /** Updates fields of an existing Stage instance. Requires the user to be a moderator of the Stage channel. */ export async function updateStageInstance( diff --git a/src/helpers/discovery/addDiscoverySubcategory.ts b/src/helpers/discovery/addDiscoverySubcategory.ts index 94ef64085..226bb6b57 100644 --- a/src/helpers/discovery/addDiscoverySubcategory.ts +++ b/src/helpers/discovery/addDiscoverySubcategory.ts @@ -1,4 +1,4 @@ -import type { AddGuildDiscoverySubcategory } from "../../types/discovery/add_guild_discovery_subcategory.ts"; +import type { AddGuildDiscoverySubcategory } from "../../types/discovery/addGuildDiscoverySubcategory.ts"; import type { Bot } from "../../bot.ts"; /** Add a discovery subcategory to the guild. Requires the `MANAGE_GUILD` permission. */ diff --git a/src/helpers/discovery/editDiscovery.ts b/src/helpers/discovery/editDiscovery.ts index 34f922679..1480f29d6 100644 --- a/src/helpers/discovery/editDiscovery.ts +++ b/src/helpers/discovery/editDiscovery.ts @@ -1,5 +1,5 @@ -import type { DiscoveryMetadata } from "../../types/discovery/discovery_metadata.ts"; -import type { ModifyGuildDiscoveryMetadata } from "../../types/discovery/modify_guild_discovery_metadata.ts"; +import type { DiscoveryMetadata } from "../../types/discovery/discoveryMetadata.ts"; +import type { ModifyGuildDiscoveryMetadata } from "../../types/discovery/modifyGuildDiscoveryMetadata.ts"; import type { Bot } from "../../bot.ts"; /** Modify the discovery metadata for the guild. Requires the MANAGE_GUILD permission. Returns the updated discovery metadata object on success. */ diff --git a/src/helpers/discovery/getDiscoveryCategories.ts b/src/helpers/discovery/getDiscoveryCategories.ts index 13f00dd7c..09e5bb1e8 100644 --- a/src/helpers/discovery/getDiscoveryCategories.ts +++ b/src/helpers/discovery/getDiscoveryCategories.ts @@ -1,4 +1,4 @@ -import type { DiscoveryCategory } from "../../types/discovery/discovery_category.ts"; +import type { DiscoveryCategory } from "../../types/discovery/discoveryCategory.ts"; import { Collection } from "../../util/collection.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/discovery/get_discovery.ts b/src/helpers/discovery/get_discovery.ts index dca3a3e39..224837df3 100644 --- a/src/helpers/discovery/get_discovery.ts +++ b/src/helpers/discovery/get_discovery.ts @@ -1,4 +1,4 @@ -import type { DiscoveryMetadata } from "../../types/discovery/discovery_metadata.ts"; +import type { DiscoveryMetadata } from "../../types/discovery/discoveryMetadata.ts"; import type { Bot } from "../../bot.ts"; /** Returns the discovery metadata object for the guild. Requires the `MANAGE_GUILD` permission. */ diff --git a/src/helpers/discovery/validDiscoveryTerm.ts b/src/helpers/discovery/validDiscoveryTerm.ts index 6fdde13dd..d8f0c1313 100644 --- a/src/helpers/discovery/validDiscoveryTerm.ts +++ b/src/helpers/discovery/validDiscoveryTerm.ts @@ -1,4 +1,4 @@ -import type { ValidateDiscoverySearchTerm } from "../../types/discovery/validate_discovery_search_term.ts"; +import type { ValidateDiscoverySearchTerm } from "../../types/discovery/validateDiscoverySearchTerm.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/emojis/createEmoji.ts b/src/helpers/emojis/createEmoji.ts index 2f6c2f795..c55509391 100644 --- a/src/helpers/emojis/createEmoji.ts +++ b/src/helpers/emojis/createEmoji.ts @@ -1,4 +1,4 @@ -import type { CreateGuildEmoji } from "../../types/emojis/create_guild_emoji.ts"; +import type { CreateGuildEmoji } from "../../types/emojis/createGuildEmoji.ts"; import type { Emoji } from "../../types/emojis/emoji.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/emojis/editEmoji.ts b/src/helpers/emojis/editEmoji.ts index 0409afecd..b08ecf300 100644 --- a/src/helpers/emojis/editEmoji.ts +++ b/src/helpers/emojis/editEmoji.ts @@ -1,5 +1,5 @@ import type { Emoji } from "../../types/emojis/emoji.ts"; -import type { ModifyGuildEmoji } from "../../types/emojis/modify_guild_emoji.ts"; +import type { ModifyGuildEmoji } from "../../types/emojis/modifyGuildEmoji.ts"; import type { Bot } from "../../bot.ts"; /** Modify the given emoji. Requires the MANAGE_EMOJIS permission. */ diff --git a/src/helpers/guilds/createGuild.ts b/src/helpers/guilds/createGuild.ts index f631ab4c0..1acd2eda3 100644 --- a/src/helpers/guilds/createGuild.ts +++ b/src/helpers/guilds/createGuild.ts @@ -1,4 +1,4 @@ -import type { CreateGuild } from "../../types/guilds/create_guild.ts"; +import type { CreateGuild } from "../../types/guilds/createGuild.ts"; import type { Guild } from "../../types/guilds/guild.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/guilds/editGuild.ts b/src/helpers/guilds/editGuild.ts index 7a4d0cccd..079c10621 100644 --- a/src/helpers/guilds/editGuild.ts +++ b/src/helpers/guilds/editGuild.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../bot.ts"; import type { Guild } from "../../types/guilds/guild.ts"; -import type { ModifyGuild } from "../../types/guilds/modify_guild.ts"; +import type { ModifyGuild } from "../../types/guilds/modifyGuild.ts"; /** Modify a guilds settings. Requires the MANAGE_GUILD permission. */ export async function editGuild(bot: Bot, guildId: bigint, options: ModifyGuild, shardId: number) { diff --git a/src/helpers/guilds/editWelcomeScreen.ts b/src/helpers/guilds/editWelcomeScreen.ts index 265f62175..0508738ff 100644 --- a/src/helpers/guilds/editWelcomeScreen.ts +++ b/src/helpers/guilds/editWelcomeScreen.ts @@ -1,18 +1,23 @@ -import type { ModifyGuildWelcomeScreen } from "../../types/guilds/modify_guild_welcome_screen.ts"; -import type { WelcomeScreen } from "../../types/guilds/welcome_screen.ts"; +import type { ModifyGuildWelcomeScreen } from "../../types/guilds/modifyGuildWelcomeScreen.ts"; +import type { WelcomeScreen } from "../../types/guilds/welcomeScreen.ts"; import type { Bot } from "../../bot.ts"; export async function editWelcomeScreen(bot: Bot, guildId: bigint, options: ModifyGuildWelcomeScreen) { - return await bot.rest.runMethod(bot.rest, "patch", bot.constants.endpoints.GUILD_WELCOME_SCREEN(guildId), { - enabled: options.enabled, - welcomeScreen: options.welcomeScreen?.map((welcomeScreen) => { - return { - channel_id: welcomeScreen.channelId, - description: welcomeScreen.description, - emoji_id: welcomeScreen.emojiId, - emoji_name: welcomeScreen.emojiName, - }; - }), - description: options.description, - }); + return await bot.rest.runMethod( + bot.rest, + "patch", + bot.constants.endpoints.GUILD_WELCOME_SCREEN(guildId), + { + enabled: options.enabled, + welcomeScreen: options.welcomeScreen?.map((welcomeScreen) => { + return { + channel_id: welcomeScreen.channelId, + description: welcomeScreen.description, + emoji_id: welcomeScreen.emojiId, + emoji_name: welcomeScreen.emojiName, + }; + }), + description: options.description, + } + ); } diff --git a/src/helpers/guilds/editWidget.ts b/src/helpers/guilds/editWidget.ts index a50c414f8..ec99f7d03 100644 --- a/src/helpers/guilds/editWidget.ts +++ b/src/helpers/guilds/editWidget.ts @@ -1,4 +1,4 @@ -import type { GuildWidget } from "../../types/guilds/guild_widget.ts"; +import type { GuildWidget } from "../../types/guilds/guildWidget.ts"; import type { Bot } from "../../bot.ts"; /** Modify a guild widget object for the guild. Requires the MANAGE_GUILD permission. */ diff --git a/src/helpers/guilds/getAuditLogs.ts b/src/helpers/guilds/getAuditLogs.ts index c502377ea..ed4788956 100644 --- a/src/helpers/guilds/getAuditLogs.ts +++ b/src/helpers/guilds/getAuditLogs.ts @@ -1,5 +1,5 @@ -import type { AuditLog } from "../../types/audit_log/audit_log.ts"; -import type { GetGuildAuditLog } from "../../types/audit_log/get_guild_audit_log.ts"; +import type { AuditLog } from "../../types/auditLog/auditLog.ts"; +import type { GetGuildAuditLog } from "../../types/auditLog/getGuildAuditLog.ts"; import type { Bot } from "../../bot.ts"; /** Returns the audit logs for the guild. Requires VIEW AUDIT LOGS permission */ diff --git a/src/helpers/guilds/getAvailableVoiceRegions.ts b/src/helpers/guilds/getAvailableVoiceRegions.ts index 9cebbd367..781742b02 100644 --- a/src/helpers/guilds/getAvailableVoiceRegions.ts +++ b/src/helpers/guilds/getAvailableVoiceRegions.ts @@ -1,4 +1,4 @@ -import type { VoiceRegion } from "../../types/voice/voice_region.ts"; +import type { VoiceRegion } from "../../types/voice/voiceRegion.ts"; import type { Bot } from "../../bot.ts"; /** Returns an array of voice regions that can be used when creating servers. */ diff --git a/src/helpers/guilds/getGuildPreview.ts b/src/helpers/guilds/getGuildPreview.ts index 7ee1d4cfb..d552d6720 100644 --- a/src/helpers/guilds/getGuildPreview.ts +++ b/src/helpers/guilds/getGuildPreview.ts @@ -1,4 +1,4 @@ -import type { GuildPreview } from "../../types/guilds/guild_preview.ts"; +import type { GuildPreview } from "../../types/guilds/guildPreview.ts"; import type { Bot } from "../../bot.ts"; /** Returns the guild preview object for the given id. If the bot is not in the guild, then the guild must be Discoverable. */ diff --git a/src/helpers/guilds/getPruneCount.ts b/src/helpers/guilds/getPruneCount.ts index a089debb7..7dac554b5 100644 --- a/src/helpers/guilds/getPruneCount.ts +++ b/src/helpers/guilds/getPruneCount.ts @@ -1,4 +1,4 @@ -import type { GetGuildPruneCountQuery } from "../../types/guilds/get_guild_prune_count.ts"; +import type { GetGuildPruneCountQuery } from "../../types/guilds/getGuildPruneCount.ts"; import type { Bot } from "../../bot.ts"; /** Check how many members would be removed from the server in a prune operation. Requires the KICK_MEMBERS permission */ diff --git a/src/helpers/guilds/getVanityURL.ts b/src/helpers/guilds/getVanityURL.ts index b1aed91d3..3edba9272 100644 --- a/src/helpers/guilds/getVanityURL.ts +++ b/src/helpers/guilds/getVanityURL.ts @@ -1,4 +1,4 @@ -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import type { Bot } from "../../bot.ts"; /** Returns the code and uses of the vanity url for this server if it is enabled else `code` will be null. Requires the `MANAGE_GUILD` permission. */ diff --git a/src/helpers/guilds/getVoiceRegions.ts b/src/helpers/guilds/getVoiceRegions.ts index d16f989a2..53b090266 100644 --- a/src/helpers/guilds/getVoiceRegions.ts +++ b/src/helpers/guilds/getVoiceRegions.ts @@ -1,4 +1,4 @@ -import type { VoiceRegion } from "../../types/voice/voice_region.ts"; +import type { VoiceRegion } from "../../types/voice/voiceRegion.ts"; import { Collection } from "../../util/collection.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/guilds/getWelcomeScreen.ts b/src/helpers/guilds/getWelcomeScreen.ts index 2e385ed82..d40145d1b 100644 --- a/src/helpers/guilds/getWelcomeScreen.ts +++ b/src/helpers/guilds/getWelcomeScreen.ts @@ -1,4 +1,4 @@ -import type { WelcomeScreen } from "../../types/guilds/welcome_screen.ts"; +import type { WelcomeScreen } from "../../types/guilds/welcomeScreen.ts"; import type { Bot } from "../../bot.ts"; export async function getWelcomeScreen(bot: Bot, guildId: bigint) { diff --git a/src/helpers/guilds/getWidget.ts b/src/helpers/guilds/getWidget.ts index 0581de5a8..deb1b1e34 100644 --- a/src/helpers/guilds/getWidget.ts +++ b/src/helpers/guilds/getWidget.ts @@ -1,4 +1,4 @@ -import type { GuildWidgetDetails } from "../../types/guilds/guild_widget_details.ts"; +import type { GuildWidgetDetails } from "../../types/guilds/guildWidgetDetails.ts"; import type { Bot } from "../../bot.ts"; /** Returns the widget for the guild. */ diff --git a/src/helpers/guilds/getWidgetImageURL.ts b/src/helpers/guilds/getWidgetImageURL.ts index 0a1a79485..0b222d63a 100644 --- a/src/helpers/guilds/getWidgetImageURL.ts +++ b/src/helpers/guilds/getWidgetImageURL.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../bot.ts"; -import type { GetGuildWidgetImageQuery } from "../../types/guilds/get_guild_widget_image.ts"; +import type { GetGuildWidgetImageQuery } from "../../types/guilds/getGuildWidgetImage.ts"; /** Returns the widget image URL for the guild. */ export async function getWidgetImageURL(bot: Bot, guildId: bigint, options?: GetGuildWidgetImageQuery) { diff --git a/src/helpers/guilds/getWidgetSettings.ts b/src/helpers/guilds/getWidgetSettings.ts index 69392d146..4131916b1 100644 --- a/src/helpers/guilds/getWidgetSettings.ts +++ b/src/helpers/guilds/getWidgetSettings.ts @@ -1,4 +1,4 @@ -import type { GuildWidget } from "../../types/guilds/guild_widget.ts"; +import type { GuildWidget } from "../../types/guilds/guildWidget.ts"; import type { Bot } from "../../bot.ts"; /** Returns the guild widget object. Requires the MANAGE_GUILD permission. */ diff --git a/src/helpers/guilds/guildBannerURL.ts b/src/helpers/guilds/guildBannerURL.ts index 9d0b9a6e1..4469af30f 100644 --- a/src/helpers/guilds/guildBannerURL.ts +++ b/src/helpers/guilds/guildBannerURL.ts @@ -1,5 +1,5 @@ -import type { DiscordImageFormat } from "../../types/misc/image_format.ts"; -import type { DiscordImageSize } from "../../types/misc/image_size.ts"; +import type { ImageFormat } from "../../types/misc/imageFormat.ts"; +import type { ImageSize } from "../../types/misc/imageSize.ts"; import type { Bot } from "../../bot.ts"; /** The full URL of the banner from Discords CDN. Undefined if no banner is set. */ @@ -8,8 +8,8 @@ export function guildBannerURL( id: bigint, options: { banner?: string | bigint; - size?: DiscordImageSize; - format?: DiscordImageFormat; + size?: ImageSize; + format?: ImageFormat; } ) { return options.banner diff --git a/src/helpers/guilds/guildIconURL.ts b/src/helpers/guilds/guildIconURL.ts index 1cfd52bcd..ca7a29c76 100644 --- a/src/helpers/guilds/guildIconURL.ts +++ b/src/helpers/guilds/guildIconURL.ts @@ -1,5 +1,5 @@ -import type { DiscordImageFormat } from "../../types/misc/image_format.ts"; -import type { DiscordImageSize } from "../../types/misc/image_size.ts"; +import type { ImageFormat } from "../../types/misc/imageFormat.ts"; +import type { ImageSize } from "../../types/misc/imageSize.ts"; import type { Bot } from "../../bot.ts"; /** The full URL of the icon from Discords CDN. Undefined when no icon is set. */ @@ -8,8 +8,8 @@ export function guildIconURL( id: bigint, options: { icon?: string | bigint; - size?: DiscordImageSize; - format?: DiscordImageFormat; + size?: ImageSize; + format?: ImageFormat; } ) { return options.icon diff --git a/src/helpers/guilds/guildSplashURL.ts b/src/helpers/guilds/guildSplashURL.ts index 21b6d20cc..d9f28209b 100644 --- a/src/helpers/guilds/guildSplashURL.ts +++ b/src/helpers/guilds/guildSplashURL.ts @@ -1,5 +1,5 @@ -import type { DiscordImageFormat } from "../../types/misc/image_format.ts"; -import type { DiscordImageSize } from "../../types/misc/image_size.ts"; +import type { ImageFormat } from "../../types/misc/imageFormat.ts"; +import type { ImageSize } from "../../types/misc/imageSize.ts"; import type { Bot } from "../../bot.ts"; /** The full URL of the splash from Discords CDN. Undefined if no splash is set. */ @@ -8,17 +8,15 @@ export function guildSplashURL( id: bigint, options: { splash?: string | bigint; - size?: DiscordImageSize; - format?: DiscordImageFormat; + size?: ImageSize; + format?: ImageFormat; } ) { return options.splash ? bot.utils.formatImageURL( bot.constants.endpoints.GUILD_SPLASH( id, - typeof options.splash === "string" - ? options.splash - : bot.utils.iconBigintToHash(options.splash) + typeof options.splash === "string" ? options.splash : bot.utils.iconBigintToHash(options.splash) ), options.size || 128, options.format diff --git a/src/helpers/interactions/commands/batchEditSlashCommandPermissions.ts b/src/helpers/interactions/commands/batchEditSlashCommandPermissions.ts index 90d830c1f..33796891b 100644 --- a/src/helpers/interactions/commands/batchEditSlashCommandPermissions.ts +++ b/src/helpers/interactions/commands/batchEditSlashCommandPermissions.ts @@ -1,6 +1,6 @@ import type { Bot } from "../../../bot.ts"; -import type { ApplicationCommandPermissions } from "../../../types/interactions/commands/application_command_permissions.ts"; -import { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guild_application_command_permissions.ts"; +import type { ApplicationCommandPermissions } from "../../../types/interactions/commands/applicationCommandPermissions.ts"; +import { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guildApplicationCommandPermissions.ts"; /** Batch edits permissions for all commands in a guild. Takes an array of partial GuildApplicationCommandPermissions objects including `id` and `permissions`. */ export async function batchEditSlashCommandPermissions( diff --git a/src/helpers/interactions/commands/createSlashCommand.ts b/src/helpers/interactions/commands/createSlashCommand.ts index 1fc7e0b78..089b5ed03 100644 --- a/src/helpers/interactions/commands/createSlashCommand.ts +++ b/src/helpers/interactions/commands/createSlashCommand.ts @@ -1,7 +1,7 @@ -import type { ApplicationCommand } from "../../../types/interactions/commands/application_command.ts"; -import type { CreateGlobalApplicationCommand } from "../../../types/interactions/commands/create_global_application_command.ts"; +import type { ApplicationCommand } from "../../../types/interactions/commands/applicationCommand.ts"; +import type { CreateGlobalApplicationCommand } from "../../../types/interactions/commands/createGlobalApplicationCommand.ts"; import type { Bot } from "../../../bot.ts"; -import { ApplicationCommandOption } from "../../../types/interactions/commands/application_command_option.ts"; +import { ApplicationCommandOption } from "../../../types/interactions/commands/applicationCommandOption.ts"; /** * There are two kinds of Slash Commands: global commands and guild commands. Global commands are available for every guild that adds your app; guild commands are specific to the guild you specify when making them. Command names are unique per application within each scope (global and guild). That means: diff --git a/src/helpers/interactions/commands/editSlashCommandPermissions.ts b/src/helpers/interactions/commands/editSlashCommandPermissions.ts index 8def52ec2..0e374d0cb 100644 --- a/src/helpers/interactions/commands/editSlashCommandPermissions.ts +++ b/src/helpers/interactions/commands/editSlashCommandPermissions.ts @@ -1,6 +1,6 @@ -import type { ApplicationCommandPermissions } from "../../../types/interactions/commands/application_command_permissions.ts"; +import type { ApplicationCommandPermissions } from "../../../types/interactions/commands/applicationCommandPermissions.ts"; import type { Bot } from "../../../bot.ts"; -import { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guild_application_command_permissions.ts"; +import { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guildApplicationCommandPermissions.ts"; /** Edits command permissions for a specific command for your application in a guild. */ export async function editSlashCommandPermissions( diff --git a/src/helpers/interactions/commands/editSlashResponse.ts b/src/helpers/interactions/commands/editSlashResponse.ts index 026cd166e..fcf33768f 100644 --- a/src/helpers/interactions/commands/editSlashResponse.ts +++ b/src/helpers/interactions/commands/editSlashResponse.ts @@ -1,7 +1,7 @@ -import type { DiscordenoEditWebhookMessage } from "../../../types/discordeno/edit_webhook_message.ts"; +import type { DiscordenoEditWebhookMessage } from "../../../types/discordeno/editWebhookMessage.ts"; import type { Bot } from "../../../bot.ts"; -import { DiscordAllowedMentionsTypes } from "../../../types/messages/allowed_mentions_types.ts"; -import { DiscordMessageComponentTypes } from "../../../types/messages/components/message_component_types.ts"; +import { AllowedMentionsTypes } from "../../../types/messages/allowedMentionsTypes.ts"; +import { MessageComponentTypes } from "../../../types/messages/components/messageComponentTypes.ts"; /** To edit your response to a slash command. If a messageId is not provided it will default to editing the original response. */ export async function editSlashResponse(bot: Bot, token: string, options: DiscordenoEditWebhookMessage) { @@ -19,7 +19,7 @@ export async function editSlashResponse(bot: Bot, token: string, options: Discor if (options.allowedMentions) { if (options.allowedMentions.users?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.UserMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "users"); } @@ -29,7 +29,7 @@ export async function editSlashResponse(bot: Bot, token: string, options: Discor } if (options.allowedMentions.roles?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.RoleMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "roles"); } @@ -61,7 +61,7 @@ export async function editSlashResponse(bot: Bot, token: string, options: Discor components: options.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/interactions/commands/getSlashCommand.ts b/src/helpers/interactions/commands/getSlashCommand.ts index ae8a36239..617117269 100644 --- a/src/helpers/interactions/commands/getSlashCommand.ts +++ b/src/helpers/interactions/commands/getSlashCommand.ts @@ -1,4 +1,4 @@ -import type { ApplicationCommand } from "../../../types/interactions/commands/application_command.ts"; +import type { ApplicationCommand } from "../../../types/interactions/commands/applicationCommand.ts"; import type { Bot } from "../../../bot.ts"; /** Fetches the global command for the given Id. If a guildId is provided, the guild command will be fetched. */ diff --git a/src/helpers/interactions/commands/getSlashCommandPermission.ts b/src/helpers/interactions/commands/getSlashCommandPermission.ts index 10a4c2a07..d37e035a8 100644 --- a/src/helpers/interactions/commands/getSlashCommandPermission.ts +++ b/src/helpers/interactions/commands/getSlashCommandPermission.ts @@ -1,4 +1,4 @@ -import type { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guild_application_command_permissions.ts"; +import type { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guildApplicationCommandPermissions.ts"; import type { Bot } from "../../../bot.ts"; /** Fetches command permissions for a specific command for your application in a guild. Returns a GuildApplicationCommandPermissions object. */ diff --git a/src/helpers/interactions/commands/getSlashCommandPermissions.ts b/src/helpers/interactions/commands/getSlashCommandPermissions.ts index 56e0a8316..b95ccae93 100644 --- a/src/helpers/interactions/commands/getSlashCommandPermissions.ts +++ b/src/helpers/interactions/commands/getSlashCommandPermissions.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../../bot.ts"; -import type { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guild_application_command_permissions.ts"; +import type { GuildApplicationCommandPermissions } from "../../../types/interactions/commands/guildApplicationCommandPermissions.ts"; /** Fetches command permissions for all commands for your application in a guild. Returns an array of GuildApplicationCommandPermissions objects. */ export async function getSlashCommandPermissions(bot: Bot, guildId: bigint) { diff --git a/src/helpers/interactions/commands/getSlashCommands.ts b/src/helpers/interactions/commands/getSlashCommands.ts index f1e7b8d68..d5e8ef1ce 100644 --- a/src/helpers/interactions/commands/getSlashCommands.ts +++ b/src/helpers/interactions/commands/getSlashCommands.ts @@ -1,4 +1,4 @@ -import type { ApplicationCommand } from "../../../types/interactions/commands/application_command.ts"; +import type { ApplicationCommand } from "../../../types/interactions/commands/applicationCommand.ts"; import { Collection } from "../../../util/collection.ts"; import type { Bot } from "../../../bot.ts"; diff --git a/src/helpers/interactions/commands/upsertSlashCommand.ts b/src/helpers/interactions/commands/upsertSlashCommand.ts index 5b8ec6869..0865ef490 100644 --- a/src/helpers/interactions/commands/upsertSlashCommand.ts +++ b/src/helpers/interactions/commands/upsertSlashCommand.ts @@ -1,7 +1,7 @@ -import type { ApplicationCommand } from "../../../types/interactions/commands/application_command.ts"; -import type { EditGlobalApplicationCommand } from "../../../types/interactions/commands/edit_global_application_command.ts"; +import type { ApplicationCommand } from "../../../types/interactions/commands/applicationCommand.ts"; +import type { EditGlobalApplicationCommand } from "../../../types/interactions/commands/editGlobalApplicationCommand.ts"; import type { Bot } from "../../../bot.ts"; -import { makeOptionsForCommand } from "./create_slash_command.ts"; +import { makeOptionsForCommand } from "./createSlashCommand.ts"; /** * Edit an existing slash command. If this command did not exist, it will create it. diff --git a/src/helpers/interactions/commands/upsertSlashCommands.ts b/src/helpers/interactions/commands/upsertSlashCommands.ts index 4ad502fe4..1c8704c94 100644 --- a/src/helpers/interactions/commands/upsertSlashCommands.ts +++ b/src/helpers/interactions/commands/upsertSlashCommands.ts @@ -1,5 +1,5 @@ -import type { ApplicationCommand } from "../../../types/interactions/commands/application_command.ts"; -import type { EditGlobalApplicationCommand } from "../../../types/interactions/commands/edit_global_application_command.ts"; +import type { ApplicationCommand } from "../../../types/interactions/commands/applicationCommand.ts"; +import type { EditGlobalApplicationCommand } from "../../../types/interactions/commands/editGlobalApplicationCommand.ts"; import type { MakeRequired } from "../../../types/util.ts"; import type { Bot } from "../../../bot.ts"; diff --git a/src/helpers/interactions/followups/editFollowupMessage.ts b/src/helpers/interactions/followups/editFollowupMessage.ts index ea92a1fc6..fa421d3ef 100644 --- a/src/helpers/interactions/followups/editFollowupMessage.ts +++ b/src/helpers/interactions/followups/editFollowupMessage.ts @@ -1,8 +1,8 @@ import { Bot } from "../../../bot.ts"; -import { DiscordAllowedMentionsTypes } from "../../../types/messages/allowed_mentions_types.ts"; -import { DiscordMessageComponentTypes } from "../../../types/messages/components/message_component_types.ts"; +import { AllowedMentionsTypes } from "../../../types/messages/allowedMentionsTypes.ts"; +import { MessageComponentTypes } from "../../../types/messages/components/messageComponentTypes.ts"; import { Message } from "../../../types/messages/message.ts"; -import { EditWebhookMessage } from "../../../types/webhooks/edit_webhook_message.ts"; +import { EditWebhookMessage } from "../../../types/webhooks/editWebhookMessage.ts"; /** Edits a followup message for an Interaction. Functions the same as edit webhook message, however this uses your interaction token instead of bot token. Does not support ephemeral followups. */ export async function editFollowupMessage( @@ -21,7 +21,7 @@ export async function editFollowupMessage( if (options.allowedMentions) { if (options.allowedMentions.users?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.UserMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "users"); } @@ -31,7 +31,7 @@ export async function editFollowupMessage( } if (options.allowedMentions.roles?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.RoleMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "roles"); } @@ -65,7 +65,7 @@ export async function editFollowupMessage( components: options.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/interactions/sendInteractionResponse.ts b/src/helpers/interactions/sendInteractionResponse.ts index babc0529a..8bf77a83a 100644 --- a/src/helpers/interactions/sendInteractionResponse.ts +++ b/src/helpers/interactions/sendInteractionResponse.ts @@ -1,7 +1,7 @@ -import type { DiscordenoInteractionResponse } from "../../types/discordeno/interaction_response.ts"; +import type { DiscordenoInteractionResponse } from "../../types/discordeno/interactionResponse.ts"; import type { Bot } from "../../bot.ts"; -import { AllowedMentions } from "../../types/messages/allowed_mentions.ts"; -import { DiscordMessageComponentTypes } from "../../types/messages/components/message_component_types.ts"; +import { AllowedMentions } from "../../types/messages/allowedMentions.ts"; +import { MessageComponentTypes } from "../../types/messages/components/messageComponentTypes.ts"; /** * Send a response to a users slash command. The command data will have the id and token necessary to respond. @@ -102,7 +102,7 @@ export async function sendInteractionResponse( components: options.data.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, @@ -220,7 +220,7 @@ export async function sendInteractionResponse( components: options.data.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/invites/createInvite.ts b/src/helpers/invites/createInvite.ts index 15e0d8d5b..077110979 100644 --- a/src/helpers/invites/createInvite.ts +++ b/src/helpers/invites/createInvite.ts @@ -1,5 +1,5 @@ -import type { CreateChannelInvite } from "../../types/invites/create_channel_invite.ts"; -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import type { CreateChannelInvite } from "../../types/invites/createChannelInvite.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import { Errors } from "../../types/discordeno/errors.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/invites/deleteInvite.ts b/src/helpers/invites/deleteInvite.ts index 5e807b2c4..3fa82a88b 100644 --- a/src/helpers/invites/deleteInvite.ts +++ b/src/helpers/invites/deleteInvite.ts @@ -1,4 +1,4 @@ -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import type { Bot } from "../../bot.ts"; /** Deletes an invite for the given code. Requires `MANAGE_CHANNELS` or `MANAGE_GUILD` permission */ diff --git a/src/helpers/invites/getChannelInvites.ts b/src/helpers/invites/getChannelInvites.ts index bef38db27..6ad0f7cd6 100644 --- a/src/helpers/invites/getChannelInvites.ts +++ b/src/helpers/invites/getChannelInvites.ts @@ -1,4 +1,4 @@ -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import { Collection } from "../../util/collection.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/invites/getInvite.ts b/src/helpers/invites/getInvite.ts index 76961ad24..da2755bbe 100644 --- a/src/helpers/invites/getInvite.ts +++ b/src/helpers/invites/getInvite.ts @@ -1,5 +1,5 @@ -import { GetInvite } from "../../types/invites/get_invite.ts"; -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import { GetInvite } from "../../types/invites/getInvite.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import type { Bot } from "../../bot.ts"; /** Returns an invite for the given code or throws an error if the invite doesn't exists. */ diff --git a/src/helpers/invites/getInvites.ts b/src/helpers/invites/getInvites.ts index 006f9b54e..07a64588b 100644 --- a/src/helpers/invites/getInvites.ts +++ b/src/helpers/invites/getInvites.ts @@ -1,4 +1,4 @@ -import type { InviteMetadata } from "../../types/invites/invite_metadata.ts"; +import type { InviteMetadata } from "../../types/invites/inviteMetadata.ts"; import { Collection } from "../../util/collection.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/members/avatarURL.ts b/src/helpers/members/avatarURL.ts index ff9179a49..0114d497a 100644 --- a/src/helpers/members/avatarURL.ts +++ b/src/helpers/members/avatarURL.ts @@ -1,5 +1,5 @@ -import type { DiscordImageFormat } from "../../types/misc/image_format.ts"; -import type { DiscordImageSize } from "../../types/misc/image_size.ts"; +import type { ImageFormat } from "../../types/misc/imageFormat.ts"; +import type { ImageSize } from "../../types/misc/imageSize.ts"; import type { Bot } from "../../bot.ts"; /** The users custom avatar or the default avatar if you don't have a member object. */ @@ -9,8 +9,8 @@ export function avatarURL( discriminator: number, options: { avatar?: string | bigint; - size?: DiscordImageSize; - format?: DiscordImageFormat; + size?: ImageSize; + format?: ImageFormat; } ) { return options.avatar diff --git a/src/helpers/members/banMember.ts b/src/helpers/members/banMember.ts index 5568e8420..fe4bc9655 100644 --- a/src/helpers/members/banMember.ts +++ b/src/helpers/members/banMember.ts @@ -1,4 +1,4 @@ -import type { CreateGuildBan } from "../../types/guilds/create_guild_ban.ts"; +import type { CreateGuildBan } from "../../types/guilds/createGuildBan.ts"; import type { Bot } from "../../bot.ts"; /** Ban a user from the guild and optionally delete previous messages sent by the user. Requires the BAN_MEMBERS permission. */ diff --git a/src/helpers/members/editMember.ts b/src/helpers/members/editMember.ts index a38b922c7..fc7b6d8e3 100644 --- a/src/helpers/members/editMember.ts +++ b/src/helpers/members/editMember.ts @@ -1,6 +1,6 @@ -import type { ModifyGuildMember } from "../../types/guilds/modify_guild_member.ts"; -import type { GuildMemberWithUser } from "../../types/members/guild_member.ts"; -import type { PermissionStrings } from "../../types/permissions/permission_strings.ts"; +import type { ModifyGuildMember } from "../../types/guilds/modifyGuildMember.ts"; +import type { GuildMemberWithUser } from "../../types/members/guildMember.ts"; +import type { PermissionStrings } from "../../types/permissions/permissionStrings.ts"; import type { Bot } from "../../bot.ts"; /** Edit the member */ diff --git a/src/helpers/members/fetchMembers.ts b/src/helpers/members/fetchMembers.ts index ae51f5fc2..f2d6872dd 100644 --- a/src/helpers/members/fetchMembers.ts +++ b/src/helpers/members/fetchMembers.ts @@ -1,8 +1,8 @@ -import type { RequestGuildMembers } from "../../types/members/request_guild_members.ts"; +import type { RequestGuildMembers } from "../../types/members/requestGuildMembers.ts"; import { Collection } from "../../util/collection.ts"; import type { Bot } from "../../bot.ts"; -import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts"; -import { DiscordGatewayOpcodes } from "../../types/codes/gateway_opcodes.ts"; +import { GatewayIntents } from "../../types/gateway/gatewayIntents.ts"; +import { GatewayOpcodes } from "../../types/codes/gatewayOpcodes.ts"; import type { DiscordenoMember } from "../../transformers/member.ts"; /** @@ -21,7 +21,7 @@ export function fetchMembers( ) { // You can request 1 member without the intent // Check if intents is not 0 as proxy ws won't set intents in other instances - if (bot.intents && (!options?.limit || options.limit > 1) && !(bot.intents & DiscordGatewayIntents.GuildMembers)) { + if (bot.intents && (!options?.limit || options.limit > 1) && !(bot.intents & GatewayIntents.GuildMembers)) { throw new Error(bot.constants.Errors.MISSING_INTENT_GUILD_MEMBERS); } @@ -34,7 +34,7 @@ export function fetchMembers( bot.cache.fetchAllMembersProcessingRequests.set(nonce, resolve); bot.gateway.sendShardMessage(bot.gateway, shardId, { - op: DiscordGatewayOpcodes.RequestGuildMembers, + op: GatewayOpcodes.RequestGuildMembers, d: { guild_id: guildId.toString(), // If a query is provided use it, OR if a limit is NOT provided use "" diff --git a/src/helpers/members/getDmChannel.ts b/src/helpers/members/getDmChannel.ts index ffca7562b..37097036a 100644 --- a/src/helpers/members/getDmChannel.ts +++ b/src/helpers/members/getDmChannel.ts @@ -1,5 +1,5 @@ import type { Channel } from "../../types/channels/channel.ts"; -import type { CreateMessage } from "../../types/messages/create_message.ts"; +import type { CreateMessage } from "../../types/messages/createMessage.ts"; import type { Bot } from "../../bot.ts"; /** Send a message to a users DM. Note: this takes 2 API calls. 1 is to fetch the users dm channel. 2 is to send a message to that channel. */ diff --git a/src/helpers/members/getMember.ts b/src/helpers/members/getMember.ts index 90e7919af..1b38cab8d 100644 --- a/src/helpers/members/getMember.ts +++ b/src/helpers/members/getMember.ts @@ -1,4 +1,4 @@ -import type { GuildMemberWithUser } from "../../types/members/guild_member.ts"; +import type { GuildMemberWithUser } from "../../types/members/guildMember.ts"; import type { Bot } from "../../bot.ts"; /** Returns a guild member object for the specified user. diff --git a/src/helpers/members/getMembers.ts b/src/helpers/members/getMembers.ts index 4867b53c5..7e39b0437 100644 --- a/src/helpers/members/getMembers.ts +++ b/src/helpers/members/getMembers.ts @@ -1,6 +1,6 @@ -import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts"; -import type { GuildMemberWithUser } from "../../types/members/guild_member.ts"; -import type { ListGuildMembers } from "../../types/members/list_guild_members.ts"; +import { GatewayIntents } from "../../types/gateway/gatewayIntents.ts"; +import type { GuildMemberWithUser } from "../../types/members/guildMember.ts"; +import type { ListGuildMembers } from "../../types/members/listGuildMembers.ts"; import type { Bot } from "../../bot.ts"; import { Collection } from "../../util/collection.ts"; import type { DiscordenoMember } from "../../transformers/member.ts"; diff --git a/src/helpers/members/pruneMembers.ts b/src/helpers/members/pruneMembers.ts index d2956de11..a25342c77 100644 --- a/src/helpers/members/pruneMembers.ts +++ b/src/helpers/members/pruneMembers.ts @@ -1,4 +1,4 @@ -import type { BeginGuildPrune } from "../../types/guilds/begin_guild_prune.ts"; +import type { BeginGuildPrune } from "../../types/guilds/beginGuildPrune.ts"; import type { Bot } from "../../bot.ts"; /** diff --git a/src/helpers/members/searchMembers.ts b/src/helpers/members/searchMembers.ts index a30053d04..96d83bd1c 100644 --- a/src/helpers/members/searchMembers.ts +++ b/src/helpers/members/searchMembers.ts @@ -1,5 +1,5 @@ -import type { GuildMemberWithUser } from "../../types/members/guild_member.ts"; -import type { SearchGuildMembers } from "../../types/members/search_guild_members.ts"; +import type { GuildMemberWithUser } from "../../types/members/guildMember.ts"; +import type { SearchGuildMembers } from "../../types/members/searchGuildMembers.ts"; import { Collection } from "../../util/collection.ts"; import { Bot } from "../../bot.ts"; diff --git a/src/helpers/messages/delete_messages.ts b/src/helpers/messages/deleteMessages.ts similarity index 100% rename from src/helpers/messages/delete_messages.ts rename to src/helpers/messages/deleteMessages.ts diff --git a/src/helpers/messages/editMessage.ts b/src/helpers/messages/editMessage.ts index eed9952ff..d1891852a 100644 --- a/src/helpers/messages/editMessage.ts +++ b/src/helpers/messages/editMessage.ts @@ -1,7 +1,7 @@ -import type { EditMessage } from "../../types/messages/edit_message.ts"; +import type { EditMessage } from "../../types/messages/editMessage.ts"; import type { Message } from "../../types/messages/message.ts"; import type { Bot } from "../../bot.ts"; -import { DiscordMessageComponentTypes } from "../../types/messages/components/message_component_types.ts"; +import { MessageComponentTypes } from "../../types/messages/components/messageComponentTypes.ts"; /** Edit the message. */ export async function editMessage(bot: Bot, channelId: bigint, messageId: bigint, content: string | EditMessage) { @@ -92,7 +92,7 @@ export async function editMessage(bot: Bot, channelId: bigint, messageId: bigint components: content.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/messages/getMessages.ts b/src/helpers/messages/getMessages.ts index 0dd2b39a3..0392d5701 100644 --- a/src/helpers/messages/getMessages.ts +++ b/src/helpers/messages/getMessages.ts @@ -3,7 +3,7 @@ import type { GetMessagesAround, GetMessagesBefore, GetMessagesLimit, -} from "../../types/messages/get_messages.ts"; +} from "../../types/messages/getMessages.ts"; import type { Message } from "../../types/messages/message.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/messages/getReactions.ts b/src/helpers/messages/getReactions.ts index 6258df559..ae5c93f7a 100644 --- a/src/helpers/messages/getReactions.ts +++ b/src/helpers/messages/getReactions.ts @@ -1,4 +1,4 @@ -import type { GetReactions } from "../../types/messages/message_get_reactions.ts"; +import type { GetReactions } from "../../types/messages/messageGetReactions.ts"; import type { User } from "../../types/users/user.ts"; import { Collection } from "../../util/collection.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/messages/sendMessage.ts b/src/helpers/messages/sendMessage.ts index f36b5763d..c6c21d288 100644 --- a/src/helpers/messages/sendMessage.ts +++ b/src/helpers/messages/sendMessage.ts @@ -1,8 +1,8 @@ -import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; -import type { CreateMessage } from "../../types/messages/create_message.ts"; +import { AllowedMentionsTypes } from "../../types/messages/allowedMentionsTypes.ts"; +import type { CreateMessage } from "../../types/messages/createMessage.ts"; import type { Message } from "../../types/messages/message.ts"; import type { Bot } from "../../bot.ts"; -import { DiscordMessageComponentTypes } from "../../types/messages/components/message_component_types.ts"; +import { MessageComponentTypes } from "../../types/messages/components/messageComponentTypes.ts"; /** Send a message to the channel. Requires SEND_MESSAGES permission. */ export async function sendMessage(bot: Bot, channelId: bigint, content: string | CreateMessage) { @@ -19,7 +19,7 @@ export async function sendMessage(bot: Bot, channelId: bigint, content: string | if (content.allowedMentions) { if (content.allowedMentions.users?.length) { - if (content.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + if (content.allowedMentions.parse?.includes(AllowedMentionsTypes.UserMentions)) { content.allowedMentions.parse = content.allowedMentions.parse.filter((p) => p !== "users"); } @@ -29,7 +29,7 @@ export async function sendMessage(bot: Bot, channelId: bigint, content: string | } if (content.allowedMentions.roles?.length) { - if (content.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + if (content.allowedMentions.parse?.includes(AllowedMentionsTypes.RoleMentions)) { content.allowedMentions.parse = content.allowedMentions.parse.filter((p) => p !== "roles"); } @@ -107,7 +107,7 @@ export async function sendMessage(bot: Bot, channelId: bigint, content: string | components: content.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/misc/editBotStatus.ts b/src/helpers/misc/editBotStatus.ts index e83487c0a..c45edfc38 100644 --- a/src/helpers/misc/editBotStatus.ts +++ b/src/helpers/misc/editBotStatus.ts @@ -1,13 +1,13 @@ import type { Bot } from "../../bot.ts"; -import { DiscordGatewayOpcodes } from "../../types/codes/gateway_opcodes.ts"; -import type { StatusUpdate } from "../../types/gateway/status_update.ts"; +import { GatewayOpcodes } from "../../types/codes/gatewayOpcodes.ts"; +import type { StatusUpdate } from "../../types/gateway/statusUpdate.ts"; export function editBotStatus(bot: Bot, data: Omit) { bot.gateway.shards.forEach((shard) => { bot.events.debug(`Running forEach loop in editBotStatus function.`); bot.gateway.sendShardMessage(bot.gateway, shard, { - op: DiscordGatewayOpcodes.StatusUpdate, + op: GatewayOpcodes.StatusUpdate, d: { since: null, afk: false, diff --git a/src/helpers/misc/getGatewayBot.ts b/src/helpers/misc/getGatewayBot.ts index 7fa01739f..1cffbedf4 100644 --- a/src/helpers/misc/getGatewayBot.ts +++ b/src/helpers/misc/getGatewayBot.ts @@ -1,4 +1,4 @@ -import type { GetGatewayBot } from "../../types/gateway/get_gateway_bot.ts"; +import type { GetGatewayBot } from "../../types/gateway/getGatewayBot.ts"; import type { Bot } from "../../bot.ts"; import { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/mod.ts b/src/helpers/mod.ts index fc9739c28..f44bfb3af 100644 --- a/src/helpers/mod.ts +++ b/src/helpers/mod.ts @@ -1,154 +1,154 @@ -import { channelOverwriteHasPermission } from "./channels/channel_overwrite_has_permission.ts"; -import { createChannel } from "./channels/create_channel.ts"; -import { deleteChannel } from "./channels/delete_channel.ts"; -import { deleteChannelOverwrite } from "./channels/delete_channel_overwrite.ts"; -import { editChannel } from "./channels/edit_channel.ts"; -import { editChannelOverwrite } from "./channels/edit_channel_overwrite.ts"; -import { followChannel } from "./channels/follow_channel.ts"; -import { getChannel } from "./channels/get_channel.ts"; -import { getChannels } from "./channels/get_channels.ts"; -import { getChannelWebhooks } from "./channels/get_channel_webhooks.ts"; -import { getPins } from "./channels/get_pins.ts"; -import { startTyping } from "./channels/start_typing.ts"; -import { swapChannels } from "./channels/swap_channels.ts"; -import { updateBotVoiceState } from "./channels/update_voice_state.ts"; -import { addDiscoverySubcategory } from "./discovery/add_discovery_subcategory.ts"; -import { editDiscovery } from "./discovery/edit_discovery.ts"; -import { getDiscoveryCategories } from "./discovery/get_discovery_categories.ts"; -import { removeDiscoverySubcategory } from "./discovery/remove_discovery_subcategory.ts"; -import { validDiscoveryTerm } from "./discovery/valid_discovery_term.ts"; -import { createEmoji } from "./emojis/create_emoji.ts"; -import { deleteEmoji } from "./emojis/delete_emoji.ts"; -import { editEmoji } from "./emojis/edit_emoji.ts"; -import { emojiURL } from "./emojis/emoji_url.ts"; -import { getEmoji } from "./emojis/get_emoji.ts"; -import { getEmojis } from "./emojis/get_emojis.ts"; -import { createGuild } from "./guilds/create_guild.ts"; -import { deleteGuild } from "./guilds/delete_guild.ts"; -import { editGuild } from "./guilds/edit_guild.ts"; -import { editWelcomeScreen } from "./guilds/edit_welcome_screen.ts"; -import { editWidget } from "./guilds/edit_widget.ts"; -import { getAuditLogs } from "./guilds/get_audit_logs.ts"; -import { getAvailableVoiceRegions } from "./guilds/get_available_voice_regions.ts"; -import { getBan } from "./guilds/get_ban.ts"; -import { getBans } from "./guilds/get_bans.ts"; -import { getGuild } from "./guilds/get_guild.ts"; -import { getGuildPreview } from "./guilds/get_guild_preview.ts"; -import { getPruneCount } from "./guilds/get_prune_count.ts"; -import { getVanityURL } from "./guilds/get_vanity_url.ts"; -import { getVoiceRegions } from "./guilds/get_voice_regions.ts"; -import { getWelcomeScreen } from "./guilds/get_welcome_screen.ts"; -import { getWidget } from "./guilds/get_widget.ts"; -import { getWidgetImageURL } from "./guilds/get_widget_image_url.ts"; -import { getWidgetSettings } from "./guilds/get_widget_settings.ts"; -import { guildBannerURL } from "./guilds/guild_banner_url.ts"; -import { guildIconURL } from "./guilds/guild_icon_url.ts"; -import { guildSplashURL } from "./guilds/guild_splash_url.ts"; -import { leaveGuild } from "./guilds/leave_guild.ts"; -import { deleteIntegration } from "./integrations/delete_integration.ts"; -import { getIntegrations } from "./integrations/get_integrations.ts"; -import { batchEditSlashCommandPermissions } from "./interactions/commands/batch_edit_slash_command_permissions.ts"; -import { createSlashCommand } from "./interactions/commands/create_slash_command.ts"; -import { deleteSlashCommand } from "./interactions/commands/delete_slash_command.ts"; -import { deleteSlashResponse } from "./interactions/commands/delete_slash_response.ts"; -import { editSlashCommandPermissions } from "./interactions/commands/edit_slash_command_permissions.ts"; -import { editSlashResponse } from "./interactions/commands/edit_slash_response.ts"; -import { getSlashCommand } from "./interactions/commands/get_slash_command.ts"; -import { getSlashCommands } from "./interactions/commands/get_slash_commands.ts"; -import { getSlashCommandPermission } from "./interactions/commands/get_slash_command_permission.ts"; -import { getSlashCommandPermissions } from "./interactions/commands/get_slash_command_permissions.ts"; -import { upsertSlashCommand } from "./interactions/commands/upsert_slash_command.ts"; -import { upsertSlashCommands } from "./interactions/commands/upsert_slash_commands.ts"; -import { getOriginalInteractionResponse } from "./interactions/get_original_interaction_response.ts"; -import { sendInteractionResponse } from "./interactions/send_interaction_response.ts"; -import { createInvite } from "./invites/create_invite.ts"; -import { deleteInvite } from "./invites/delete_invite.ts"; -import { getChannelInvites } from "./invites/get_channel_invites.ts"; -import { getInvite } from "./invites/get_invite.ts"; -import { getInvites } from "./invites/get_invites.ts"; -import { avatarURL } from "./members/avatar_url.ts"; -import { ban, banMember } from "./members/ban_member.ts"; -import { disconnectMember } from "./members/disconnect_member.ts"; -import { editBotNickname } from "./members/edit_bot_nickname.ts"; -import { editMember } from "./members/edit_member.ts"; -import { fetchMembers } from "./members/fetch_members.ts"; -import { getMember } from "./members/get_member.ts"; -import { getMembers } from "./members/get_members.ts"; -import { kickMember } from "./members/kick_member.ts"; -import { moveMember } from "./members/move_member.ts"; -import { pruneMembers } from "./members/prune_members.ts"; -import { getDmChannel } from "./members/send_direct_message.ts"; -import { unbanMember } from "./members/unban_member.ts"; -import { addReaction } from "./messages/add_reaction.ts"; -import { addReactions } from "./messages/add_reactions.ts"; -import { deleteMessage } from "./messages/delete_message.ts"; -import { deleteMessages } from "./messages/delete_messages.ts"; -import { editMessage } from "./messages/edit_message.ts"; -import { getMessage } from "./messages/get_message.ts"; -import { getMessages } from "./messages/get_messages.ts"; -import { getReactions } from "./messages/get_reactions.ts"; -import { pinMessage } from "./messages/pin_message.ts"; -import { publishMessage } from "./messages/publish_message.ts"; -import { removeAllReactions } from "./messages/remove_all_reactions.ts"; -import { removeReaction } from "./messages/remove_reaction.ts"; -import { removeReactionEmoji } from "./messages/remove_reaction_emoji.ts"; -import { sendMessage } from "./messages/send_message.ts"; -import { suppressEmbeds } from "./messages/suppress_embeds.ts"; -import { unpinMessage } from "./messages/unpin_message.ts"; -import { editBotProfile } from "./misc/edit_bot_profile.ts"; -import { editBotStatus } from "./misc/edit_bot_status.ts"; -import { getGatewayBot } from "./misc/get_gateway_bot.ts"; -import { getUser } from "./misc/get_user.ts"; -import { getApplicationInfo } from "./oauth/get_application.ts"; -import { addRole } from "./roles/add_role.ts"; -import { createRole } from "./roles/create_role.ts"; -import { deleteRole } from "./roles/delete_role.ts"; -import { editRole } from "./roles/edit_role.ts"; -import { getRoles } from "./roles/get_roles.ts"; -import { removeRole } from "./roles/remove_role.ts"; -import { createGuildFromTemplate } from "./templates/create_guild_from_template.ts"; -import { createGuildTemplate } from "./templates/create_guild_template.ts"; -import { deleteGuildTemplate } from "./templates/delete_guild_template.ts"; -import { editGuildTemplate } from "./templates/edit_guild_template.ts"; -import { getGuildTemplates } from "./templates/get_guild_templates.ts"; -import { getTemplate } from "./templates/get_template.ts"; -import { syncGuildTemplate } from "./templates/sync_guild_template.ts"; +import { channelOverwriteHasPermission } from "./channels/channelOverwriteHasPermission.ts"; +import { createChannel } from "./channels/createChannel.ts"; +import { deleteChannel } from "./channels/deleteChannel.ts"; +import { deleteChannelOverwrite } from "./channels/deleteChannelOverwrite.ts"; +import { editChannel } from "./channels/editChannel.ts"; +import { editChannelOverwrite } from "./channels/editChannelOverwrite.ts"; +import { followChannel } from "./channels/followChannel.ts"; +import { getChannel } from "./channels/getChannel.ts"; +import { getChannels } from "./channels/getChannels.ts"; +import { getChannelWebhooks } from "./channels/getChannelWebhooks.ts"; +import { getPins } from "./channels/getPins.ts"; +import { startTyping } from "./channels/startTyping.ts"; +import { swapChannels } from "./channels/swapChannels.ts"; +import { updateBotVoiceState } from "./channels/updateBotVoiceState.ts"; +import { addDiscoverySubcategory } from "./discovery/addDiscoverySubcategory.ts"; +import { editDiscovery } from "./discovery/editDiscovery.ts"; +import { getDiscoveryCategories } from "./discovery/getDiscoveryCategories.ts"; +import { removeDiscoverySubcategory } from "./discovery/removeDiscoverySubcategory.ts"; +import { validDiscoveryTerm } from "./discovery/validDiscoveryTerm.ts"; +import { createEmoji } from "./emojis/createEmoji.ts"; +import { deleteEmoji } from "./emojis/deleteEmoji.ts"; +import { editEmoji } from "./emojis/editEmoji.ts"; +import { emojiURL } from "./emojis/emojiUrl.ts"; +import { getEmoji } from "./emojis/getEmoji.ts"; +import { getEmojis } from "./emojis/getEmojis.ts"; +import { createGuild } from "./guilds/createGuild.ts"; +import { deleteGuild } from "./guilds/deleteGuild.ts"; +import { editGuild } from "./guilds/editGuild.ts"; +import { editWelcomeScreen } from "./guilds/editWelcomeScreen.ts"; +import { editWidget } from "./guilds/editWidget.ts"; +import { getAuditLogs } from "./guilds/getAuditLogs.ts"; +import { getAvailableVoiceRegions } from "./guilds/getAvailableVoiceRegions.ts"; +import { getBan } from "./guilds/getBan.ts"; +import { getBans } from "./guilds/getBans.ts"; +import { getGuild } from "./guilds/getGuild.ts"; +import { getGuildPreview } from "./guilds/getGuildPreview.ts"; +import { getPruneCount } from "./guilds/getPruneCount.ts"; +import { getVanityURL } from "./guilds/getVanityUrl.ts"; +import { getVoiceRegions } from "./guilds/getVoiceRegions.ts"; +import { getWelcomeScreen } from "./guilds/getWelcomeScreen.ts"; +import { getWidget } from "./guilds/getWidget.ts"; +import { getWidgetImageURL } from "./guilds/getWidgetImageUrl.ts"; +import { getWidgetSettings } from "./guilds/getWidgetSettings.ts"; +import { guildBannerURL } from "./guilds/guildBannerUrl.ts"; +import { guildIconURL } from "./guilds/guildIconUrl.ts"; +import { guildSplashURL } from "./guilds/guildSplashUrl.ts"; +import { leaveGuild } from "./guilds/leaveGuild.ts"; +import { deleteIntegration } from "./integrations/deleteIntegration.ts"; +import { getIntegrations } from "./integrations/getIntegrations.ts"; +import { batchEditSlashCommandPermissions } from "./interactions/commands/batchEditSlashCommandPermissions.ts"; +import { createSlashCommand } from "./interactions/commands/createSlashCommand.ts"; +import { deleteSlashCommand } from "./interactions/commands/deleteSlashCommand.ts"; +import { deleteSlashResponse } from "./interactions/commands/deleteSlashResponse.ts"; +import { editSlashCommandPermissions } from "./interactions/commands/editSlashCommandPermissions.ts"; +import { editSlashResponse } from "./interactions/commands/editSlashResponse.ts"; +import { getSlashCommand } from "./interactions/commands/getSlashCommand.ts"; +import { getSlashCommands } from "./interactions/commands/getSlashCommands.ts"; +import { getSlashCommandPermission } from "./interactions/commands/getSlashCommandPermission.ts"; +import { getSlashCommandPermissions } from "./interactions/commands/getSlashCommandPermissions.ts"; +import { upsertSlashCommand } from "./interactions/commands/upsertSlashCommand.ts"; +import { upsertSlashCommands } from "./interactions/commands/upsertSlashCommands.ts"; +import { getOriginalInteractionResponse } from "./interactions/getOriginalInteractionResponse.ts"; +import { sendInteractionResponse } from "./interactions/sendInteractionResponse.ts"; +import { createInvite } from "./invites/createInvite.ts"; +import { deleteInvite } from "./invites/deleteInvite.ts"; +import { getChannelInvites } from "./invites/getChannelInvites.ts"; +import { getInvite } from "./invites/getInvite.ts"; +import { getInvites } from "./invites/getInvites.ts"; +import { avatarURL } from "./members/avatarUrl.ts"; +import { banMember } from "./members/banMember.ts"; +import { disconnectMember } from "./members/disconnectMember.ts"; +import { editBotNickname } from "./members/editBotNickname.ts"; +import { editMember } from "./members/editMember.ts"; +import { fetchMembers } from "./members/fetchMembers.ts"; +import { getMember } from "./members/getMember.ts"; +import { getMembers } from "./members/getMembers.ts"; +import { kickMember } from "./members/kickMember.ts"; +import { moveMember } from "./members/moveMember.ts"; +import { pruneMembers } from "./members/pruneMembers.ts"; +import { getDmChannel } from "./members/getDmChannel.ts"; +import { unbanMember } from "./members/unbanMember.ts"; +import { addReaction } from "./messages/addReaction.ts"; +import { addReactions } from "./messages/addReactions.ts"; +import { deleteMessage } from "./messages/deleteMessage.ts"; +import { deleteMessages } from "./messages/deleteMessages.ts"; +import { editMessage } from "./messages/editMessage.ts"; +import { getMessage } from "./messages/getMessage.ts"; +import { getMessages } from "./messages/getMessages.ts"; +import { getReactions } from "./messages/getReactions.ts"; +import { pinMessage } from "./messages/pinMessage.ts"; +import { publishMessage } from "./messages/publishMessage.ts"; +import { removeAllReactions } from "./messages/removeAllReactions.ts"; +import { removeReaction } from "./messages/removeReaction.ts"; +import { removeReactionEmoji } from "./messages/removeReactionEmoji.ts"; +import { sendMessage } from "./messages/sendMessage.ts"; +import { suppressEmbeds } from "./messages/suppressEmbeds.ts"; +import { unpinMessage } from "./messages/unpinMessage.ts"; +import { editBotProfile } from "./misc/editBotProfile.ts"; +import { editBotStatus } from "./misc/editBotStatus.ts"; +import { getGatewayBot } from "./misc/getGatewayBot.ts"; +import { getUser } from "./misc/getUser.ts"; +import { getApplicationInfo } from "./oauth/getApplicationInfo.ts"; +import { addRole } from "./roles/addRole.ts"; +import { createRole } from "./roles/createRole.ts"; +import { deleteRole } from "./roles/deleteRole.ts"; +import { editRole } from "./roles/editRole.ts"; +import { getRoles } from "./roles/getRoles.ts"; +import { removeRole } from "./roles/removeRole.ts"; +import { createGuildFromTemplate } from "./templates/createGuildFromTemplate.ts"; +import { createGuildTemplate } from "./templates/createGuildTemplate.ts"; +import { deleteGuildTemplate } from "./templates/deleteGuildTemplate.ts"; +import { editGuildTemplate } from "./templates/editGuildTemplate.ts"; +import { getGuildTemplates } from "./templates/getGuildTemplates.ts"; +import { getTemplate } from "./templates/getTemplate.ts"; +import { syncGuildTemplate } from "./templates/syncGuildTemplate.ts"; -import { createWebhook } from "./webhooks/create_webhook.ts"; -import { deleteWebhook } from "./webhooks/delete_webhook.ts"; -import { deleteWebhookMessage } from "./webhooks/delete_webhook_message.ts"; -import { deleteWebhookWithToken } from "./webhooks/delete_webhook_with_token.ts"; -import { editWebhook } from "./webhooks/edit_webhook.ts"; -import { editWebhookMessage } from "./webhooks/edit_webhook_message.ts"; -import { editWebhookWithToken } from "./webhooks/edit_webhook_with_token.ts"; -import { getWebhook } from "./webhooks/get_webhook.ts"; -import { getWebhooks } from "./webhooks/get_webhooks.ts"; -import { getWebhookMessage } from "./webhooks/get_webhook_message.ts"; -import { getWebhookWithToken } from "./webhooks/get_webhook_with_token.ts"; -import { sendWebhook } from "./webhooks/send_webhook.ts"; -import { createStageInstance } from "./channels/create_stage_instance.ts"; -import { updateStageInstance } from "./channels/update_stage_instance.ts"; -import { getStageInstance } from "./channels/get_stage_instance.ts"; -import { deleteStageInstance } from "./channels/delete_stage_instance.ts"; -import { connectToVoiceChannel } from "./voice/connect_to_voice_channel.ts"; +import { createWebhook } from "./webhooks/createWebhook.ts"; +import { deleteWebhook } from "./webhooks/deleteWebhook.ts"; +import { deleteWebhookMessage } from "./webhooks/deleteWebhookMessage.ts"; +import { deleteWebhookWithToken } from "./webhooks/deleteWebhookWithToken.ts"; +import { editWebhook } from "./webhooks/editWebhook.ts"; +import { editWebhookMessage } from "./webhooks/editWebhookMessage.ts"; +import { editWebhookWithToken } from "./webhooks/editWebhookWithToken.ts"; +import { getWebhook } from "./webhooks/getWebhook.ts"; +import { getWebhooks } from "./webhooks/getWebhooks.ts"; +import { getWebhookMessage } from "./webhooks/getWebhookMessage.ts"; +import { getWebhookWithToken } from "./webhooks/getWebhookWithToken.ts"; +import { sendWebhook } from "./webhooks/sendWebhook.ts"; +import { createStageInstance } from "./channels/createStageInstance.ts"; +import { updateStageInstance } from "./channels/updateStageInstance.ts"; +import { getStageInstance } from "./channels/getStageInstance.ts"; +import { deleteStageInstance } from "./channels/deleteStageInstance.ts"; +import { connectToVoiceChannel } from "./voice/connectToVoiceChannel.ts"; -import { addToThread } from "./channels/threads/add_to_thread.ts"; -import { archiveThread } from "./channels/threads/archive_thread.ts"; -import { deleteThread } from "./channels/threads/delete_thread.ts"; -import { editThread } from "./channels/threads/edit_thread.ts"; -import { getActiveThreads } from "./channels/threads/get_active_threads.ts"; -import { getArchivedThreads } from "./channels/threads/get_archived_threads.ts"; +import { addToThread } from "./channels/threads/addToThread.ts"; +import { archiveThread } from "./channels/threads/archiveThread.ts"; +import { deleteThread } from "./channels/threads/deleteThread.ts"; +import { editThread } from "./channels/threads/editThread.ts"; +import { getActiveThreads } from "./channels/threads/getActiveThreads.ts"; +import { getArchivedThreads } from "./channels/threads/getArchivedThreads.ts"; import { getThreadMember } from "./channels/threads/getThreadMember.ts"; -import { getThreadMembers } from "./channels/threads/get_thread_members.ts"; -import { joinThread } from "./channels/threads/join_thread.ts"; -import { leaveThread } from "./channels/threads/leave_thread.ts"; -import { lockThread } from "./channels/threads/lock_thread.ts"; -import { removeThreadMember } from "./channels/threads/remove_thread_member.ts"; +import { getThreadMembers } from "./channels/threads/getThreadMembers.ts"; +import { joinThread } from "./channels/threads/joinThread.ts"; +import { leaveThread } from "./channels/threads/leaveThread.ts"; +import { lockThread } from "./channels/threads/lockThread.ts"; +import { removeThreadMember } from "./channels/threads/removeThreadMember.ts"; import { startThreadWithMessage } from "./channels/threads/startThreadWithMessage.ts"; import { startThreadWithoutMessage } from "./channels/threads/startThreadWithoutMessage.ts"; -import { unarchiveThread } from "./channels/threads/unarchive_thread.ts"; -import { unlockThread } from "./channels/threads/unlock_thread.ts"; -import { cloneChannel } from "./channels/clone_channel.ts"; +import { unarchiveThread } from "./channels/threads/unarchiveThread.ts"; +import { unlockThread } from "./channels/threads/unlockThread.ts"; +import { cloneChannel } from "./channels/cloneChannel.ts"; export { addDiscoverySubcategory, @@ -156,7 +156,6 @@ export { addReactions, addRole, avatarURL, - ban, banMember, batchEditSlashCommandPermissions, channelOverwriteHasPermission, diff --git a/src/helpers/roles/createRole.ts b/src/helpers/roles/createRole.ts index 15a679019..7bad10044 100644 --- a/src/helpers/roles/createRole.ts +++ b/src/helpers/roles/createRole.ts @@ -1,4 +1,4 @@ -import type { CreateGuildRole } from "../../types/guilds/create_guild_role.ts"; +import type { CreateGuildRole } from "../../types/guilds/createGuildRole.ts"; import type { Role } from "../../types/permissions/role.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/roles/editRole.ts b/src/helpers/roles/editRole.ts index 5d08bfbe7..c9163b6e7 100644 --- a/src/helpers/roles/editRole.ts +++ b/src/helpers/roles/editRole.ts @@ -1,4 +1,4 @@ -import type { CreateGuildRole } from "../../types/guilds/create_guild_role.ts"; +import type { CreateGuildRole } from "../../types/guilds/createGuildRole.ts"; import type { Role } from "../../types/permissions/role.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/templates/createGuildFromTemplate.ts b/src/helpers/templates/createGuildFromTemplate.ts index 7d6baa59b..cc9f72d05 100644 --- a/src/helpers/templates/createGuildFromTemplate.ts +++ b/src/helpers/templates/createGuildFromTemplate.ts @@ -1,5 +1,5 @@ import type { Guild } from "../../types/guilds/guild.ts"; -import type { CreateGuildFromTemplate } from "../../types/templates/create_guild_from_template.ts"; +import type { CreateGuildFromTemplate } from "../../types/templates/createGuildFromTemplate.ts"; import type { Bot } from "../../bot.ts"; /** diff --git a/src/helpers/templates/editGuildTemplate.ts b/src/helpers/templates/editGuildTemplate.ts index 1f51636d9..a5b73fc56 100644 --- a/src/helpers/templates/editGuildTemplate.ts +++ b/src/helpers/templates/editGuildTemplate.ts @@ -1,4 +1,4 @@ -import type { ModifyGuildTemplate } from "../../types/templates/modify_guild_template.ts"; +import type { ModifyGuildTemplate } from "../../types/templates/modifyGuildTemplate.ts"; import type { Template } from "../../types/templates/template.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/voice/connectToVoiceChannel.ts b/src/helpers/voice/connectToVoiceChannel.ts index 3b8d0c5b3..f1c8214d3 100644 --- a/src/helpers/voice/connectToVoiceChannel.ts +++ b/src/helpers/voice/connectToVoiceChannel.ts @@ -1,7 +1,7 @@ -import type { UpdateVoiceState } from "../../types/voice/update_voice_state.ts"; +import type { UpdateVoiceState } from "../../types/voice/updateVoiceState.ts"; import type { AtLeastOne } from "../../types/util.ts"; import type { Bot } from "../../bot.ts"; -import { DiscordGatewayOpcodes } from "../../types/codes/gateway_opcodes.ts"; +import { GatewayOpcodes } from "../../types/codes/gatewayOpcodes.ts"; /** Connect or join a voice channel inside a guild. By default, the "selfDeaf" option is true. Requires `CONNECT` and `VIEW_CHANNEL` permissions. */ export async function connectToVoiceChannel( @@ -11,7 +11,7 @@ export async function connectToVoiceChannel( options?: AtLeastOne> ) { bot.gateway.sendShardMessage(bot.gateway, bot.utils.calculateShardId(bot.gateway, guildId), { - op: DiscordGatewayOpcodes.VoiceStateUpdate, + op: GatewayOpcodes.VoiceStateUpdate, d: { guild_id: guildId.toString(), channel_id: channelId.toString(), diff --git a/src/helpers/webhooks/createWebhook.ts b/src/helpers/webhooks/createWebhook.ts index 264ad79c2..8bbef6d09 100644 --- a/src/helpers/webhooks/createWebhook.ts +++ b/src/helpers/webhooks/createWebhook.ts @@ -1,5 +1,5 @@ import type { Bot } from "../../bot.ts"; -import type { CreateWebhook } from "../../types/webhooks/create_webhook.ts"; +import type { CreateWebhook } from "../../types/webhooks/createWebhook.ts"; import type { Webhook } from "../../types/webhooks/webhook.ts"; /** diff --git a/src/helpers/webhooks/editWebhook.ts b/src/helpers/webhooks/editWebhook.ts index b22719cc1..0521cf344 100644 --- a/src/helpers/webhooks/editWebhook.ts +++ b/src/helpers/webhooks/editWebhook.ts @@ -1,4 +1,4 @@ -import type { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts"; +import type { ModifyWebhook } from "../../types/webhooks/modifyWebhook.ts"; import type { Webhook } from "../../types/webhooks/webhook.ts"; import type { Bot } from "../../bot.ts"; diff --git a/src/helpers/webhooks/editWebhookMessage.ts b/src/helpers/webhooks/editWebhookMessage.ts index 75afef9e7..cec86e99a 100644 --- a/src/helpers/webhooks/editWebhookMessage.ts +++ b/src/helpers/webhooks/editWebhookMessage.ts @@ -1,8 +1,8 @@ import type { Message } from "../../types/messages/message.ts"; -import type { EditWebhookMessage } from "../../types/webhooks/edit_webhook_message.ts"; +import type { EditWebhookMessage } from "../../types/webhooks/editWebhookMessage.ts"; import type { Bot } from "../../bot.ts"; -import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; -import { DiscordMessageComponentTypes } from "../../types/messages/components/message_component_types.ts"; +import { AllowedMentionsTypes } from "../../types/messages/allowedMentionsTypes.ts"; +import { MessageComponentTypes } from "../../types/messages/components/messageComponentTypes.ts"; export async function editWebhookMessage( bot: Bot, @@ -20,7 +20,7 @@ export async function editWebhookMessage( if (options.allowedMentions) { if (options.allowedMentions.users?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.UserMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "users"); } @@ -30,7 +30,7 @@ export async function editWebhookMessage( } if (options.allowedMentions.roles?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.RoleMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "roles"); } @@ -66,7 +66,7 @@ export async function editWebhookMessage( components: options.components?.map((component) => ({ type: component.type, components: component.components.map((subcomponent) => { - if (subcomponent.type === DiscordMessageComponentTypes.SelectMenu) + if (subcomponent.type === MessageComponentTypes.SelectMenu) return { type: subcomponent.type, custom_id: subcomponent.customId, diff --git a/src/helpers/webhooks/editWebhookWithToken.ts b/src/helpers/webhooks/editWebhookWithToken.ts index 8cf68890d..dac2c241b 100644 --- a/src/helpers/webhooks/editWebhookWithToken.ts +++ b/src/helpers/webhooks/editWebhookWithToken.ts @@ -1,4 +1,4 @@ -import type { ModifyWebhook } from "../../types/webhooks/modify_webhook.ts"; +import type { ModifyWebhook } from "../../types/webhooks/modifyWebhook.ts"; import type { Webhook } from "../../types/webhooks/webhook.ts"; import type { Bot } from "../../bot.ts"; import type { SnakeCasedPropertiesDeep } from "../../types/util.ts"; diff --git a/src/helpers/webhooks/sendWebhook.ts b/src/helpers/webhooks/sendWebhook.ts index 2bbfbac78..914ad7d65 100644 --- a/src/helpers/webhooks/sendWebhook.ts +++ b/src/helpers/webhooks/sendWebhook.ts @@ -1,7 +1,7 @@ import type { Bot } from "../../bot.ts"; -import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts"; +import { AllowedMentionsTypes } from "../../types/messages/allowedMentionsTypes.ts"; import type { Message } from "../../types/messages/message.ts"; -import type { ExecuteWebhook } from "../../types/webhooks/execute_webhook.ts"; +import type { ExecuteWebhook } from "../../types/webhooks/executeWebhook.ts"; /** Send a webhook with webhook Id and webhook token */ export async function sendWebhook(bot: Bot, webhookId: bigint, webhookToken: string, options: ExecuteWebhook) { @@ -17,7 +17,7 @@ export async function sendWebhook(bot: Bot, webhookId: bigint, webhookToken: str if (options.allowedMentions) { if (options.allowedMentions.users?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.UserMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.UserMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "users"); } @@ -27,7 +27,7 @@ export async function sendWebhook(bot: Bot, webhookId: bigint, webhookToken: str } if (options.allowedMentions.roles?.length) { - if (options.allowedMentions.parse?.includes(DiscordAllowedMentionsTypes.RoleMentions)) { + if (options.allowedMentions.parse?.includes(AllowedMentionsTypes.RoleMentions)) { options.allowedMentions.parse = options.allowedMentions.parse.filter((p) => p !== "roles"); } diff --git a/src/rest/createRequestBody.ts b/src/rest/createRequestBody.ts index 2e874f4b5..cba842825 100644 --- a/src/rest/createRequestBody.ts +++ b/src/rest/createRequestBody.ts @@ -1,5 +1,5 @@ import { RestManager } from "../bot.ts"; -import type { FileContent } from "../types/discordeno/file_content.ts"; +import type { FileContent } from "../types/discordeno/fileContent.ts"; import { USER_AGENT } from "../util/constants.ts"; import { RestPayload, RestRequest } from "./rest.ts"; diff --git a/src/rest/mod.ts b/src/rest/mod.ts index 0b4f8ded0..b7bf838d3 100644 --- a/src/rest/mod.ts +++ b/src/rest/mod.ts @@ -1,11 +1,11 @@ -export * from "./check_rate_limits.ts"; -export * from "./cleanup_queues.ts"; -export * from "./create_request_body.ts"; -export * from "./process_global_queue.ts"; -export * from "./process_queue.ts"; -export * from "./process_rate_limited_paths.ts"; -export * from "./process_request.ts"; -export * from "./process_request_headers.ts"; +export * from "./checkRateLimits.ts"; +export * from "./cleanupQueues.ts"; +export * from "./createRequestBody.ts"; +export * from "./processGlobalQueue.ts"; +export * from "./processQueue.ts"; +export * from "./processRateLimitedPaths.ts"; +export * from "./processRequest.ts"; +export * from "./processRequestHeaders.ts"; export * from "./rest.ts"; -export * from "./run_method.ts"; -export * from "./simplify_url.ts"; +export * from "./runMethod.ts"; +export * from "./simplifyUrl.ts"; diff --git a/src/rest/processGlobalQueue.ts b/src/rest/processGlobalQueue.ts index b57a1dd0b..9ea6440d7 100644 --- a/src/rest/processGlobalQueue.ts +++ b/src/rest/processGlobalQueue.ts @@ -1,5 +1,5 @@ import { RestManager } from "../bot.ts"; -import { DiscordHTTPResponseCodes } from "../types/codes/http_response_codes.ts"; +import { HTTPResponseCodes } from "../types/codes/httpResponseCodes.ts"; export async function processGlobalQueue(rest: RestManager) { // IF QUEUE IS EMPTY EXIT @@ -80,22 +80,22 @@ export async function processGlobalQueue(rest: RestManager) { let error = "REQUEST_UNKNOWN_ERROR"; switch (response.status) { - case DiscordHTTPResponseCodes.BadRequest: + case HTTPResponseCodes.BadRequest: error = "The request was improperly formatted, or the server couldn't understand it."; break; - case DiscordHTTPResponseCodes.Unauthorized: + case HTTPResponseCodes.Unauthorized: error = "The Authorization header was missing or invalid."; break; - case DiscordHTTPResponseCodes.Forbidden: + case HTTPResponseCodes.Forbidden: error = "The Authorization token you passed did not have permission to the resource."; break; - case DiscordHTTPResponseCodes.NotFound: + case HTTPResponseCodes.NotFound: error = "The resource at the location specified doesn't exist."; break; - case DiscordHTTPResponseCodes.MethodNotAllowed: + case HTTPResponseCodes.MethodNotAllowed: error = "The HTTP method used is not valid for the location specified."; break; - case DiscordHTTPResponseCodes.GatewayUnavailable: + case HTTPResponseCodes.GatewayUnavailable: error = "There was not a gateway available to process your request. Wait a bit and retry."; break; } diff --git a/src/rest/rest.ts b/src/rest/rest.ts index d0fd0ce95..94d47abaf 100644 --- a/src/rest/rest.ts +++ b/src/rest/rest.ts @@ -1,13 +1,13 @@ // deno-lint-ignore-file no-unused-vars -import { checkRateLimits } from "./check_rate_limits.ts"; -import { cleanupQueues } from "./cleanup_queues.ts"; -import { createRequestBody } from "./create_request_body.ts"; -import { processQueue } from "./process_queue.ts"; -import { processRateLimitedPaths } from "./process_rate_limited_paths.ts"; -import { processRequest } from "./process_request.ts"; -import { processRequestHeaders } from "./process_request_headers.ts"; -import { runMethod } from "./run_method.ts"; -import { simplifyUrl } from "./simplify_url.ts"; +import { checkRateLimits } from "./checkRateLimits.ts"; +import { cleanupQueues } from "./cleanupQueues.ts"; +import { createRequestBody } from "./createRequestBody.ts"; +import { processQueue } from "./processQueue.ts"; +import { processRateLimitedPaths } from "./processRateLimitedPaths.ts"; +import { processRequest } from "./processRequest.ts"; +import { processRequestHeaders } from "./processRequestHeaders.ts"; +import { runMethod } from "./runMethod.ts"; +import { simplifyUrl } from "./simplifyUrl.ts"; export const rest = { /** The bot token for this rest client. */ diff --git a/src/rest/run_method.ts b/src/rest/runMethod.ts similarity index 100% rename from src/rest/run_method.ts rename to src/rest/runMethod.ts diff --git a/src/rest/simplify_url.ts b/src/rest/simplifyUrl.ts similarity index 100% rename from src/rest/simplify_url.ts rename to src/rest/simplifyUrl.ts diff --git a/src/transformers/activity.ts b/src/transformers/activity.ts index c11544380..cf9ab435a 100644 --- a/src/transformers/activity.ts +++ b/src/transformers/activity.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; import { Activity } from "../types/activity/activity.ts"; -import { DiscordActivityTypes } from "../types/activity/activity_types.ts"; +import { ActivityTypes } from "../types/activity/activityTypes.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoEmoji } from "./emoji.ts"; @@ -36,7 +36,7 @@ export interface DiscordenoActivity { /** The activity's name */ name: string; /** Activity type */ - type: DiscordActivityTypes; + type: ActivityTypes; /** Stream url, is validated when type is 1 */ url?: string; /** Unix timestamp of when the activity was added to the user's session */ diff --git a/src/transformers/application.ts b/src/transformers/application.ts index 1336b8f67..d691a1e59 100644 --- a/src/transformers/application.ts +++ b/src/transformers/application.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; import { Application } from "../types/applications/application.ts"; -import { DiscordApplicationFlags } from "../types/applications/application_flags.ts"; +import { ApplicationFlags } from "../types/applications/applicationFlags.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoUser } from "./member.ts"; import { DiscordenoTeam } from "./team.ts"; @@ -66,5 +66,5 @@ export interface DiscordenoApplication { /** If this application is a game sold on Discord, this field will be the hash of the image on store embeds */ coverImage?: string; /** The application's public flags */ - flags?: DiscordApplicationFlags; + flags?: ApplicationFlags; } diff --git a/src/transformers/applicationCommandPermission.ts b/src/transformers/applicationCommandPermission.ts index 82cc0e144..31d8a6b57 100644 --- a/src/transformers/applicationCommandPermission.ts +++ b/src/transformers/applicationCommandPermission.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; -import { DiscordApplicationCommandPermissionTypes } from "../types/interactions/commands/application_command_permission_types.ts"; -import { GuildApplicationCommandPermissions } from "../types/interactions/commands/guild_application_command_permissions.ts"; +import { ApplicationCommandPermissionTypes } from "../types/interactions/commands/applicationCommandPermissionTypes.ts"; +import { GuildApplicationCommandPermissions } from "../types/interactions/commands/guildApplicationCommandPermissions.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; export function transformApplicationCommandPermission( @@ -31,7 +31,7 @@ export interface DiscordenoApplicationCommandPermission { /** The id of the role or user */ id: bigint; /** Role or User */ - type: DiscordApplicationCommandPermissionTypes; + type: ApplicationCommandPermissionTypes; /** `true` to allow, `false`, to disallow */ permission: boolean; }[]; diff --git a/src/transformers/auditlogEntry.ts b/src/transformers/auditlogEntry.ts index 8530b3419..d44178629 100644 --- a/src/transformers/auditlogEntry.ts +++ b/src/transformers/auditlogEntry.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; -import { AuditLogEntry } from "../types/audit_log/audit_log_entry.ts"; -import { DiscordAuditLogEvents } from "../types/audit_log/audit_log_events.ts"; +import { AuditLogEntry } from "../types/auditLog/auditLogEntry.ts"; +import { AuditLogEvents } from "../types/auditLog/auditLogEvents.ts"; import { DiscordOverwrite, Overwrite } from "../types/channels/overwrite.ts"; import { Role } from "../types/permissions/role.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; @@ -142,7 +142,7 @@ export interface DiscordenoAuditLogEntry { /** id of the entry */ id: bigint; /** Type of action that occured */ - actionType: DiscordAuditLogEvents; + actionType: AuditLogEvents; /** Additional info for certain action types */ options?: { /** Number of days after which inactive members were kicked */ diff --git a/src/transformers/channel.ts b/src/transformers/channel.ts index 729f23493..a0046d603 100644 --- a/src/transformers/channel.ts +++ b/src/transformers/channel.ts @@ -2,11 +2,11 @@ import { Channel } from "../types/channels/channel.ts"; import { Bot } from "../bot.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordOverwrite } from "../types/channels/overwrite.ts"; -import { DiscordChannelTypes } from "../types/channels/channel_types.ts"; -import type { DiscordenoVoiceState } from "./voice_state.ts"; +import { ChannelTypes } from "../types/channels/channelTypes.ts"; +import type { DiscordenoVoiceState } from "./voiceState.ts"; import { Collection } from "../util/collection.ts"; import { DiscordenoUser } from "./member.ts"; -import { DiscordVideoQualityModes } from "../types/channels/video_quality_modes.ts"; +import { VideoQualityModes } from "../types/channels/videoQualityModes.ts"; // function merge(allow: string, deny: string, id: string, type: number) { // return BigInt(`0x${type}g${BigInt(id)}g${BigInt(allow).toString(16)}g${BigInt(deny).toString(16)}`); @@ -57,7 +57,9 @@ export function transformChannel( guildId: payload.guildId || (payload.channel.guild_id ? bot.transformers.snowflake(payload.channel.guild_id) : 0n), lastPinTimestamp: payload.channel.last_pin_timestamp ? Date.parse(payload.channel.last_pin_timestamp) : undefined, permissionOverwrites: payload.channel.permission_overwrites - ? payload.channel.permission_overwrites.map((o) => packOverwrites(o.allow, o.deny, o.id, o.type)) + ? // TODO: fix this + // @ts-ignore + payload.channel.permission_overwrites.map((o) => packOverwrites(o.allow, o.deny, o.id, o.type)) : [], // TRANSFORMED STUFF BELOW @@ -72,13 +74,13 @@ export function transformChannel( : undefined, parentId: payload.channel.parent_id ? bot.transformers.snowflake(payload.channel.parent_id) : undefined, // TODO: stage channels? - voiceStates: payload.channel.type === DiscordChannelTypes.GuildVoice ? new Collection() : undefined, + voiceStates: payload.channel.type === ChannelTypes.GuildVoice ? new Collection() : undefined, }; } export interface DiscordenoChannel { /** The type of channel */ - type: DiscordChannelTypes; + type: ChannelTypes; /** Sorting position of the channel */ position?: number; /** The name of the channel (1-100 characters) */ @@ -102,7 +104,7 @@ export interface DiscordenoChannel { /** Voice region id for the voice channel, automatic when set to null */ rtcRegion?: string | null; /** The camera video quality mode of the voice channel, 1 when not present */ - videoQualityMode?: DiscordVideoQualityModes; + videoQualityMode?: VideoQualityModes; // TODO(threads): consider a ThreadChannel object /** An approximate count of messages in a thread, stops counting at 50 */ messageCount?: number; diff --git a/src/transformers/component.ts b/src/transformers/component.ts index fe50488fe..449078db7 100644 --- a/src/transformers/component.ts +++ b/src/transformers/component.ts @@ -1,8 +1,8 @@ import { Bot } from "../bot.ts"; -import { ButtonStyles } from "../types/messages/components/button_styles.ts"; -import { DiscordMessageComponentTypes } from "../types/messages/components/message_component_types.ts"; +import { ButtonStyles } from "../types/messages/components/buttonStyles.ts"; +import { MessageComponentTypes } from "../types/messages/components/messageComponentTypes.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; -import { SelectOption } from "../types/messages/components/select_option.ts"; +import { SelectOption } from "../types/messages/components/selectOption.ts"; export function transformComponent(bot: Bot, payload: SnakeCasedPropertiesDeep): DiscordenoComponent { return { @@ -41,7 +41,7 @@ export function transformComponent(bot: Bot, payload: SnakeCasedPropertiesDeep): DiscordenoEmbed { @@ -68,7 +68,7 @@ export interface DiscordenoEmbed { /** Title of embed */ title?: string; /** Type of embed (always "rich" for webhook embeds) */ - type?: DiscordEmbedTypes; + type?: EmbedTypes; /** Description of embed */ description?: string; /** Url of embed */ diff --git a/src/transformers/guild.ts b/src/transformers/guild.ts index fe60f6953..c6d9aef8e 100644 --- a/src/transformers/guild.ts +++ b/src/transformers/guild.ts @@ -3,7 +3,7 @@ import type { Emoji } from "../types/emojis/emoji.ts"; import type { Guild } from "../types/guilds/guild.ts"; import { Collection } from "../util/collection.ts"; import { DiscordenoRole } from "./role.ts"; -import { DiscordenoVoiceState } from "./voice_state.ts"; +import { DiscordenoVoiceState } from "./voiceState.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; export function transformGuild( diff --git a/src/transformers/integration.ts b/src/transformers/integration.ts index 654903767..ab67fef41 100644 --- a/src/transformers/integration.ts +++ b/src/transformers/integration.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; -import { IntegrationCreateUpdate } from "../types/integrations/integration_create_update.ts"; -import { DiscordIntegrationExpireBehaviors } from "../types/mod.ts"; +import { IntegrationCreateUpdate } from "../types/integrations/integrationCreateUpdate.ts"; +import { IntegrationExpireBehaviors } from "../types/mod.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoUser } from "./member.ts"; @@ -55,7 +55,7 @@ export interface DiscordenoIntegration { /** Whether emoticons should be synced for this integration (twitch only currently) */ enableEmoticons?: boolean; /** The behavior of expiring subscribers */ - expireBehavior?: DiscordIntegrationExpireBehaviors; + expireBehavior?: IntegrationExpireBehaviors; /** The grace period (in days) before expiring subscribers */ expireGracePeriod?: number; /** User for this integration */ diff --git a/src/transformers/interaction.ts b/src/transformers/interaction.ts index 1d3ad9465..9de8b943e 100644 --- a/src/transformers/interaction.ts +++ b/src/transformers/interaction.ts @@ -1,9 +1,9 @@ import { Bot } from "../bot.ts"; -import { ChannelTypes } from "../types/channels/channel_types.ts"; +import { ChannelTypes } from "../types/channels/channelTypes.ts"; import { InteractionData, ButtonData, - DiscordInteractionTypes, + InteractionTypes, Interaction, SelectMenuData, InteractionDataResolved, @@ -141,7 +141,7 @@ export interface DiscordenoInteraction { /** For the message the button was attached to */ message?: DiscordenoMessage; /** The type of interaction */ - type: DiscordInteractionTypes; + type: InteractionTypes; /** A continuation token for responding to the interaction */ token: string; /** Read-only property, always `1` */ diff --git a/src/transformers/invite.ts b/src/transformers/invite.ts index 9297c4e65..36f1e0d2a 100644 --- a/src/transformers/invite.ts +++ b/src/transformers/invite.ts @@ -1,5 +1,5 @@ import { Bot } from "../bot.ts"; -import { InviteCreate, DiscordTargetTypes, User, Application } from "../types/mod.ts"; +import { InviteCreate, TargetTypes, User, Application } from "../types/mod.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoApplication } from "./application.ts"; import { DiscordenoUser } from "./member.ts"; @@ -52,7 +52,7 @@ export interface DiscordenoInvite { /** The maximum number of times the invite can be used */ maxUses: number; /** The type of target for this voice channel invite */ - targetType: DiscordTargetTypes; + targetType: TargetTypes; /** The target user for this invite */ targetUser?: DiscordenoUser; /** The embedded application to open for this voice channel embedded application invite */ diff --git a/src/transformers/member.ts b/src/transformers/member.ts index 18d4bf44f..852b63e2b 100644 --- a/src/transformers/member.ts +++ b/src/transformers/member.ts @@ -1,8 +1,8 @@ import type { Bot } from "../bot.ts"; -import type { GuildMember } from "../types/members/guild_member.ts"; -import type { DiscordPremiumTypes } from "../types/users/premium_types.ts"; +import type { GuildMember } from "../types/members/guildMember.ts"; +import type { PremiumTypes } from "../types/users/premiumTypes.ts"; import type { User } from "../types/users/user.ts"; -import type { DiscordUserFlags } from "../types/users/user_flags.ts"; +import type { UserFlags } from "../types/users/userFlags.ts"; import type { SnakeCasedPropertiesDeep } from "../types/util.ts"; export interface DiscordenoUser { @@ -15,10 +15,10 @@ export interface DiscordenoUser { locale?: string; verified?: boolean; email?: string | null; - flags?: DiscordUserFlags; + flags?: UserFlags; mfaEnabled?: boolean; - premiumType?: DiscordPremiumTypes; - publicFlags?: DiscordUserFlags; + premiumType?: PremiumTypes; + publicFlags?: UserFlags; } export function transformUser(bot: Bot, payload: SnakeCasedPropertiesDeep): DiscordenoUser { diff --git a/src/transformers/message.ts b/src/transformers/message.ts index 80265088c..66023f831 100644 --- a/src/transformers/message.ts +++ b/src/transformers/message.ts @@ -3,12 +3,12 @@ import { Message } from "../types/messages/message.ts"; import { CHANNEL_MENTION_REGEX } from "../util/constants.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoAttachment } from "./attachment.ts"; -import { DiscordMessageStickerFormatTypes } from "../types/messages/message_sticker_format_types.ts"; +import { MessageStickerFormatTypes } from "../types/messages/messageStickerFormatTypes.ts"; import { DiscordenoMember, DiscordenoUser } from "./member.ts"; import { DiscordenoEmbed } from "./embed.ts"; -import { DiscordMessageTypes } from "../types/messages/message_types.ts"; -import { DiscordMessageActivityTypes } from "../types/messages/message_activity_types.ts"; -import { DiscordInteractionTypes } from "../types/interactions/interaction_types.ts"; +import { MessageTypes } from "../types/messages/messageTypes.ts"; +import { MessageActivityTypes } from "../types/messages/messageActivityTypes.ts"; +import { InteractionTypes } from "../types/interactions/interactionTypes.ts"; import { DiscordenoComponent } from "./component.ts"; import { Application } from "../types/applications/application.ts"; import { DiscordenoThread } from "./thread.ts"; @@ -147,7 +147,7 @@ export interface DiscordenoMessage { /** Name of the sticker */ name: string; /** Type of sticker format */ - formatType: DiscordMessageStickerFormatTypes; + formatType: MessageStickerFormatTypes; }[]; /** @@ -166,11 +166,11 @@ export interface DiscordenoMessage { /** Used for validating a message was sent */ nonce?: number | string; /** Type of message */ - type: DiscordMessageTypes; + type: MessageTypes; /** Sent with Rich Presence-related chat embeds */ activity?: { /** Type of message activity */ - type: DiscordMessageActivityTypes; + type: MessageActivityTypes; /** `party_id` from a Rich Presence event */ partyId?: string; }; @@ -188,7 +188,7 @@ export interface DiscordenoMessage { /** Id of the interaction */ id: bigint; /** The type of interaction */ - type: DiscordInteractionTypes; + type: InteractionTypes; /** The name of the ApplicationCommand */ name: string; /** The user who invoked the interaction */ diff --git a/src/transformers/mod.ts b/src/transformers/mod.ts index 703fdf30a..c16f30398 100644 --- a/src/transformers/mod.ts +++ b/src/transformers/mod.ts @@ -17,5 +17,5 @@ export * from "./presence.ts"; export * from "./role.ts"; export * from "./team.ts"; export * from "./thread.ts"; -export * from "./voice_state.ts"; +export * from "./voiceState.ts"; export * from "./webhook.ts"; diff --git a/src/transformers/presence.ts b/src/transformers/presence.ts index 5e75e149f..a9d093b03 100644 --- a/src/transformers/presence.ts +++ b/src/transformers/presence.ts @@ -1,5 +1,5 @@ import { Bot } from "../bot.ts"; -import { PresenceUpdate } from "../types/activity/presence_update.ts"; +import { PresenceUpdate } from "../types/activity/presenceUpdate.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoActivity } from "./activity.ts"; import { DiscordenoUser } from "./member.ts"; diff --git a/src/transformers/team.ts b/src/transformers/team.ts index 05c8a74d0..b67961c6d 100644 --- a/src/transformers/team.ts +++ b/src/transformers/team.ts @@ -1,6 +1,6 @@ import { Bot } from "../bot.ts"; import { Team } from "../types/teams/team.ts"; -import { DiscordTeamMembershipStates } from "../types/teams/team_membership_states.ts"; +import { TeamMembershipStates } from "../types/teams/teamMembershipStates.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { DiscordenoUser } from "./member.ts"; @@ -16,7 +16,7 @@ export function transformTeam(bot: Bot, payload: SnakeCasedPropertiesDeep) members: payload.members.map((member) => ({ membershipState: member.membership_state, // TODO: think about this seems useless to add ["*"] to everything - permissions: member.permissions, + permissions: member.permissions, // TODO: think about this seems useless to add another id here when its also on the one above teamId: id, user: bot.transformers.user(bot, member.user), @@ -32,7 +32,7 @@ export interface DiscordenoTeam { /** The members of the team */ members: { /** The user's membership state on the team */ - membershipState: DiscordTeamMembershipStates; + membershipState: TeamMembershipStates; /** Will always be `["*"]` */ permissions: "*"[]; /** The id of the parent team of which they are a member */ diff --git a/src/transformers/thread.ts b/src/transformers/thread.ts index e20613e67..761c1ab72 100644 --- a/src/transformers/thread.ts +++ b/src/transformers/thread.ts @@ -1,13 +1,13 @@ import { Bot } from "../bot.ts"; import { Channel } from "../types/channels/channel.ts"; -import { DiscordChannelTypes } from "../types/channels/channel_types.ts"; +import { ChannelTypes } from "../types/channels/channelTypes.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; export function transformThread(bot: Bot, channel: SnakeCasedPropertiesDeep): DiscordenoThread { if ( - channel.type !== DiscordChannelTypes.GuildNewsThread && - channel.type !== DiscordChannelTypes.GuildPublicThread && - channel.type !== DiscordChannelTypes.GuildPrivateThread + channel.type !== ChannelTypes.GuildNewsThread && + channel.type !== ChannelTypes.GuildPublicThread && + channel.type !== ChannelTypes.GuildPrivateThread ) throw new Error("Cannot convert non-thread channel to a thread."); @@ -32,10 +32,7 @@ export function transformThread(bot: Bot, channel: SnakeCasedPropertiesDeep { diff --git a/src/types/interactions/commands/applicationCommandCreateUpdateDelete.ts b/src/types/interactions/commands/applicationCommandCreateUpdateDelete.ts index a8bb90972..c498c04b7 100644 --- a/src/types/interactions/commands/applicationCommandCreateUpdateDelete.ts +++ b/src/types/interactions/commands/applicationCommandCreateUpdateDelete.ts @@ -1,4 +1,4 @@ -import { ApplicationCommand } from "./application_command.ts"; +import { ApplicationCommand } from "./applicationCommand.ts"; /** https://discord.com/developers/docs/topics/gateway#application-command-delete-application-command-extra-fields */ export interface ApplicationCommandCreateUpdateDelete extends ApplicationCommand { diff --git a/src/types/interactions/commands/applicationCommandInteractionData.ts b/src/types/interactions/commands/applicationCommandInteractionData.ts index 0220ec1df..42dae700a 100644 --- a/src/types/interactions/commands/applicationCommandInteractionData.ts +++ b/src/types/interactions/commands/applicationCommandInteractionData.ts @@ -1,6 +1,6 @@ -import { Message,User,Role,Channel, MessageComponentTypes } from "../../mod.ts"; -import { InteractionGuildMember } from "../interaction_guild_member.ts"; -import { InteractionDataOption } from "./application_command_interaction_data_option.ts"; +import { Message, User, Role, Channel, MessageComponentTypes } from "../../mod.ts"; +import { InteractionGuildMember } from "../interactionGuildMember.ts"; +import { InteractionDataOption } from "./applicationCommandInteractionDataOption.ts"; export interface InteractionData { /** The type of component */ diff --git a/src/types/interactions/commands/applicationCommandInteractionDataOption.ts b/src/types/interactions/commands/applicationCommandInteractionDataOption.ts index 7497e5531..da40bdb7b 100644 --- a/src/types/interactions/commands/applicationCommandInteractionDataOption.ts +++ b/src/types/interactions/commands/applicationCommandInteractionDataOption.ts @@ -1,5 +1,5 @@ import { GuildMember, Channel, Role } from "../../mod.ts"; -import { ApplicationCommandOptionTypes } from "./application_command_option_types.ts"; +import { ApplicationCommandOptionTypes } from "./applicationCommandOptionTypes.ts"; export type InteractionDataOption = { /** the name of the parameter */ diff --git a/src/types/interactions/commands/applicationCommandInteractionDataResolved.ts b/src/types/interactions/commands/applicationCommandInteractionDataResolved.ts index a307f3dba..bd74a084e 100644 --- a/src/types/interactions/commands/applicationCommandInteractionDataResolved.ts +++ b/src/types/interactions/commands/applicationCommandInteractionDataResolved.ts @@ -2,7 +2,7 @@ import { Channel } from "../../channels/channel.ts"; import { Message } from "../../messages/message.ts"; import { Role } from "../../permissions/role.ts"; import { User } from "../../users/user.ts"; -import { InteractionGuildMember } from "../interaction_guild_member.ts"; +import { InteractionGuildMember } from "../interactionGuildMember.ts"; export interface InteractionDataResolved { /** The Ids and Message objects */ diff --git a/src/types/interactions/commands/applicationCommandOption.ts b/src/types/interactions/commands/applicationCommandOption.ts index f2735dfd5..7363e380f 100644 --- a/src/types/interactions/commands/applicationCommandOption.ts +++ b/src/types/interactions/commands/applicationCommandOption.ts @@ -1,11 +1,11 @@ -import { ChannelTypes } from "../../channels/channel_types.ts"; -import { ApplicationCommandOptionChoice } from "./application_command_option_choice.ts"; -import { DiscordApplicationCommandOptionTypes } from "./application_command_option_types.ts"; +import { ChannelTypes } from "../../channels/channelTypes.ts"; +import { ApplicationCommandOptionChoice } from "./applicationCommandOptionChoice.ts"; +import { ApplicationCommandOptionTypes } from "./applicationCommandOptionTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#applicationcommandoption */ export interface ApplicationCommandOption { /** Value of Application Command Option Type */ - type: DiscordApplicationCommandOptionTypes; + type: ApplicationCommandOptionTypes; /** 1-32 character name matching lowercase `^[\w-]{1,32}$` */ name: string; /** 1-100 character description */ diff --git a/src/types/interactions/commands/applicationCommandOptionTypes.ts b/src/types/interactions/commands/applicationCommandOptionTypes.ts index 4cf39fc02..2335ff019 100644 --- a/src/types/interactions/commands/applicationCommandOptionTypes.ts +++ b/src/types/interactions/commands/applicationCommandOptionTypes.ts @@ -1,5 +1,5 @@ /** https://discord.com/developers/docs/interactions/slash-commands#applicationcommandoptiontype */ -export enum DiscordApplicationCommandOptionTypes { +export enum ApplicationCommandOptionTypes { SubCommand = 1, SubCommandGroup, String, @@ -11,6 +11,3 @@ export enum DiscordApplicationCommandOptionTypes { Mentionable, Number, } - -export type ApplicationCommandOptionTypes = DiscordApplicationCommandOptionTypes; -export const ApplicationCommandOptionTypes = DiscordApplicationCommandOptionTypes; diff --git a/src/types/interactions/commands/applicationCommandPermissions.ts b/src/types/interactions/commands/applicationCommandPermissions.ts index 197ce20db..d6e026d7f 100644 --- a/src/types/interactions/commands/applicationCommandPermissions.ts +++ b/src/types/interactions/commands/applicationCommandPermissions.ts @@ -1,11 +1,11 @@ -import { DiscordApplicationCommandPermissionTypes } from "./application_command_permission_types.ts"; +import { ApplicationCommandPermissionTypes } from "./applicationCommandPermissionTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#applicationcommandpermissions */ export interface ApplicationCommandPermissions { /** The id of the role or user */ id: string; /** Role or User */ - type: DiscordApplicationCommandPermissionTypes; + type: ApplicationCommandPermissionTypes; /** `true` to allow, `false`, to disallow */ permission: boolean; } diff --git a/src/types/interactions/commands/applicationCommandTypes.ts b/src/types/interactions/commands/applicationCommandTypes.ts index 2bf57c7c1..7f542c179 100644 --- a/src/types/interactions/commands/applicationCommandTypes.ts +++ b/src/types/interactions/commands/applicationCommandTypes.ts @@ -1,8 +1,5 @@ -export enum DiscordApplicationCommandTypes { +export enum ApplicationCommandTypes { ChatInput = 1, User, Message, } - -export type ApplicationCommandTypes = DiscordApplicationCommandTypes; -export const ApplicationCommandTypes = DiscordApplicationCommandTypes; diff --git a/src/types/interactions/commands/createGlobalApplicationCommand.ts b/src/types/interactions/commands/createGlobalApplicationCommand.ts index 790dcdccc..e3884a639 100644 --- a/src/types/interactions/commands/createGlobalApplicationCommand.ts +++ b/src/types/interactions/commands/createGlobalApplicationCommand.ts @@ -1,5 +1,5 @@ -import { ApplicationCommandOption } from "./application_command_option.ts"; -import { ApplicationCommandTypes } from "./application_command_types.ts"; +import { ApplicationCommandOption } from "./applicationCommandOption.ts"; +import { ApplicationCommandTypes } from "./applicationCommandTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#create-global-application-command-json-params */ export interface CreateGlobalApplicationCommand { diff --git a/src/types/interactions/commands/createGuildApplicationCommand.ts b/src/types/interactions/commands/createGuildApplicationCommand.ts index 3479aead2..6bfc47bc0 100644 --- a/src/types/interactions/commands/createGuildApplicationCommand.ts +++ b/src/types/interactions/commands/createGuildApplicationCommand.ts @@ -1,4 +1,4 @@ -import { ApplicationCommandOption } from "./application_command_option.ts"; +import { ApplicationCommandOption } from "./applicationCommandOption.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#create-guild-application-command-json-params */ export interface CreateGuildApplicationCommand { diff --git a/src/types/interactions/commands/editGlobalApplicationCommand.ts b/src/types/interactions/commands/editGlobalApplicationCommand.ts index 776696e71..c0b591491 100644 --- a/src/types/interactions/commands/editGlobalApplicationCommand.ts +++ b/src/types/interactions/commands/editGlobalApplicationCommand.ts @@ -1,5 +1,5 @@ -import { ApplicationCommandOption } from "./application_command_option.ts"; -import { ApplicationCommandTypes } from "./application_command_types.ts"; +import { ApplicationCommandOption } from "./applicationCommandOption.ts"; +import { ApplicationCommandTypes } from "./applicationCommandTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#edit-global-application-command-json-params */ export interface EditGlobalApplicationCommand { diff --git a/src/types/interactions/commands/editGuildApplicationCommand.ts b/src/types/interactions/commands/editGuildApplicationCommand.ts index ddf0f01e9..3f9629fda 100644 --- a/src/types/interactions/commands/editGuildApplicationCommand.ts +++ b/src/types/interactions/commands/editGuildApplicationCommand.ts @@ -1,4 +1,4 @@ -import { ApplicationCommandOption } from "./application_command_option.ts"; +import { ApplicationCommandOption } from "./applicationCommandOption.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#edit-guild-application-command-json-params */ export interface EditGuildApplicationCommand { diff --git a/src/types/interactions/commands/guildApplicationCommandPermissions.ts b/src/types/interactions/commands/guildApplicationCommandPermissions.ts index 3f940e399..1526af2b7 100644 --- a/src/types/interactions/commands/guildApplicationCommandPermissions.ts +++ b/src/types/interactions/commands/guildApplicationCommandPermissions.ts @@ -1,4 +1,4 @@ -import { ApplicationCommandPermissions } from "./application_command_permissions.ts"; +import { ApplicationCommandPermissions } from "./applicationCommandPermissions.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#guildapplicationcommandpermissions */ export interface GuildApplicationCommandPermissions { diff --git a/src/types/interactions/interaction.ts b/src/types/interactions/interaction.ts index eca64374b..727c09556 100644 --- a/src/types/interactions/interaction.ts +++ b/src/types/interactions/interaction.ts @@ -1,8 +1,8 @@ import { Message } from "../messages/message.ts"; import { User } from "../users/user.ts"; -import { InteractionData } from "./commands/application_command_interaction_data.ts"; -import { InteractionGuildMember } from "./interaction_guild_member.ts"; -import { InteractionTypes } from "./interaction_types.ts"; +import { InteractionData } from "./commands/applicationCommandInteractionData.ts"; +import { InteractionGuildMember } from "./interactionGuildMember.ts"; +import { InteractionTypes } from "./interactionTypes.ts"; export interface Interaction { /** Id of the interaction */ diff --git a/src/types/interactions/interactionGuildMember.ts b/src/types/interactions/interactionGuildMember.ts index 61093c814..502e169f2 100644 --- a/src/types/interactions/interactionGuildMember.ts +++ b/src/types/interactions/interactionGuildMember.ts @@ -1,4 +1,4 @@ -import { GuildMemberWithUser } from "../members/guild_member.ts"; +import { GuildMemberWithUser } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/resources/guild#guild-member-object */ export interface InteractionGuildMember extends GuildMemberWithUser { diff --git a/src/types/interactions/interactionResponse.ts b/src/types/interactions/interactionResponse.ts index 4b0ac1b8c..8f086c6b9 100644 --- a/src/types/interactions/interactionResponse.ts +++ b/src/types/interactions/interactionResponse.ts @@ -1,10 +1,10 @@ -import { InteractionApplicationCommandCallbackData } from "./commands/application_command_callback_data.ts"; -import { DiscordInteractionResponseTypes } from "./interaction_response_types.ts"; +import { InteractionApplicationCommandCallbackData } from "./commands/applicationCommandCallbackData.ts"; +import { InteractionResponseTypes } from "./interactionResponseTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#interaction-response */ export interface InteractionResponse { /** The type of response */ - type: DiscordInteractionResponseTypes; + type: InteractionResponseTypes; /** An optional response message */ data?: InteractionApplicationCommandCallbackData; } diff --git a/src/types/interactions/interactionResponseTypes.ts b/src/types/interactions/interactionResponseTypes.ts index 6332c6648..f1db5aacc 100644 --- a/src/types/interactions/interactionResponseTypes.ts +++ b/src/types/interactions/interactionResponseTypes.ts @@ -1,5 +1,5 @@ /** https://discord.com/developers/docs/interactions/slash-commands#interaction-response-interactionresponsetype */ -export enum DiscordInteractionResponseTypes { +export enum InteractionResponseTypes { /** ACK a `Ping` */ Pong = 1, /** Respond to an interaction with a message */ @@ -13,6 +13,3 @@ export enum DiscordInteractionResponseTypes { /** For Application Command Options, send an autocomplete result */ ApplicationCommandAutocompleteResult, } - -export type InteractionResponseTypes = DiscordInteractionResponseTypes; -export const InteractionResponseTypes = DiscordInteractionResponseTypes; diff --git a/src/types/interactions/messageInteraction.ts b/src/types/interactions/messageInteraction.ts index c1471ede1..3da2a7ff7 100644 --- a/src/types/interactions/messageInteraction.ts +++ b/src/types/interactions/messageInteraction.ts @@ -1,12 +1,12 @@ import { User } from "../users/user.ts"; -import { DiscordInteractionTypes } from "./interaction_types.ts"; +import { InteractionTypes } from "./interactionTypes.ts"; /** https://discord.com/developers/docs/interactions/slash-commands#messageinteraction */ export interface MessageInteraction { /** Id of the interaction */ id: string; /** The type of interaction */ - type: DiscordInteractionTypes; + type: InteractionTypes; /** The name of the ApplicationCommand */ name: string; /** The user who invoked the interaction */ diff --git a/src/types/interactions/mod.ts b/src/types/interactions/mod.ts index 0020d9ed6..29fa76706 100644 --- a/src/types/interactions/mod.ts +++ b/src/types/interactions/mod.ts @@ -1,23 +1,23 @@ -export * from "./commands/application_command_callback_data.ts"; -export * from "./commands/application_command_create_update_delete.ts"; -export * from "./commands/application_command_interaction_data_option.ts"; -export * from "./commands/application_command_interaction_data.ts"; -export * from "./commands/application_command_interaction_data_resolved.ts"; -export * from "./commands/application_command_option_choice.ts"; -export * from "./commands/application_command_option_types.ts"; -export * from "./commands/application_command_option.ts"; -export * from "./commands/application_command_permission_types.ts"; -export * from "./commands/application_command_permissions.ts"; -export * from "./commands/create_global_application_command.ts"; -export * from "./commands/create_guild_application_command.ts"; -export * from "./commands/edit_global_application_command.ts"; -export * from "./commands/edit_guild_application_command.ts"; -export * from "./commands/guild_application_command_permissions.ts"; -export * from "./commands/application_command.ts"; -export * from "./commands/application_command_types.ts"; +export * from "./commands/applicationCommandCallbackData.ts"; +export * from "./commands/applicationCommandCreateUpdateDelete.ts"; +export * from "./commands/applicationCommandInteractionDataOption.ts"; +export * from "./commands/applicationCommandInteractionData.ts"; +export * from "./commands/applicationCommandInteractionDataResolved.ts"; +export * from "./commands/applicationCommandOptionChoice.ts"; +export * from "./commands/applicationCommandOptionTypes.ts"; +export * from "./commands/applicationCommandOption.ts"; +export * from "./commands/applicationCommandPermissionTypes.ts"; +export * from "./commands/applicationCommandPermissions.ts"; +export * from "./commands/createGlobalApplicationCommand.ts"; +export * from "./commands/createGuildApplicationCommand.ts"; +export * from "./commands/editGlobalApplicationCommand.ts"; +export * from "./commands/editGuildApplicationCommand.ts"; +export * from "./commands/guildApplicationCommandPermissions.ts"; +export * from "./commands/applicationCommand.ts"; +export * from "./commands/applicationCommandTypes.ts"; export * from "./interaction.ts"; -export * from "./interaction_guild_member.ts"; -export * from "./interaction_response.ts"; -export * from "./interaction_response_types.ts"; -export * from "./interaction_types.ts"; -export * from "./message_interaction.ts"; +export * from "./interactionGuildMember.ts"; +export * from "./interactionResponse.ts"; +export * from "./interactionResponseTypes.ts"; +export * from "./interactionTypes.ts"; +export * from "./messageInteraction.ts"; diff --git a/src/types/invites/createChannelInvite.ts b/src/types/invites/createChannelInvite.ts index 4271e6984..8496a7f09 100644 --- a/src/types/invites/createChannelInvite.ts +++ b/src/types/invites/createChannelInvite.ts @@ -1,4 +1,4 @@ -import { DiscordInviteTargetTypes } from "./invite_target_types.ts"; +import { InviteTargetTypes } from "./inviteTargetTypes.ts"; export interface CreateChannelInvite { /** Duration of invite in seconds before expiry, or 0 for never. Between 0 and 604800 (7 days). Default: 86400 (24 hours) */ @@ -10,7 +10,7 @@ export interface CreateChannelInvite { /** If true, don't try to reuse simmilar invite (useful for creating many unique one time use invites). Default: false */ unique?: boolean; /** The type of target for this voice channel invite */ - targetType?: DiscordInviteTargetTypes; + targetType?: InviteTargetTypes; /** The id of the user whose stream to display for this invite, required if `target_type` is 1, the user must be streaming in the channel */ targetUserId?: string; /** The id of the embedded application to open for this invite, required if `target_type` is 2, the application must have the `EMBEDDED` flag */ diff --git a/src/types/invites/invite.ts b/src/types/invites/invite.ts index 3808de739..ecdeaef16 100644 --- a/src/types/invites/invite.ts +++ b/src/types/invites/invite.ts @@ -2,8 +2,8 @@ import { Channel } from "../channels/channel.ts"; import { Guild } from "../guilds/guild.ts"; import { Application } from "../applications/application.ts"; import { User } from "../users/user.ts"; -import { DiscordTargetTypes } from "./target_types.ts"; -import { InviteStageInstance } from "./invite_stage_instance.ts"; +import { TargetTypes } from "./targetTypes.ts"; +import { InviteStageInstance } from "./inviteStageInstance.ts"; /** https://discord.com/developers/docs/resources/invite#invite-object */ export interface Invite { @@ -16,7 +16,7 @@ export interface Invite { /** The user who created the invite */ inviter?: User; /** The type of target for this voice channel invite */ - targetType?: DiscordTargetTypes; + targetType?: TargetTypes; /** The target user for this invite */ targetUser?: User; /** The embedded application to open for this voice channel embedded application invite */ diff --git a/src/types/invites/inviteCreate.ts b/src/types/invites/inviteCreate.ts index 672e1835d..63d59a2a8 100644 --- a/src/types/invites/inviteCreate.ts +++ b/src/types/invites/inviteCreate.ts @@ -1,6 +1,6 @@ import { Application } from "../applications/application.ts"; import { User } from "../users/user.ts"; -import { DiscordTargetTypes } from "./target_types.ts"; +import { TargetTypes } from "./targetTypes.ts"; /** https://discord.com/developers/docs/topics/gateway#invite-create */ export interface InviteCreate { @@ -19,7 +19,7 @@ export interface InviteCreate { /** The maximum number of times the invite can be used */ maxUses: number; /** The type of target for this voice channel invite */ - targetType: DiscordTargetTypes; + targetType: TargetTypes; /** The target user for this invite */ targetUser?: User; /** The embedded application to open for this voice channel embedded application invite */ diff --git a/src/types/invites/inviteStageInstance.ts b/src/types/invites/inviteStageInstance.ts index 8ad8da371..8df19cd6a 100644 --- a/src/types/invites/inviteStageInstance.ts +++ b/src/types/invites/inviteStageInstance.ts @@ -1,4 +1,4 @@ -import { GuildMember } from "../members/guild_member.ts"; +import { GuildMember } from "../members/guildMember.ts"; export interface InviteStageInstance { /** The members speaking in the Stage */ diff --git a/src/types/invites/mod.ts b/src/types/invites/mod.ts index 0ea6a148d..094d55b6e 100644 --- a/src/types/invites/mod.ts +++ b/src/types/invites/mod.ts @@ -1,8 +1,8 @@ -export * from "./create_channel_invite.ts"; -export * from "./get_invite.ts"; +export * from "./createChannelInvite.ts"; +export * from "./getInvite.ts"; export * from "./invite.ts"; -export * from "./invite_create.ts"; -export * from "./invite_delete.ts"; -export * from "./invite_metadata.ts"; -export * from "./invite_target_types.ts"; -export * from "./target_types.ts"; +export * from "./inviteCreate.ts"; +export * from "./inviteDelete.ts"; +export * from "./inviteMetadata.ts"; +export * from "./inviteTargetTypes.ts"; +export * from "./targetTypes.ts"; diff --git a/src/types/invites/targetTypes.ts b/src/types/invites/targetTypes.ts index 0d3153072..1d0bcf64f 100644 --- a/src/types/invites/targetTypes.ts +++ b/src/types/invites/targetTypes.ts @@ -1,8 +1,5 @@ /** https://discord.com/developers/docs/resources/invite#invite-object-target-user-types */ -export enum DiscordTargetTypes { +export enum TargetTypes { Stream = 1, EmbeddedApplication, } - -export type TargetTypes = DiscordTargetTypes; -export const TargetTypes = DiscordTargetTypes; diff --git a/src/types/members/guildMemberAdd.ts b/src/types/members/guildMemberAdd.ts index f5b8bd9ee..bbbaf5b25 100644 --- a/src/types/members/guildMemberAdd.ts +++ b/src/types/members/guildMemberAdd.ts @@ -1,4 +1,4 @@ -import { GuildMemberWithUser } from "../members/guild_member.ts"; +import { GuildMemberWithUser } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/topics/gateway#guild-member-add */ export interface GuildMemberAdd extends GuildMemberWithUser { diff --git a/src/types/members/guildMembersChunk.ts b/src/types/members/guildMembersChunk.ts index 0e0cd7a32..b2f2f6f46 100644 --- a/src/types/members/guildMembersChunk.ts +++ b/src/types/members/guildMembersChunk.ts @@ -1,5 +1,5 @@ -import { PresenceUpdate } from "../activity/presence_update.ts"; -import { GuildMemberWithUser } from "../members/guild_member.ts"; +import { PresenceUpdate } from "../activity/presenceUpdate.ts"; +import { GuildMemberWithUser } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/topics/gateway#guild-members-chunk */ export interface GuildMembersChunk { diff --git a/src/types/members/mod.ts b/src/types/members/mod.ts index e9091c01d..8b6ce4dc9 100644 --- a/src/types/members/mod.ts +++ b/src/types/members/mod.ts @@ -1,9 +1,9 @@ -export * from "./guild_member.ts"; -export * from "./guild_members_chunk.ts"; -export * from "./guild_member_add.ts"; -export * from "./guild_member_remove.ts"; -export * from "./guild_member_update.ts"; -export * from "./list_guild_members.ts"; -export * from "./modify_current_user_nick.ts"; -export * from "./request_guild_members.ts"; -export * from "./search_guild_members.ts"; +export * from "./guildMember.ts"; +export * from "./guildMembersChunk.ts"; +export * from "./guildMemberAdd.ts"; +export * from "./guildMemberRemove.ts"; +export * from "./guildMemberUpdate.ts"; +export * from "./listGuildMembers.ts"; +export * from "./modifyCurrentUserNick.ts"; +export * from "./requestGuildMembers.ts"; +export * from "./searchGuildMembers.ts"; diff --git a/src/types/messages/allowedMentions.ts b/src/types/messages/allowedMentions.ts index f5e43a94d..d0fcdf199 100644 --- a/src/types/messages/allowedMentions.ts +++ b/src/types/messages/allowedMentions.ts @@ -1,9 +1,9 @@ -import { DiscordAllowedMentionsTypes } from "./allowed_mentions_types.ts"; +import { AllowedMentionsTypes } from "./allowedMentionsTypes.ts"; /** https://discord.com/developers/docs/resources/channel#allowed-mentions-object */ export interface AllowedMentions { /** An array of allowed mention types to parse from the content. */ - parse?: DiscordAllowedMentionsTypes[]; + parse?: AllowedMentionsTypes[]; /** Array of role_ids to mention (Max size of 100) */ roles?: string[]; /** Array of user_ids to mention (Max size of 100) */ diff --git a/src/types/messages/components/actionRow.ts b/src/types/messages/components/actionRow.ts index 83b5f92e0..5b592d2e2 100644 --- a/src/types/messages/components/actionRow.ts +++ b/src/types/messages/components/actionRow.ts @@ -1,5 +1,5 @@ -import { ButtonComponent } from "./button_component.ts"; -import { SelectMenuComponent } from "./select_menu.ts"; +import { ButtonComponent } from "./buttonComponent.ts"; +import { SelectMenuComponent } from "./selectMenu.ts"; /** https://discord.com/developers/docs/interactions/message-components#actionrow */ export interface ActionRow { diff --git a/src/types/messages/components/buttonComponent.ts b/src/types/messages/components/buttonComponent.ts index 8c4997864..7cf0f0a0c 100644 --- a/src/types/messages/components/buttonComponent.ts +++ b/src/types/messages/components/buttonComponent.ts @@ -1,11 +1,11 @@ import { SnakeCasedPropertiesDeep } from "../../util.ts"; -import { ButtonStyles } from "./button_styles.ts"; -import { DiscordMessageComponentTypes } from "./message_component_types.ts"; +import { ButtonStyles } from "./buttonStyles.ts"; +import { MessageComponentTypes } from "./messageComponentTypes.ts"; /** https://discord.com/developers/docs/interactions/message-components#buttons-button-object */ export interface ButtonComponent { /** All button components have type 2 */ - type: DiscordMessageComponentTypes.Button; + type: MessageComponentTypes.Button; /** for what the button says (max 80 characters) */ label: string; /** a dev-defined unique string sent on click (max 100 characters). type 5 Link buttons can not have a custom_id */ @@ -26,6 +26,3 @@ export interface ButtonComponent { /** Whether or not this button is disabled */ disabled?: boolean; } - -// TODO: v12 remove this -export type DiscordButtonComponent = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/components/buttonData.ts b/src/types/messages/components/buttonData.ts index 5eccf4569..20d7befac 100644 --- a/src/types/messages/components/buttonData.ts +++ b/src/types/messages/components/buttonData.ts @@ -1,8 +1,8 @@ -import { DiscordMessageComponentTypes } from "./message_component_types.ts"; +import { MessageComponentTypes } from "./messageComponentTypes.ts"; export interface ButtonData { /** with the value you defined for this component */ customId: string; /** The type of this component */ - componentType: DiscordMessageComponentTypes.Button; + componentType: MessageComponentTypes.Button; } diff --git a/src/types/messages/components/buttonStyles.ts b/src/types/messages/components/buttonStyles.ts index dc60d3903..a4d68831b 100644 --- a/src/types/messages/components/buttonStyles.ts +++ b/src/types/messages/components/buttonStyles.ts @@ -1,5 +1,5 @@ /** https://discord.com/developers/docs/interactions/message-components#buttons-button-styles */ -export enum DiscordButtonStyles { +export enum ButtonStyles { /** A blurple button */ Primary = 1, /** A grey button */ @@ -11,6 +11,3 @@ export enum DiscordButtonStyles { /** A button that navigates to a URL */ Link, } - -export type ButtonStyles = DiscordButtonStyles; -export const ButtonStyles = DiscordButtonStyles; diff --git a/src/types/messages/components/messageComponents.ts b/src/types/messages/components/messageComponents.ts index d0d9e5d8d..625a261a1 100644 --- a/src/types/messages/components/messageComponents.ts +++ b/src/types/messages/components/messageComponents.ts @@ -1,6 +1,6 @@ -import { ActionRow } from "./action_row.ts"; -import { ButtonComponent } from "./button_component.ts"; -import { SelectMenuComponent } from "./select_menu.ts"; +import { ActionRow } from "./actionRow.ts"; +import { ButtonComponent } from "./buttonComponent.ts"; +import { SelectMenuComponent } from "./selectMenu.ts"; export type ActionRoleComponents = ButtonComponent | SelectMenuComponent; diff --git a/src/types/messages/components/selectData.ts b/src/types/messages/components/selectData.ts index 03aceaf2e..f09449970 100644 --- a/src/types/messages/components/selectData.ts +++ b/src/types/messages/components/selectData.ts @@ -1,9 +1,9 @@ -import { DiscordMessageComponentTypes } from "./message_component_types.ts"; +import { MessageComponentTypes } from "./messageComponentTypes.ts"; // TODO: add dock link export interface SelectMenuData { /** The type of component */ - componentType: DiscordMessageComponentTypes.SelectMenu; + componentType: MessageComponentTypes.SelectMenu; /** The custom id provided for this component. */ customId: string; /** The values chosen by the user. */ diff --git a/src/types/messages/components/selectMenu.ts b/src/types/messages/components/selectMenu.ts index 92cb75ccc..b999c0053 100644 --- a/src/types/messages/components/selectMenu.ts +++ b/src/types/messages/components/selectMenu.ts @@ -1,9 +1,9 @@ -import { DiscordMessageComponentTypes } from "./message_component_types.ts"; -import { SelectOption } from "./select_option.ts"; +import { MessageComponentTypes } from "./messageComponentTypes.ts"; +import { SelectOption } from "./selectOption.ts"; // TODO: add dock link export interface SelectMenuComponent { - type: DiscordMessageComponentTypes.SelectMenu; + type: MessageComponentTypes.SelectMenu; /** A custom identifier for this component. Maximum 100 characters. */ customId: string; /** A custom placeholder text if nothing is selected. Maximum 100 characters. */ diff --git a/src/types/messages/createMessage.ts b/src/types/messages/createMessage.ts index ae8f1a2a2..bee766f52 100644 --- a/src/types/messages/createMessage.ts +++ b/src/types/messages/createMessage.ts @@ -1,9 +1,9 @@ import { Embed } from "../embeds/embed.ts"; -import { AllowedMentions } from "../messages/allowed_mentions.ts"; -import { MessageReference } from "../messages/message_reference.ts"; -import { FileContent } from "../discordeno/file_content.ts"; +import { AllowedMentions } from "../messages/allowedMentions.ts"; +import { MessageReference } from "../messages/messageReference.ts"; +import { FileContent } from "../discordeno/fileContent.ts"; import { SnakeCasedPropertiesDeep } from "../util.ts"; -import { MessageComponents } from "./components/message_components.ts"; +import { MessageComponents } from "./components/messageComponents.ts"; export interface CreateMessage { /** The message contents (up to 2000 characters) */ diff --git a/src/types/messages/editMessage.ts b/src/types/messages/editMessage.ts index 34e7f4b28..99336f9d7 100644 --- a/src/types/messages/editMessage.ts +++ b/src/types/messages/editMessage.ts @@ -1,8 +1,8 @@ -import { FileContent } from "../discordeno/file_content.ts"; +import { FileContent } from "../discordeno/fileContent.ts"; import { Embed } from "../embeds/embed.ts"; -import { AllowedMentions } from "./allowed_mentions.ts"; +import { AllowedMentions } from "./allowedMentions.ts"; import { Attachment } from "./attachment.ts"; -import { MessageComponents } from "./components/message_components.ts"; +import { MessageComponents } from "./components/messageComponents.ts"; /** https://discord.com/developers/docs/resources/channel#edit-message-json-params */ export interface EditMessage { diff --git a/src/types/messages/message.ts b/src/types/messages/message.ts index d481d5a8e..09eb12c1b 100644 --- a/src/types/messages/message.ts +++ b/src/types/messages/message.ts @@ -1,19 +1,19 @@ import { Channel } from "../channels/channel.ts"; -import { ChannelMention } from "../channels/channel_mention.ts"; -import { ThreadMember } from "../channels/threads/thread_member.ts"; +import { ChannelMention } from "../channels/channelMention.ts"; +import { ThreadMember } from "../channels/threads/threadMember.ts"; import { Embed } from "../embeds/embed.ts"; -import { MessageInteraction } from "../interactions/message_interaction.ts"; -import { GuildMember } from "../members/guild_member.ts"; +import { MessageInteraction } from "../interactions/messageInteraction.ts"; +import { GuildMember } from "../members/guildMember.ts"; import { Application } from "../applications/application.ts"; import { User } from "../users/user.ts"; import { Attachment } from "./attachment.ts"; -import { MessageComponents } from "./components/message_components.ts"; -import { MessageActivity } from "./message_activity.ts"; -import { MessageReference } from "./message_reference.ts"; -import { MessageSticker } from "./message_sticker.ts"; -import { DiscordMessageTypes } from "./message_types.ts"; +import { MessageComponents } from "./components/messageComponents.ts"; +import { MessageActivity } from "./messageActivity.ts"; +import { MessageReference } from "./messageReference.ts"; +import { MessageSticker } from "./messageSticker.ts"; +import { MessageTypes } from "./messageTypes.ts"; import { Reaction } from "./reaction.ts"; -import { MessageStickerItem } from "./message_sticker_item.ts"; +import { MessageStickerItem } from "./messageStickerItem.ts"; /** https://discord.com/developers/docs/resources/channel#message-object */ export interface Message { @@ -68,7 +68,7 @@ export interface Message { /** If the message is generated by a webhook, this is the webhook's id */ webhookId?: string; /** Type of message */ - type: DiscordMessageTypes; + type: MessageTypes; /** Sent with Rich Presence-related chat embeds */ activity?: MessageActivity; /** Sent with Rich Presence-related chat embeds */ diff --git a/src/types/messages/messageActivity.ts b/src/types/messages/messageActivity.ts index 8feab94cf..9632e94f3 100644 --- a/src/types/messages/messageActivity.ts +++ b/src/types/messages/messageActivity.ts @@ -1,9 +1,9 @@ -import { DiscordMessageActivityTypes } from "./message_activity_types.ts"; +import { MessageActivityTypes } from "./messageActivityTypes.ts"; /** https://discord.com/developers/docs/resources/channel#message-object-message-activity-structure */ export interface MessageActivity { /** Type of message activity */ - type: DiscordMessageActivityTypes; + type: MessageActivityTypes; /** `party_id` from a Rich Presence event */ partyId?: string; } diff --git a/src/types/messages/messageActivityTypes.ts b/src/types/messages/messageActivityTypes.ts index 91944ae0f..0f4211690 100644 --- a/src/types/messages/messageActivityTypes.ts +++ b/src/types/messages/messageActivityTypes.ts @@ -1,10 +1,7 @@ /** https://discord.com/developers/docs/resources/channel#message-object-message-activity-types */ -export enum DiscordMessageActivityTypes { +export enum MessageActivityTypes { Join = 1, Spectate, Listen, JoinRequest, } - -export type MessageActivityTypes = DiscordMessageActivityTypes; -export const MessageActivityTypes = DiscordMessageActivityTypes; diff --git a/src/types/messages/messageReactionAdd.ts b/src/types/messages/messageReactionAdd.ts index c0846e858..9d80ee791 100644 --- a/src/types/messages/messageReactionAdd.ts +++ b/src/types/messages/messageReactionAdd.ts @@ -1,5 +1,5 @@ import { Emoji } from "../emojis/emoji.ts"; -import { GuildMemberWithUser } from "../members/guild_member.ts"; +import { GuildMemberWithUser } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/topics/gateway#message-reaction-add */ export interface MessageReactionAdd { diff --git a/src/types/messages/messageReactionRemove.ts b/src/types/messages/messageReactionRemove.ts index 1fa3f4ef8..ffa9d3dab 100644 --- a/src/types/messages/messageReactionRemove.ts +++ b/src/types/messages/messageReactionRemove.ts @@ -1,4 +1,4 @@ -import { MessageReactionAdd } from "./message_reaction_add.ts"; +import { MessageReactionAdd } from "./messageReactionAdd.ts"; /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove */ export type MessageReactionRemove = Omit; diff --git a/src/types/messages/messageReactionRemoveAll.ts b/src/types/messages/messageReactionRemoveAll.ts index 2d00cfb51..75a6f9896 100644 --- a/src/types/messages/messageReactionRemoveAll.ts +++ b/src/types/messages/messageReactionRemoveAll.ts @@ -1,4 +1,4 @@ -import { MessageReactionAdd } from "./message_reaction_add.ts"; +import { MessageReactionAdd } from "./messageReactionAdd.ts"; /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-all */ export type MessageReactionRemoveAll = Pick; diff --git a/src/types/messages/messageReactionRemoveEmoji.ts b/src/types/messages/messageReactionRemoveEmoji.ts index bdbf5bb09..922cd0594 100644 --- a/src/types/messages/messageReactionRemoveEmoji.ts +++ b/src/types/messages/messageReactionRemoveEmoji.ts @@ -1,4 +1,4 @@ -import { MessageReactionAdd } from "./message_reaction_add.ts"; +import { MessageReactionAdd } from "./messageReactionAdd.ts"; /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-emoji */ export type MessageReactionRemoveEmoji = Pick; diff --git a/src/types/messages/messageSticker.ts b/src/types/messages/messageSticker.ts index 4c23dd4d8..aec976292 100644 --- a/src/types/messages/messageSticker.ts +++ b/src/types/messages/messageSticker.ts @@ -1,4 +1,4 @@ -import { DiscordMessageStickerFormatTypes } from "./message_sticker_format_types.ts"; +import { MessageStickerFormatTypes } from "./messageStickerFormatTypes.ts"; import type { User } from "../users/user.ts"; /** https://discord.com/developers/docs/resources/channel#message-object-message-sticker-structure */ @@ -14,7 +14,7 @@ export interface MessageSticker { /** a unicode emoji representing the sticker's expression */ tags: string; /** Type of sticker format */ - formatType: DiscordMessageStickerFormatTypes; + formatType: MessageStickerFormatTypes; /** Whether or not the sticker is available */ available?: boolean; /** Id of the guild that owns this sticker */ diff --git a/src/types/messages/messageStickerFormatTypes.ts b/src/types/messages/messageStickerFormatTypes.ts index 7193cb245..3da89b3a9 100644 --- a/src/types/messages/messageStickerFormatTypes.ts +++ b/src/types/messages/messageStickerFormatTypes.ts @@ -1,9 +1,6 @@ /** https://discord.com/developers/docs/resources/channel#message-object-message-sticker-format-types */ -export enum DiscordMessageStickerFormatTypes { +export enum MessageStickerFormatTypes { Png = 1, Apng, Lottie, } - -export type MessageStickerFormatTypes = DiscordMessageStickerFormatTypes; -export const MessageStickerFormatTypes = DiscordMessageStickerFormatTypes; diff --git a/src/types/messages/messageStickerItem.ts b/src/types/messages/messageStickerItem.ts index 84471ba59..f61ae1b13 100644 --- a/src/types/messages/messageStickerItem.ts +++ b/src/types/messages/messageStickerItem.ts @@ -1,4 +1,4 @@ -import { DiscordMessageStickerFormatTypes } from "./message_sticker_format_types.ts"; +import { MessageStickerFormatTypes } from "./messageStickerFormatTypes.ts"; export interface MessageStickerItem { /** Id of the sticker */ @@ -6,5 +6,5 @@ export interface MessageStickerItem { /** Name of the sticker */ name: string; /** Type of sticker format */ - formatType: DiscordMessageStickerFormatTypes; + formatType: MessageStickerFormatTypes; } diff --git a/src/types/messages/mod.ts b/src/types/messages/mod.ts index a649725a9..95ddefce8 100644 --- a/src/types/messages/mod.ts +++ b/src/types/messages/mod.ts @@ -1,31 +1,31 @@ -export * from "./allowed_mentions.ts"; -export * from "./allowed_mentions_types.ts"; +export * from "./allowedMentions.ts"; +export * from "./allowedMentionsTypes.ts"; export * from "./attachment.ts"; -export * from "./components/action_row.ts"; -export * from "./components/button_component.ts"; -export * from "./components/button_data.ts"; -export * from "./components/button_styles.ts"; -export * from "./components/message_component_types.ts"; -export * from "./components/message_components.ts"; -export * from "./components/select_data.ts"; -export * from "./components/select_menu.ts"; -export * from "./components/select_option.ts"; -export * from "./create_message.ts"; -export * from "./edit_message.ts"; -export * from "./get_messages.ts"; +export * from "./components/actionRow.ts"; +export * from "./components/buttonComponent.ts"; +export * from "./components/buttonData.ts"; +export * from "./components/buttonStyles.ts"; +export * from "./components/messageComponentTypes.ts"; +export * from "./components/messageComponents.ts"; +export * from "./components/selectData.ts"; +export * from "./components/selectMenu.ts"; +export * from "./components/selectOption.ts"; +export * from "./createMessage.ts"; +export * from "./editMessage.ts"; +export * from "./getMessages.ts"; export * from "./message.ts"; -export * from "./message_activity.ts"; -export * from "./message_activity_types.ts"; -export * from "./message_delete.ts"; -export * from "./message_delete_bulk.ts"; -export * from "./message_flags.ts"; -export * from "./message_get_reactions.ts"; -export * from "./message_reaction_add.ts"; -export * from "./message_reaction_remove.ts"; -export * from "./message_reaction_remove_all.ts"; -export * from "./message_reaction_remove_emoji.ts"; -export * from "./message_reference.ts"; -export * from "./message_sticker.ts"; -export * from "./message_sticker_format_types.ts"; -export * from "./message_types.ts"; +export * from "./messageActivity.ts"; +export * from "./messageActivityTypes.ts"; +export * from "./messageDelete.ts"; +export * from "./messageDeleteBulk.ts"; +export * from "./messageFlags.ts"; +export * from "./messageGetReactions.ts"; +export * from "./messageReactionAdd.ts"; +export * from "./messageReactionRemove.ts"; +export * from "./messageReactionRemoveAll.ts"; +export * from "./messageReactionRemoveEmoji.ts"; +export * from "./messageReference.ts"; +export * from "./messageSticker.ts"; +export * from "./messageStickerFormatTypes.ts"; +export * from "./messageTypes.ts"; export * from "./reaction.ts"; diff --git a/src/types/misc/imageFormat.ts b/src/types/misc/imageFormat.ts index dab7c3e9f..1bf2d8667 100644 --- a/src/types/misc/imageFormat.ts +++ b/src/types/misc/imageFormat.ts @@ -2,4 +2,4 @@ * https://discord.com/developers/docs/reference#image-formatting * json is only for stickers */ -export type DiscordImageFormat = "jpg" | "jpeg" | "png" | "webp" | "gif" | "json"; +export type ImageFormat = "jpg" | "jpeg" | "png" | "webp" | "gif" | "json"; diff --git a/src/types/misc/imageSize.ts b/src/types/misc/imageSize.ts index 488eb6557..05ccc3662 100644 --- a/src/types/misc/imageSize.ts +++ b/src/types/misc/imageSize.ts @@ -1,2 +1,2 @@ /** https://discord.com/developers/docs/reference#image-formatting */ -export type DiscordImageSize = 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048; +export type ImageSize = 16 | 32 | 64 | 128 | 256 | 512 | 1024 | 2048; diff --git a/src/types/misc/mod.ts b/src/types/misc/mod.ts index d4d7eb4d5..f400e744b 100644 --- a/src/types/misc/mod.ts +++ b/src/types/misc/mod.ts @@ -1,3 +1,3 @@ -export * from "./image_format.ts"; -export * from "./image_size.ts"; -export * from "./typing_start.ts"; +export * from "./imageFormat.ts"; +export * from "./imageSize.ts"; +export * from "./typingStart.ts"; diff --git a/src/types/misc/typingStart.ts b/src/types/misc/typingStart.ts index 748de7b3f..5bc39d64e 100644 --- a/src/types/misc/typingStart.ts +++ b/src/types/misc/typingStart.ts @@ -1,4 +1,4 @@ -import { GuildMember } from "../members/guild_member.ts"; +import { GuildMember } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/topics/gateway#typing-start */ export interface TypingStart { diff --git a/src/types/mod.ts b/src/types/mod.ts index f1744f151..ee2a1ae4f 100644 --- a/src/types/mod.ts +++ b/src/types/mod.ts @@ -1,6 +1,6 @@ export * from "./activity/mod.ts"; export * from "./applications/mod.ts"; -export * from "./audit_log/mod.ts"; +export * from "./auditLog/mod.ts"; export * from "./channels/mod.ts"; export * from "./codes/mod.ts"; export * from "./discordeno/mod.ts"; diff --git a/src/types/oauth2/botAuthQuery.ts b/src/types/oauth2/botAuthQuery.ts index 301d6fb8a..65c378ff7 100644 --- a/src/types/oauth2/botAuthQuery.ts +++ b/src/types/oauth2/botAuthQuery.ts @@ -1,11 +1,11 @@ -import { DiscordOAuth2Scopes } from "./scopes.ts"; +import { OAuth2Scopes } from "./scopes.ts"; /** https://discord.com/developers/docs/topics/oauth2#bot-authorization-flow-bot-auth-parameters */ export interface BotAuthenticationFlowQuery { /** App's client id */ clientId: string; /** Needs to include bot for the bot flow */ - scope: DiscordOAuth2Scopes[]; + scope: OAuth2Scopes[]; /** The permissions you're requesting */ permissions: string; /** Pre-fills the dropdown picker with a guild for the user */ diff --git a/src/types/oauth2/getCurrentAuthorizationInformation.ts b/src/types/oauth2/getCurrentAuthorizationInformation.ts index d6c0b448e..2ab75ca2d 100644 --- a/src/types/oauth2/getCurrentAuthorizationInformation.ts +++ b/src/types/oauth2/getCurrentAuthorizationInformation.ts @@ -1,13 +1,13 @@ import { User } from "../users/user.ts"; import { Application } from "../applications/application.ts"; -import { DiscordOAuth2Scopes } from "./scopes.ts"; +import { OAuth2Scopes } from "./scopes.ts"; /** https://discord.com/developers/docs/topics/oauth2#get-current-authorization-information-response-structure */ export interface GetCurrentAuthorizationInformation { /** The current application */ application: Partial; /** The scopes the user has authorized the application for */ - scopes: DiscordOAuth2Scopes[]; + scopes: OAuth2Scopes[]; /** When the access token expires */ expires: string; /** The user who has authorized, if the user has authorized with the `identify` scope */ diff --git a/src/types/oauth2/mod.ts b/src/types/oauth2/mod.ts index 156133620..98722ea91 100644 --- a/src/types/oauth2/mod.ts +++ b/src/types/oauth2/mod.ts @@ -1,3 +1,3 @@ -export * from "./bot_auth_query.ts"; -export * from "./get_current_authorization_information.ts"; +export * from "./botAuthQuery.ts"; +export * from "./getCurrentAuthorizationInformation.ts"; export * from "./scopes.ts"; diff --git a/src/types/oauth2/scopes.ts b/src/types/oauth2/scopes.ts index b885f94e8..4ec1dc2d6 100644 --- a/src/types/oauth2/scopes.ts +++ b/src/types/oauth2/scopes.ts @@ -1,5 +1,5 @@ /** https://discord.com/developers/docs/topics/oauth2#shared-resources-oauth2-scopes */ -export type DiscordOAuth2Scopes = +export type OAuth2Scopes = | "bot" | "connections" | "email" diff --git a/src/types/permissions/bitwisePermissionFlags.ts b/src/types/permissions/bitwisePermissionFlags.ts index 9fd5ae1f5..5b5791da5 100644 --- a/src/types/permissions/bitwisePermissionFlags.ts +++ b/src/types/permissions/bitwisePermissionFlags.ts @@ -1,5 +1,5 @@ /** https://discord.com/developers/docs/topics/permissions#permissions-bitwise-permission-flags */ -export enum DiscordBitwisePermissionFlags { +export enum BitwisePermissionFlags { /** Allows creation of instant invites */ CREATE_INSTANT_INVITE = 0x00000001, /** Allows kicking members */ @@ -79,6 +79,3 @@ export enum DiscordBitwisePermissionFlags { /** Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel. */ START_EMBEDDED_ACTIVITIES = 0x8000000000, } - -export type BitwisePermissions = DiscordBitwisePermissionFlags; -export const BitwisePermissions = DiscordBitwisePermissionFlags; diff --git a/src/types/permissions/mod.ts b/src/types/permissions/mod.ts index 50f835272..302249c77 100644 --- a/src/types/permissions/mod.ts +++ b/src/types/permissions/mod.ts @@ -1,4 +1,4 @@ -export * from "./bitwise_permission_flags.ts"; -export * from "./permission_strings.ts"; +export * from "./bitwisePermissionFlags.ts"; +export * from "./permissionStrings.ts"; export * from "./role.ts"; -export * from "./role_tags.ts"; +export * from "./roleTags.ts"; diff --git a/src/types/permissions/permissionStrings.ts b/src/types/permissions/permissionStrings.ts index 9a8c73bae..b3f7025f0 100644 --- a/src/types/permissions/permissionStrings.ts +++ b/src/types/permissions/permissionStrings.ts @@ -1,4 +1,4 @@ -import { DiscordBitwisePermissionFlags } from "./bitwise_permission_flags.ts"; +import { BitwisePermissionFlags } from "./bitwisePermissionFlags.ts"; -export type PermissionStrings = keyof typeof DiscordBitwisePermissionFlags; +export type PermissionStrings = keyof typeof BitwisePermissionFlags; export type Permission = PermissionStrings; diff --git a/src/types/permissions/role.ts b/src/types/permissions/role.ts index 40bd01d9d..74b6ff0f2 100644 --- a/src/types/permissions/role.ts +++ b/src/types/permissions/role.ts @@ -1,4 +1,4 @@ -import { RoleTags } from "./role_tags.ts"; +import { RoleTags } from "./roleTags.ts"; /** https://discord.com/developers/docs/topics/permissions#role-object-role-structure */ export interface Role { diff --git a/src/types/teams/mod.ts b/src/types/teams/mod.ts index 9c41af747..86fe2184f 100644 --- a/src/types/teams/mod.ts +++ b/src/types/teams/mod.ts @@ -1,3 +1,3 @@ export * from "./team.ts"; -export * from "./team_member.ts"; -export * from "./team_membership_states.ts"; +export * from "./teamMember.ts"; +export * from "./teamMembershipStates.ts"; diff --git a/src/types/teams/team.ts b/src/types/teams/team.ts index 30a02c231..06754b60a 100644 --- a/src/types/teams/team.ts +++ b/src/types/teams/team.ts @@ -1,4 +1,4 @@ -import { TeamMember } from "./team_member.ts"; +import { TeamMember } from "./teamMember.ts"; /** https://discord.com/developers/docs/topics/teams#data-models-team-object */ export interface Team { diff --git a/src/types/teams/teamMember.ts b/src/types/teams/teamMember.ts index 9f89cbfd3..932f003af 100644 --- a/src/types/teams/teamMember.ts +++ b/src/types/teams/teamMember.ts @@ -1,10 +1,10 @@ import { User } from "../users/user.ts"; -import { DiscordTeamMembershipStates } from "./team_membership_states.ts"; +import { TeamMembershipStates } from "./teamMembershipStates.ts"; /** https://discord.com/developers/docs/topics/teams#data-models-team-members-object */ export interface TeamMember { /** The user's membership state on the team */ - membershipState: DiscordTeamMembershipStates; + membershipState: TeamMembershipStates; /** Will always be `["*"]` */ permissions: ["*"]; /** The id of the parent team of which they are a member */ diff --git a/src/types/templates/mod.ts b/src/types/templates/mod.ts index 286902c50..a0f0b9b47 100644 --- a/src/types/templates/mod.ts +++ b/src/types/templates/mod.ts @@ -1,3 +1,3 @@ -export * from "./create_guild_from_template.ts"; -export * from "./modify_guild_template.ts"; +export * from "./createGuildFromTemplate.ts"; +export * from "./modifyGuildTemplate.ts"; export * from "./template.ts"; diff --git a/src/types/users/connection.ts b/src/types/users/connection.ts index 69e8de021..586352515 100644 --- a/src/types/users/connection.ts +++ b/src/types/users/connection.ts @@ -1,5 +1,5 @@ import { Integration } from "../integrations/integration.ts"; -import { DiscordVisibilityTypes } from "./visibility_types.ts"; +import { VisibilityTypes } from "./visibilityTypes.ts"; /** https://discord.com/developers/docs/resources/user#connection-objecthttps://discord.com/developers/docs/resources/user#user-object-premium-types */ export interface Connection { @@ -20,5 +20,5 @@ export interface Connection { /** Whether activities related to this connection will be shown in presence updates */ showActivity: boolean; /** Visibility of this connection */ - visibility: DiscordVisibilityTypes; + visibility: VisibilityTypes; } diff --git a/src/types/users/mod.ts b/src/types/users/mod.ts index 6102eb9e2..a0136d8aa 100644 --- a/src/types/users/mod.ts +++ b/src/types/users/mod.ts @@ -1,8 +1,8 @@ export * from "./connection.ts"; -export * from "./create_dm.ts"; -export * from "./create_group_dm.ts"; -export * from "./modify_current_user.ts"; -export * from "./premium_types.ts"; +export * from "./createDm.ts"; +export * from "./createGroupDm.ts"; +export * from "./modifyCurrentUser.ts"; +export * from "./premiumTypes.ts"; export * from "./user.ts"; -export * from "./user_flags.ts"; -export * from "./visibility_types.ts"; +export * from "./userFlags.ts"; +export * from "./visibilityTypes.ts"; diff --git a/src/types/users/premiumTypes.ts b/src/types/users/premiumTypes.ts index f2ab449c9..6981cfc95 100644 --- a/src/types/users/premiumTypes.ts +++ b/src/types/users/premiumTypes.ts @@ -1,9 +1,6 @@ /** https://discord.com/developers/docs/resources/user#user-object-premium-types */ -export enum DiscordPremiumTypes { +export enum PremiumTypes { None, NitroClassic, Nitro, } - -export type PremiumTypes = DiscordPremiumTypes; -export const PremiumTypes = DiscordPremiumTypes; diff --git a/src/types/users/user.ts b/src/types/users/user.ts index 93177d54c..b0e0155fc 100644 --- a/src/types/users/user.ts +++ b/src/types/users/user.ts @@ -1,5 +1,5 @@ -import { DiscordPremiumTypes } from "./premium_types.ts"; -import { DiscordUserFlags } from "./user_flags.ts"; +import { PremiumTypes } from "./premiumTypes.ts"; +import { UserFlags } from "./userFlags.ts"; /** https://discord.com/developers/docs/resources/user#user-object */ export interface User { @@ -24,11 +24,11 @@ export interface User { /** The user's email */ email?: string | null; /** The flags on a user's account */ - flags?: DiscordUserFlags; + flags?: UserFlags; /** The type of Nitro subscription on a user's account */ - premiumType?: DiscordPremiumTypes; + premiumType?: PremiumTypes; /** The public flags on a user's account */ - publicFlags?: DiscordUserFlags; + publicFlags?: UserFlags; /** the user's banner, or null if unset */ banner?: string; /** the user's banner color encoded as an integer representation of hexadecimal color code */ diff --git a/src/types/users/visibilityTypes.ts b/src/types/users/visibilityTypes.ts index e14929626..fc07b5940 100644 --- a/src/types/users/visibilityTypes.ts +++ b/src/types/users/visibilityTypes.ts @@ -1,10 +1,7 @@ /** https://discord.com/developers/docs/resources/user#connection-object-visibility-types */ -export enum DiscordVisibilityTypes { +export enum VisibilityTypes { /** Invisible to everyone except the user themselves */ None, /** Visible to everyone */ Everyone, } - -export type VisibilityTypes = DiscordVisibilityTypes; -export const VisibilityTypes = DiscordVisibilityTypes; diff --git a/src/types/voice/mod.ts b/src/types/voice/mod.ts index 93ee0b8f4..21ef760f3 100644 --- a/src/types/voice/mod.ts +++ b/src/types/voice/mod.ts @@ -1,4 +1,4 @@ -export * from "./update_voice_state.ts"; -export * from "./voice_region.ts"; -export * from "./voice_server_update.ts"; -export * from "./voice_state.ts"; +export * from "./updateVoiceState.ts"; +export * from "./voiceRegion.ts"; +export * from "./voiceServerUpdate.ts"; +export * from "./voiceState.ts"; diff --git a/src/types/voice/voiceState.ts b/src/types/voice/voiceState.ts index 156e15ad4..8e10ba859 100644 --- a/src/types/voice/voiceState.ts +++ b/src/types/voice/voiceState.ts @@ -1,4 +1,4 @@ -import { GuildMemberWithUser } from "../members/guild_member.ts"; +import { GuildMemberWithUser } from "../members/guildMember.ts"; /** https://discord.com/developers/docs/resources/voice#voice-state-object-voice-state-structure */ export interface VoiceState { diff --git a/src/types/webhooks/editWebhookMessage.ts b/src/types/webhooks/editWebhookMessage.ts index dc883cb36..352c93288 100644 --- a/src/types/webhooks/editWebhookMessage.ts +++ b/src/types/webhooks/editWebhookMessage.ts @@ -1,8 +1,8 @@ -import { FileContent } from "../discordeno/file_content.ts"; +import { FileContent } from "../discordeno/fileContent.ts"; import { Embed } from "../embeds/embed.ts"; -import { AllowedMentions } from "../messages/allowed_mentions.ts"; +import { AllowedMentions } from "../messages/allowedMentions.ts"; import { Attachment } from "../messages/attachment.ts"; -import { MessageComponents } from "../messages/components/message_components.ts"; +import { MessageComponents } from "../messages/components/messageComponents.ts"; /** https://discord.com/developers/docs/resources/webhook#edit-webhook-message-jsonform-params */ export interface EditWebhookMessage { diff --git a/src/types/webhooks/executeWebhook.ts b/src/types/webhooks/executeWebhook.ts index 092f2681e..34772774e 100644 --- a/src/types/webhooks/executeWebhook.ts +++ b/src/types/webhooks/executeWebhook.ts @@ -1,6 +1,6 @@ import { Embed } from "../embeds/embed.ts"; -import { AllowedMentions } from "../messages/allowed_mentions.ts"; -import { FileContent } from "../discordeno/file_content.ts"; +import { AllowedMentions } from "../messages/allowedMentions.ts"; +import { FileContent } from "../discordeno/fileContent.ts"; import { SnakeCasedPropertiesDeep } from "../util.ts"; /** https://discord.com/developers/docs/resources/webhook#execute-webhook */ diff --git a/src/types/webhooks/mod.ts b/src/types/webhooks/mod.ts index 2a6bc2651..743f40567 100644 --- a/src/types/webhooks/mod.ts +++ b/src/types/webhooks/mod.ts @@ -1,7 +1,7 @@ -export * from "./create_webhook.ts"; -export * from "./discord_webhook_types.ts"; -export * from "./edit_webhook_message.ts"; -export * from "./execute_webhook.ts"; -export * from "./modify_webhook.ts"; +export * from "./createWebhook.ts"; +export * from "./webhookTypes.ts"; +export * from "./editWebhookMessage.ts"; +export * from "./executeWebhook.ts"; +export * from "./modifyWebhook.ts"; export * from "./webhook.ts"; -export * from "./webhooks_update.ts"; +export * from "./webhooksUpdate.ts"; diff --git a/src/types/webhooks/webhook.ts b/src/types/webhooks/webhook.ts index da221970a..8b810d614 100644 --- a/src/types/webhooks/webhook.ts +++ b/src/types/webhooks/webhook.ts @@ -1,7 +1,7 @@ import { Channel } from "../channels/channel.ts"; import { Guild } from "../guilds/guild.ts"; import { User } from "../users/user.ts"; -import { DiscordWebhookTypes } from "./discord_webhook_types.ts"; +import { WebhookTypes } from "./webhookTypes.ts"; /** https://discord.com/developers/docs/resources/webhook#webhook-object-webhook-structure */ export type Webhook = IncomingWebhook | ApplicationWebhook; @@ -10,7 +10,7 @@ export interface IncomingWebhook { /** The id of the webhook */ id: string; /** The type of the webhook */ - type: DiscordWebhookTypes; + type: WebhookTypes; /** The guild id this webhook is for */ guildId?: string; /** The channel id this webhook is for */ @@ -34,7 +34,7 @@ export interface IncomingWebhook { } export interface ApplicationWebhook extends Omit { - type: DiscordWebhookTypes.Application; + type: WebhookTypes.Application; guildId?: string | null; channelId?: string | null; } diff --git a/src/types/webhooks/discordWebhookTypes.ts b/src/types/webhooks/webhookTypes.ts similarity index 100% rename from src/types/webhooks/discordWebhookTypes.ts rename to src/types/webhooks/webhookTypes.ts diff --git a/src/util/mod.ts b/src/util/mod.ts index 90b188cf8..13f0b85db 100644 --- a/src/util/mod.ts +++ b/src/util/mod.ts @@ -1,7 +1,7 @@ export * from "./bigint.ts"; -export * from "./calculate_shard_id.ts"; +export * from "./calculateShardId.ts"; export * from "./collection.ts"; export * from "./constants.ts"; export * from "./hash.ts"; export * from "./utils.ts"; -export * from "./validate_length.ts"; +export * from "./validateLength.ts"; diff --git a/src/util/permissions.ts b/src/util/permissions.ts index 5018f97be..71fa2d40b 100644 --- a/src/util/permissions.ts +++ b/src/util/permissions.ts @@ -1,13 +1,13 @@ -import { DiscordBitwisePermissionFlags } from "../types/permissions/bitwise_permission_flags.ts"; -import { PermissionStrings } from "../types/permissions/permission_strings.ts"; +import { BitwisePermissionFlags } from "../types/permissions/bitwisePermissionFlags.ts"; +import { PermissionStrings } from "../types/permissions/permissionStrings.ts"; /** This function converts a bitwise string to permission strings */ export function calculatePermissions(permissionBits: bigint) { - return Object.keys(DiscordBitwisePermissionFlags).filter((permission) => { + return Object.keys(BitwisePermissionFlags).filter((permission) => { // Since Object.keys() not only returns the permission names but also the bit values we need to return false if it is a Number if (Number(permission)) return false; // Check if permissionBits has this permission - return permissionBits & BigInt(DiscordBitwisePermissionFlags[permission as PermissionStrings]); + return permissionBits & BigInt(BitwisePermissionFlags[permission as PermissionStrings]); }) as PermissionStrings[]; } @@ -15,7 +15,7 @@ export function calculatePermissions(permissionBits: bigint) { export function calculateBits(permissions: PermissionStrings[]) { return permissions .reduce((bits, perm) => { - bits |= BigInt(DiscordBitwisePermissionFlags[perm]); + bits |= BigInt(BitwisePermissionFlags[perm]); return bits; }, 0n) .toString(); diff --git a/src/util/utils.ts b/src/util/utils.ts index d297650ba..cfd77bab2 100644 --- a/src/util/utils.ts +++ b/src/util/utils.ts @@ -1,18 +1,17 @@ -import { isButton } from "../helpers/type_guards/is_button.ts"; import { Errors } from "../types/discordeno/errors.ts"; -import type { ApplicationCommandOption } from "../types/interactions/commands/application_command_option.ts"; -import type { ApplicationCommandOptionChoice } from "../types/interactions/commands/application_command_option_choice.ts"; -import { DiscordApplicationCommandOptionTypes } from "../types/interactions/commands/application_command_option_types.ts"; -import type { CreateGlobalApplicationCommand } from "../types/interactions/commands/create_global_application_command.ts"; -import type { EditGlobalApplicationCommand } from "../types/interactions/commands/edit_global_application_command.ts"; -import { ButtonStyles } from "../types/messages/components/button_styles.ts"; -import type { MessageComponents } from "../types/messages/components/message_components.ts"; -import type { DiscordImageFormat } from "../types/misc/image_format.ts"; -import type { DiscordImageSize } from "../types/misc/image_size.ts"; +import type { ApplicationCommandOption } from "../types/interactions/commands/applicationCommandOption.ts"; +import type { ApplicationCommandOptionChoice } from "../types/interactions/commands/applicationCommandOptionChoice.ts"; +import { ApplicationCommandOptionTypes } from "../types/interactions/commands/applicationCommandOptionTypes.ts"; +import type { CreateGlobalApplicationCommand } from "../types/interactions/commands/createGlobalApplicationCommand.ts"; +import type { EditGlobalApplicationCommand } from "../types/interactions/commands/editGlobalApplicationCommand.ts"; +import { ButtonStyles } from "../types/messages/components/buttonStyles.ts"; +import type { MessageComponents } from "../types/messages/components/messageComponents.ts"; +import type { ImageFormat } from "../types/misc/imageFormat.ts"; +import type { ImageSize } from "../types/misc/imageSize.ts"; import { CONTEXT_MENU_COMMANDS_NAME_REGEX, SLASH_COMMANDS_NAME_REGEX } from "./constants.ts"; -import { isSelectMenu } from "../helpers/type_guards/is_select_menu.ts"; -import { ApplicationCommandTypes } from "../types/interactions/commands/application_command_types.ts"; +import { ApplicationCommandTypes } from "../types/interactions/commands/applicationCommandTypes.ts"; import { Bot } from "../bot.ts"; +import { MessageComponentTypes } from "../types/messages/components/messageComponentTypes.ts"; /** Pause the execution for a given amount of milliseconds. */ export function delay(ms: number): Promise { @@ -24,14 +23,14 @@ export function delay(ms: number): Promise { } /** Help format an image url. */ -export const formatImageURL = (url: string, size: DiscordImageSize = 128, format?: DiscordImageFormat) => { +export const formatImageURL = (url: string, size: ImageSize = 128, format?: ImageFormat) => { return `${url}.${format || (url.includes("/a_") ? "gif" : "jpg")}?size=${size}`; }; export function validateSlashOptionChoices( bot: Bot, choices: ApplicationCommandOptionChoice[], - optionType: DiscordApplicationCommandOptionTypes + optionType: ApplicationCommandOptionTypes ) { return choices.every((choice) => { bot.events.debug(`Running for of loop in validateSlashOptionChoices function.`); @@ -40,13 +39,13 @@ export function validateSlashOptionChoices( } if ( - optionType === DiscordApplicationCommandOptionTypes.String && + optionType === ApplicationCommandOptionTypes.String && (typeof choice.value !== "string" || choice.value.length < 1 || choice.value.length > 100) ) { throw new Error(Errors.INVALID_SLASH_OPTIONS_CHOICE_VALUE_TYPE); } - if (optionType === DiscordApplicationCommandOptionTypes.Integer && typeof choice.value !== "number") { + if (optionType === ApplicationCommandOptionTypes.Integer && typeof choice.value !== "number") { throw new Error(Errors.INVALID_SLASH_OPTIONS_CHOICE_VALUE_TYPE); } }); @@ -63,10 +62,7 @@ export function validateSlashOptions(bot: Bot, options: ApplicationCommandOption if (option.choices?.length) { if (option.choices.length > 25) throw new Error(Errors.TOO_MANY_SLASH_OPTION_CHOICES); - if ( - option.type !== DiscordApplicationCommandOptionTypes.String && - option.type !== DiscordApplicationCommandOptionTypes.Integer - ) + if (option.type !== ApplicationCommandOptionTypes.String && option.type !== ApplicationCommandOptionTypes.Integer) throw new Error(Errors.ONLY_STRING_OR_INTEGER_OPTIONS_CAN_HAVE_CHOICES); } @@ -165,7 +161,7 @@ export function validateComponents(bot: Bot, components: MessageComponents) { throw new Error(Errors.TOO_MANY_COMPONENTS); } else if ( component.components?.length > 1 && - component.components.some((subcomponent) => isSelectMenu(subcomponent)) + component.components.some((subcomponent) => subcomponent.type === MessageComponentTypes.SelectMenu) ) { throw new Error(Errors.COMPONENT_SELECT_MUST_BE_ALONE); } @@ -176,7 +172,7 @@ export function validateComponents(bot: Bot, components: MessageComponents) { } // 5 Link buttons can not have a customId - if (isButton(subcomponent)) { + if (subcomponent.type === MessageComponentTypes.Button) { if (subcomponent.style === ButtonStyles.Link && subcomponent.customId) { throw new Error(Errors.LINK_BUTTON_CANNOT_HAVE_CUSTOM_ID); } @@ -192,7 +188,7 @@ export function validateComponents(bot: Bot, components: MessageComponents) { subcomponent.emoji = makeEmojiFromString(subcomponent.emoji); } - if (isSelectMenu(subcomponent)) { + if (subcomponent.type === MessageComponentTypes.SelectMenu) { if (subcomponent.placeholder && !bot.utils.validateLength(subcomponent.placeholder, { max: 100 })) { throw new Error(Errors.COMPONENT_PLACEHOLDER_TOO_BIG); } diff --git a/src/ws/StartGatewayOptions.ts b/src/ws/StartGatewayOptions.ts index f945a6f7e..6a68ff670 100644 --- a/src/ws/StartGatewayOptions.ts +++ b/src/ws/StartGatewayOptions.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayIntents } from "../types/gateway/gateway_intents.ts"; +import { GatewayIntents } from "../types/gateway/gatewayIntents.ts"; export interface StartGatewayOptions { /** The bot token. */ @@ -6,7 +6,7 @@ export interface StartGatewayOptions { /** Whether or not to use compression for gateway payloads. */ compress?: boolean; /** The intents you would like to enable. */ - intents: (DiscordGatewayIntents | keyof typeof DiscordGatewayIntents)[]; + intents: (GatewayIntents | keyof typeof GatewayIntents)[]; /** The max amount of shards used for identifying. This can be useful for zero-downtime updates or resharding. */ maxShards?: number; /** The first shard Id for this group of shards. */ diff --git a/src/ws/createShard.ts b/src/ws/createShard.ts index eec1b7dd2..d2a2558ef 100644 --- a/src/ws/createShard.ts +++ b/src/ws/createShard.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayCloseEventCodes } from "../types/codes/gateway_close_event_codes.ts"; +import { GatewayCloseEventCodes } from "../types/codes/gatewayCloseEventCodes.ts"; import { GatewayManager } from "../bot.ts"; export function createShard(gateway: GatewayManager, shardId: number) { @@ -33,21 +33,21 @@ export function createShard(gateway: GatewayManager, shardId: number) { case 3066: // Missing ACK // Will restart shard manually return gateway.debug("GW CLOSED_RECONNECT", { shardId, payload: event }); - case DiscordGatewayCloseEventCodes.UnknownOpcode: - case DiscordGatewayCloseEventCodes.DecodeError: - case DiscordGatewayCloseEventCodes.AuthenticationFailed: - case DiscordGatewayCloseEventCodes.AlreadyAuthenticated: - case DiscordGatewayCloseEventCodes.InvalidShard: - case DiscordGatewayCloseEventCodes.ShardingRequired: - case DiscordGatewayCloseEventCodes.InvalidApiVersion: - case DiscordGatewayCloseEventCodes.InvalidIntents: - case DiscordGatewayCloseEventCodes.DisallowedIntents: + case GatewayCloseEventCodes.UnknownOpcode: + case GatewayCloseEventCodes.DecodeError: + case GatewayCloseEventCodes.AuthenticationFailed: + case GatewayCloseEventCodes.AlreadyAuthenticated: + case GatewayCloseEventCodes.InvalidShard: + case GatewayCloseEventCodes.ShardingRequired: + case GatewayCloseEventCodes.InvalidApiVersion: + case GatewayCloseEventCodes.InvalidIntents: + case GatewayCloseEventCodes.DisallowedIntents: throw new Error(event.reason || "Discord gave no reason! GG! You broke Discord!"); // THESE ERRORS CAN NO BE RESUMED! THEY MUST RE-IDENTIFY! - case DiscordGatewayCloseEventCodes.NotAuthenticated: - case DiscordGatewayCloseEventCodes.InvalidSeq: - case DiscordGatewayCloseEventCodes.RateLimited: - case DiscordGatewayCloseEventCodes.SessionTimedOut: + case GatewayCloseEventCodes.NotAuthenticated: + case GatewayCloseEventCodes.InvalidSeq: + case GatewayCloseEventCodes.RateLimited: + case GatewayCloseEventCodes.SessionTimedOut: await gateway.identify(gateway, shardId, gateway.maxShards); break; default: diff --git a/src/ws/handleOnMessage.ts b/src/ws/handleOnMessage.ts index abeeb2e1e..933f0deff 100644 --- a/src/ws/handleOnMessage.ts +++ b/src/ws/handleOnMessage.ts @@ -1,10 +1,10 @@ import { GatewayManager } from "../bot.ts"; -import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts"; -import type { DiscordGatewayPayload } from "../types/gateway/gateway_payload.ts"; +import { GatewayOpcodes } from "../types/codes/gatewayOpcodes.ts"; +import type { DiscordGatewayPayload } from "../types/gateway/gatewayPayload.ts"; import type { DiscordHello } from "../types/gateway/hello.ts"; import type { DiscordReady } from "../types/gateway/ready.ts"; import { Guild } from "../types/guilds/guild.ts"; -import { UnavailableGuild } from "../types/guilds/unavailable_guild.ts"; +import { UnavailableGuild } from "../types/guilds/unavailableGuild.ts"; import { Message } from "../types/messages/mod.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; import { snowflakeToBigint } from "../util/bigint.ts"; @@ -30,7 +30,7 @@ export async function handleOnMessage(gateway: GatewayManager, message: any, sha gateway.debug("GW RAW", { shardId, payload: messageData }); switch (messageData.op) { - case DiscordGatewayOpcodes.Heartbeat: + case GatewayOpcodes.Heartbeat: if (shard?.ws.readyState !== WebSocket.OPEN) return; shard.heartbeat.lastSentAt = Date.now(); @@ -39,23 +39,23 @@ export async function handleOnMessage(gateway: GatewayManager, message: any, sha gateway, shard, { - op: DiscordGatewayOpcodes.Heartbeat, + op: GatewayOpcodes.Heartbeat, d: shard?.previousSequenceNumber, }, true ); break; - case DiscordGatewayOpcodes.Hello: + case GatewayOpcodes.Hello: gateway.heartbeat(gateway, shardId, (messageData.d as DiscordHello).heartbeat_interval); break; - case DiscordGatewayOpcodes.HeartbeatACK: + case GatewayOpcodes.HeartbeatACK: if (gateway.shards.has(shardId)) { const shard = gateway.shards.get(shardId)!; shard.heartbeat.acknowledged = true; shard.heartbeat.lastReceivedAt = Date.now(); } break; - case DiscordGatewayOpcodes.Reconnect: + case GatewayOpcodes.Reconnect: gateway.debug("GW RECONNECT", { shardId }); if (gateway.shards.has(shardId)) { @@ -64,7 +64,7 @@ export async function handleOnMessage(gateway: GatewayManager, message: any, sha gateway.resume(gateway, shardId); break; - case DiscordGatewayOpcodes.InvalidSession: + case GatewayOpcodes.InvalidSession: gateway.debug("GW INVALID_SESSION", { shardId, payload: messageData }); // We need to wait for a random amount of time between 1 and 5: https://discord.com/developers/docs/topics/gateway#resuming diff --git a/src/ws/heartbeat.ts b/src/ws/heartbeat.ts index 59370ef44..800ff9157 100644 --- a/src/ws/heartbeat.ts +++ b/src/ws/heartbeat.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts"; +import { GatewayOpcodes } from "../types/codes/gatewayOpcodes.ts"; import { delay } from "../util/utils.ts"; import { GatewayManager } from "../bot.ts"; @@ -17,7 +17,7 @@ export async function heartbeat(gateway: GatewayManager, shardId: number, interv shard.ws.send( JSON.stringify({ - op: DiscordGatewayOpcodes.Heartbeat, + op: GatewayOpcodes.Heartbeat, d: shard.previousSequenceNumber, }) ); @@ -52,7 +52,7 @@ export async function heartbeat(gateway: GatewayManager, shardId: number, interv currentShard.ws.send( JSON.stringify({ - op: DiscordGatewayOpcodes.Heartbeat, + op: GatewayOpcodes.Heartbeat, d: currentShard.previousSequenceNumber, }) ); diff --git a/src/ws/identify.ts b/src/ws/identify.ts index 30a0feaab..0b724b168 100644 --- a/src/ws/identify.ts +++ b/src/ws/identify.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts"; +import { GatewayOpcodes } from "../types/codes/gatewayOpcodes.ts"; import { GatewayManager } from "../bot.ts"; export function identify(gateway: GatewayManager, shardId: number, maxShards: number) { @@ -43,7 +43,7 @@ export function identify(gateway: GatewayManager, shardId: number, maxShards: nu gateway, shardId, { - op: DiscordGatewayOpcodes.Identify, + op: GatewayOpcodes.Identify, d: { token: gateway.token, compress: gateway.compress, diff --git a/src/ws/mod.ts b/src/ws/mod.ts index 301436112..1d12b8724 100644 --- a/src/ws/mod.ts +++ b/src/ws/mod.ts @@ -1,13 +1,13 @@ -export * from "./close_ws.ts"; -export * from "./create_shard.ts"; -export * from "./handle_on_message.ts"; +export * from "./closeWs.ts"; +export * from "./createShard.ts"; +export * from "./handleOnMessage.ts"; export * from "./heartbeat.ts"; export * from "./identify.ts"; -export * from "./process_gateway_queue.ts"; +export * from "./processGatewayQueue.ts"; export * from "./resharder.ts"; export * from "./resume.ts"; -export * from "./spawn_shards.ts"; -export * from "./send_shard_message.ts"; -export * from "./start_gateway_options.ts"; -export * from "./tell_cluster_to_identify.ts"; +export * from "./spawnShards.ts"; +export * from "./sendShardMessage.ts"; +export * from "./startGatewayOptions.ts"; +export * from "./tellClusterToIdentify.ts"; export * from "./ws.ts"; diff --git a/src/ws/resharder.ts b/src/ws/resharder.ts index 9324717d8..aaf82627f 100644 --- a/src/ws/resharder.ts +++ b/src/ws/resharder.ts @@ -1,5 +1,5 @@ import { GatewayManager } from "../bot.ts"; -import { GetGatewayBot } from "../types/gateway/get_gateway_bot.ts"; +import { GetGatewayBot } from "../types/gateway/getGatewayBot.ts"; /** The handler to automatically reshard when necessary. */ export async function resharder(gateway: GatewayManager) { diff --git a/src/ws/resume.ts b/src/ws/resume.ts index d273f0bb2..a2c0676fe 100644 --- a/src/ws/resume.ts +++ b/src/ws/resume.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts"; +import { GatewayOpcodes } from "../types/codes/gatewayOpcodes.ts"; import { GatewayManager } from "../bot.ts"; export function resume(gateway: GatewayManager, shardId: number) { @@ -7,7 +7,8 @@ export function resume(gateway: GatewayManager, shardId: number) { // NOW WE HANDLE RESUMING THIS SHARD // Get the old data for this shard necessary for resuming const oldShard = gateway.shards.get(shardId); - if (!oldShard) return gateway.debug(`[Error] Trying to resume a shard (id: ${shardId}) that was not first identified.`); + if (!oldShard) + return gateway.debug(`[Error] Trying to resume a shard (id: ${shardId}) that was not first identified.`); // HOW TO CLOSE OLD SHARD SOCKET!!! gateway.closeWS(oldShard.ws, 3064, "Resuming the shard, closing old shard."); @@ -49,7 +50,7 @@ export function resume(gateway: GatewayManager, shardId: number) { gateway, shardId, { - op: DiscordGatewayOpcodes.Resume, + op: GatewayOpcodes.Resume, d: { token: gateway.token, session_id: sessionId, diff --git a/src/ws/spawn_shards.ts b/src/ws/spawnShards.ts similarity index 100% rename from src/ws/spawn_shards.ts rename to src/ws/spawnShards.ts diff --git a/src/ws/ws.ts b/src/ws/ws.ts index 9a59505f4..ac9b4edce 100644 --- a/src/ws/ws.ts +++ b/src/ws/ws.ts @@ -1,4 +1,4 @@ -import { DiscordGatewayOpcodes } from "../types/codes/gateway_opcodes.ts"; +import { GatewayOpcodes } from "../types/codes/gatewayOpcodes.ts"; export interface DiscordenoShard { /** The shard id number. */ @@ -43,7 +43,7 @@ export interface DiscordenoShard { } export interface WebSocketRequest { - op: DiscordGatewayOpcodes; + op: GatewayOpcodes; d: unknown; // guildId: bigint; // shardId: number; diff --git a/tests/helpers/channels/categoryChannels.ts b/tests/helpers/channels/categoryChannels.ts index fc98104c2..d6d3c4bb4 100644 --- a/tests/helpers/channels/categoryChannels.ts +++ b/tests/helpers/channels/categoryChannels.ts @@ -1,12 +1,12 @@ import { Bot } from "../../../src/bot.ts"; -import { DiscordChannelTypes } from "../../../src/types/channels/channel_types.ts"; +import { ChannelTypes } from "../../../src/types/channels/channelTypes.ts"; import { assertExists } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; export async function categoryChildrenTest(bot: Bot, guildId: bigint, t: Deno.TestContext) { const category = await bot.helpers.createChannel(guildId, { name: "Discordeno-test", - type: DiscordChannelTypes.GuildCategory, + type: ChannelTypes.GuildCategory, }); // Assertions diff --git a/tests/helpers/channels/channelOverwriteHasPermission.ts b/tests/helpers/channels/channelOverwriteHasPermission.ts index 9f43a52ed..d7d2b3f64 100644 --- a/tests/helpers/channels/channelOverwriteHasPermission.ts +++ b/tests/helpers/channels/channelOverwriteHasPermission.ts @@ -1,10 +1,4 @@ -import { - Bot, - createChannel, - DiscordChannelTypes, - channelOverwriteHasPermission, - DiscordOverwriteTypes, -} from "../../../mod.ts"; +import { Bot, createChannel, ChannelTypes, channelOverwriteHasPermission, OverwriteTypes } from "../../../mod.ts"; import { Cache } from "../../../src/cache.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; @@ -15,7 +9,7 @@ export async function channelOverwriteHasPermissionTest(bot: Bot, guildId permissionOverwrites: [ { id: bot.id, - type: DiscordOverwriteTypes.Member, + type: OverwriteTypes.Member, allow: ["VIEW_CHANNEL"], deny: [], }, @@ -24,7 +18,7 @@ export async function channelOverwriteHasPermissionTest(bot: Bot, guildId // Assertions assertExists(channel); - assertEquals(channel.type, DiscordChannelTypes.GuildText); + assertEquals(channel.type, ChannelTypes.GuildText); // Delay the execution to allow event to be processed await delayUntil(10000, () => bot.cache.channels.has(channel.id)); diff --git a/tests/helpers/channels/createChannel.ts b/tests/helpers/channels/createChannel.ts index 876745469..d0b11fb54 100644 --- a/tests/helpers/channels/createChannel.ts +++ b/tests/helpers/channels/createChannel.ts @@ -1,6 +1,6 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; +import { CreateGuildChannel } from "../../../src/types/guilds/createGuildChannel.ts"; +import { ChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; @@ -9,7 +9,7 @@ export async function createChannelTests(bot: Bot, guildId: bigint, options: Cre // Assertions assertExists(channel); - assertEquals(channel.type, options.type || DiscordChannelTypes.GuildText); + assertEquals(channel.type, options.type || ChannelTypes.GuildText); // Delay the execution to allow event to be processed await delayUntil(10000, () => bot.cache.channels.has(channel.id)); diff --git a/tests/helpers/channels/deleteChannelOverwrite.ts b/tests/helpers/channels/deleteChannelOverwrite.ts index 15146fd2b..c4ce441b4 100644 --- a/tests/helpers/channels/deleteChannelOverwrite.ts +++ b/tests/helpers/channels/deleteChannelOverwrite.ts @@ -1,10 +1,4 @@ -import { - Bot, - createChannel, - DiscordChannelTypes, - channelOverwriteHasPermission, - DiscordOverwriteTypes, -} from "../../../mod.ts"; +import { Bot, createChannel, ChannelTypes, channelOverwriteHasPermission, OverwriteTypes } from "../../../mod.ts"; import { Cache } from "../../../src/cache.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; @@ -15,7 +9,7 @@ export async function deleteChannelOverwriteTests(bot: Bot, guildId: bigi permissionOverwrites: [ { id: bot.id, - type: DiscordOverwriteTypes.Member, + type: OverwriteTypes.Member, allow: ["VIEW_CHANNEL"], deny: [], }, @@ -24,7 +18,7 @@ export async function deleteChannelOverwriteTests(bot: Bot, guildId: bigi // Assertions assertExists(channel); - assertEquals(channel.type, DiscordChannelTypes.GuildText); + assertEquals(channel.type, ChannelTypes.GuildText); // Delay the execution to allow event to be processed await delayUntil(10000, () => bot.cache.channels.has(channel.id)); diff --git a/tests/helpers/guilds/createGuild.ts b/tests/helpers/guilds/createGuild.ts index 601b298db..f9f31dd8b 100644 --- a/tests/helpers/guilds/createGuild.ts +++ b/tests/helpers/guilds/createGuild.ts @@ -1,6 +1,6 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; +import { CreateGuildChannel } from "../../../src/types/guilds/createGuildChannel.ts"; +import { ChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; diff --git a/tests/helpers/guilds/deleteGuild.ts b/tests/helpers/guilds/deleteGuild.ts index 20aedbd33..3ef7383e7 100644 --- a/tests/helpers/guilds/deleteGuild.ts +++ b/tests/helpers/guilds/deleteGuild.ts @@ -1,6 +1,4 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; diff --git a/tests/helpers/guilds/editGuild.ts b/tests/helpers/guilds/editGuild.ts index 0d3a4e049..6eb562d95 100644 --- a/tests/helpers/guilds/editGuild.ts +++ b/tests/helpers/guilds/editGuild.ts @@ -1,6 +1,4 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; diff --git a/tests/helpers/guilds/getAvailableVoiceRegions.ts b/tests/helpers/guilds/getAvailableVoiceRegions.ts index 702970ad0..d63fa61c1 100644 --- a/tests/helpers/guilds/getAvailableVoiceRegions.ts +++ b/tests/helpers/guilds/getAvailableVoiceRegions.ts @@ -1,9 +1,5 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; -import { delayUntil } from "../../utils.ts"; -import { getAvailableVoiceRegions } from "../../../src/helpers/guilds/get_available_voice_regions.ts"; export async function getAvailableVoiceRegionsTests(bot: Bot, t: Deno.TestContext) { const regions = await bot.helpers.getAvailableVoiceRegions(); diff --git a/tests/helpers/guilds/getBan.ts b/tests/helpers/guilds/getBan.ts index 3f1c142f4..c8f31f5f0 100644 --- a/tests/helpers/guilds/getBan.ts +++ b/tests/helpers/guilds/getBan.ts @@ -1,12 +1,9 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; -import { getAvailableVoiceRegions } from "../../../src/helpers/guilds/get_available_voice_regions.ts"; export async function getBanTests(bot: Bot, guildId: bigint, t: Deno.TestContext) { - await bot.helpers.ban(guildId, 379643682984296448n); + await bot.helpers.banMember(guildId, 379643682984296448n); const fetchedBan = await bot.helpers.getBan(guildId, 379643682984296448n); diff --git a/tests/helpers/guilds/getBans.ts b/tests/helpers/guilds/getBans.ts index 4ff2628d7..ac1ca7061 100644 --- a/tests/helpers/guilds/getBans.ts +++ b/tests/helpers/guilds/getBans.ts @@ -1,13 +1,13 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; +import { CreateGuildChannel } from "../../../src/types/guilds/createGuildChannel.ts"; +import { ChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; -import { getAvailableVoiceRegions } from "../../../src/helpers/guilds/get_available_voice_regions.ts"; +import { getAvailableVoiceRegions } from "../../../src/helpers/guilds/getAvailableVoiceRegions.ts"; export async function getBansTests(bot: Bot, guildId: bigint, t: Deno.TestContext) { - await bot.helpers.ban(guildId, 416477607966670869n); - await bot.helpers.ban(guildId, 635383782576357407n); + await bot.helpers.banMember(guildId, 416477607966670869n); + await bot.helpers.banMember(guildId, 635383782576357407n); const fetchedBans = await bot.helpers.getBans(guildId); diff --git a/tests/helpers/guilds/getGuild.ts b/tests/helpers/guilds/getGuild.ts index 1a79a3eae..e604ccb95 100644 --- a/tests/helpers/guilds/getGuild.ts +++ b/tests/helpers/guilds/getGuild.ts @@ -1,9 +1,6 @@ import { Bot } from "../../../src/bot.ts"; -import { CreateGuildChannel } from "../../../src/types/guilds/create_guild_channel.ts"; -import { DiscordChannelTypes } from "../../../src/types/mod.ts"; import { assertExists, assertEquals } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; -import { getAvailableVoiceRegions } from "../../../src/helpers/guilds/get_available_voice_regions.ts"; export async function getGuildTests(bot: Bot, guildId: bigint, t: Deno.TestContext) { const fetchedGuild = await bot.helpers.getGuild(guildId); diff --git a/tests/helpers/members/ban.ts b/tests/helpers/members/ban.ts index 10201c79e..b1005932b 100644 --- a/tests/helpers/members/ban.ts +++ b/tests/helpers/members/ban.ts @@ -10,7 +10,7 @@ export async function banTest(bot: Bot, t: Deno.TestContext, guildId: bigint, id banCounters.set(user.id, true); }; - await bot.helpers.ban(guildId, id, options); + await bot.helpers.banMember(guildId, id, options); await delayUntil(10000, () => banCounters.get(id)); diff --git a/tests/helpers/messages/sendMessage.ts b/tests/helpers/messages/sendMessage.ts index c4bffdedf..8035aeff6 100644 --- a/tests/helpers/messages/sendMessage.ts +++ b/tests/helpers/messages/sendMessage.ts @@ -1,9 +1,9 @@ import { Bot } from "../../../src/bot.ts"; import { assertExists } from "../../deps.ts"; import { delayUntil } from "../../utils.ts"; -import { CreateMessage } from "../../../src/types/messages/create_message.ts"; -import { DiscordMessageComponentTypes } from "../../../src/types/messages/components/message_component_types.ts"; -import { DiscordButtonStyles } from "../../../src/types/messages/components/button_styles.ts"; +import { CreateMessage } from "../../../src/types/messages/createMessage.ts"; +import { MessageComponentTypes } from "../../../src/types/messages/components/messageComponentTypes.ts"; +import { ButtonStyles } from "../../../src/types/messages/components/buttonStyles.ts"; async function ifItFailsBlameWolf(bot: Bot, channelId: bigint, content: string | CreateMessage) { const message = await bot.helpers.sendMessage(channelId, content); @@ -26,30 +26,30 @@ export async function sendMessageWithComponents(bot: Bot, channelId: bigint, t: content: "Hello World!", components: [ { - type: DiscordMessageComponentTypes.ActionRow, + type: MessageComponentTypes.ActionRow, components: [ { - type: DiscordMessageComponentTypes.Button, + type: MessageComponentTypes.Button, label: "Doc", - style: DiscordButtonStyles.Link, + style: ButtonStyles.Link, url: `https://discordeno.mod.land/`, }, { - type: DiscordMessageComponentTypes.Button, + type: MessageComponentTypes.Button, label: "Server", - style: DiscordButtonStyles.Link, + style: ButtonStyles.Link, url: `https://discord.gg/ddeno`, }, ], }, { - type: DiscordMessageComponentTypes.ActionRow, + type: MessageComponentTypes.ActionRow, components: [ { - type: DiscordMessageComponentTypes.Button, + type: MessageComponentTypes.Button, label: "Hi", customId: `hi`, - style: DiscordButtonStyles.Primary, + style: ButtonStyles.Primary, }, ], }, diff --git a/tests/local.ts b/tests/local.ts index 83c064334..ebaebee05 100644 --- a/tests/local.ts +++ b/tests/local.ts @@ -1,5 +1,5 @@ import "./util/bigint.ts"; -import "./util/validate_length.ts"; +import "./util/validateLength.ts"; import "./util/utils.ts"; import "./util/hash.ts"; -import "./util/format_urls.ts"; +import "./util/formatUrls.ts"; diff --git a/tests/mod.ts b/tests/mod.ts index 19c2531fd..1189f2255 100644 --- a/tests/mod.ts +++ b/tests/mod.ts @@ -4,43 +4,43 @@ import { channelOverwriteHasPermission, createBot, createEventHandlers, - DiscordChannelTypes, - DiscordOverwriteTypes, + ChannelTypes, + OverwriteTypes, setupBot, startBot, stopBot, } from "../mod.ts"; import { assertEquals, assertExists, enableCachePlugin } from "./deps.ts"; -import { deleteMessageWithReasonTest, deleteMessageWithoutReasonTest } from "./helpers/messages/delete_message.ts"; -import { getMessagesTest } from "./helpers/messages/get_messages.ts"; -import { deleteMessagesWithoutReasonTest, deleteMessagesWithReasonTest } from "./helpers/messages/delete_messages.ts"; +import { deleteMessageWithReasonTest, deleteMessageWithoutReasonTest } from "./helpers/messages/deleteMessage.ts"; +import { getMessagesTest } from "./helpers/messages/getMessages.ts"; +import { deleteMessagesWithoutReasonTest, deleteMessagesWithReasonTest } from "./helpers/messages/deleteMessages.ts"; import { delayUntil } from "./utils.ts"; import { sendMessageWithComponents, sendMessageWithEmbedsTest, sendMessageWithTextTest, -} from "./helpers/messages/send_message.ts"; +} from "./helpers/messages/sendMessage.ts"; // CONDUCT LOCAL TESTS FIRST BEFORE RUNNING API TEST import "./local.ts"; -import { getMessageTest } from "./helpers/messages/get_message.ts"; +import { getMessageTest } from "./helpers/messages/getMessage.ts"; import { addReactionTest } from "./helpers/messages/reactions.ts"; -import { editMessageTest } from "./helpers/messages/edit_message.ts"; -import { fetchSingleMemberTest } from "./helpers/members/fetch_members.ts"; +import { editMessageTest } from "./helpers/messages/editMessage.ts"; +import { fetchSingleMemberTest } from "./helpers/members/fetchMembers.ts"; import { pinMessageTests } from "./helpers/messages/pin.ts"; import { removeAllReactionTests, removeReactionEmojiTest, removeReactionTest } from "./helpers/messages/reactions.ts"; -import { createInviteTest } from "./helpers/invites/create_invite.ts"; -import { deleteInviteTest } from "./helpers/invites/delete_invite.ts"; -import { getChannelInvitesTest } from "./helpers/invites/get_channels_invites.ts"; -import { getInviteTest } from "./helpers/invites/get_invite.ts"; -import { getInvitesTest } from "./helpers/invites/get_invites.ts"; -import { createChannelTests } from "./helpers/channels/create_channel.ts"; -import { deleteChannelTests } from "./helpers/channels/delete_channel.ts"; -import { createEmojiTest } from "./helpers/emojis/create_emoji.ts"; -import { deleteEmojiWithoutReasonTest, deleteEmojiWithReasonTest } from "./helpers/emojis/delete_emoji.ts"; -import { editEmojiTest } from "./helpers/emojis/edit_emoji.ts"; -import { getEmojiTest } from "./helpers/emojis/get_emoji.ts"; -import { getEmojisTest } from "./helpers/emojis/get_emojis.ts"; +import { createInviteTest } from "./helpers/invites/createInvite.ts"; +import { deleteInviteTest } from "./helpers/invites/deleteInvite.ts"; +import { getChannelInvitesTest } from "./helpers/invites/getChannelInvites.ts"; +import { getInviteTest } from "./helpers/invites/getInvite.ts"; +import { getInvitesTest } from "./helpers/invites/getInvites.ts"; +import { createChannelTests } from "./helpers/channels/createChannel.ts"; +import { deleteChannelTests } from "./helpers/channels/deleteChannel.ts"; +import { createEmojiTest } from "./helpers/emojis/createEmoji.ts"; +import { deleteEmojiWithoutReasonTest, deleteEmojiWithReasonTest } from "./helpers/emojis/deleteEmoji.ts"; +import { editEmojiTest } from "./helpers/emojis/editEmoji.ts"; +import { getEmojiTest } from "./helpers/emojis/getEmoji.ts"; +import { getEmojisTest } from "./helpers/emojis/getEmojis.ts"; import { getBansTest, unbanTest, banTest } from "./helpers/members/ban.ts"; import { createRoleTests } from "./helpers/roles/createRole.ts"; import { deleteRoleTests } from "./helpers/roles/deleteRole.ts"; @@ -246,7 +246,7 @@ Deno.test({ // Assertions assertExists(channel); - assertEquals(channel.type, DiscordChannelTypes.GuildText); + assertEquals(channel.type, ChannelTypes.GuildText); // ALL MESSAGE RELATED TESTS THAT DEPEND ON AN EXISTING CHANNEL await t.step("Message related tests", async (t) => { @@ -421,7 +421,7 @@ Deno.test({ guild.id, { name: "Discordeno-test", - type: DiscordChannelTypes.GuildCategory, + type: ChannelTypes.GuildCategory, }, t ); @@ -431,7 +431,7 @@ Deno.test({ // t.step({ // name: "[channel] create a new news channel", // async fn() { - // await createChannelTests(bot, guild.id,{ name: "Discordeno-test", type: DiscordChannelTypes.GUILD_NEWS}, t); + // await createChannelTests(bot, guild.id,{ name: "Discordeno-test", type: ChannelTypes.GUILD_NEWS}, t); // }, // ...sanitizeMode, // }), @@ -439,7 +439,7 @@ Deno.test({ // t.step({ // name: "[channel] create a new store channel", // async fn() { - // await createChannelTests(bot, guild.id,{ name: "Discordeno-test", type: DiscordChannelTypes.GUILD_STORE}, t); + // await createChannelTests(bot, guild.id,{ name: "Discordeno-test", type: ChannelTypes.GUILD_STORE}, t); // }, // ...sanitizeMode, // }), @@ -451,7 +451,7 @@ Deno.test({ guild.id, { name: "Discordeno-test", - type: DiscordChannelTypes.GuildVoice, + type: ChannelTypes.GuildVoice, }, t ); @@ -466,7 +466,7 @@ Deno.test({ guild.id, { name: "discordeno-test", - type: DiscordChannelTypes.GuildVoice, + type: ChannelTypes.GuildVoice, bitrate: 32000, }, t @@ -482,7 +482,7 @@ Deno.test({ guild.id, { name: "Discordeno-test", - type: DiscordChannelTypes.GuildVoice, + type: ChannelTypes.GuildVoice, userLimit: 32, }, t @@ -523,7 +523,7 @@ Deno.test({ permissionOverwrites: [ { id: bot.id, - type: DiscordOverwriteTypes.Member, + type: OverwriteTypes.Member, allow: ["VIEW_CHANNEL"], deny: [], }, diff --git a/tests/util/validateLength.ts b/tests/util/validateLength.ts index aab8eeb19..05374df68 100644 --- a/tests/util/validateLength.ts +++ b/tests/util/validateLength.ts @@ -1,4 +1,4 @@ -import { validateLength } from "../../src/util/validate_length.ts"; +import { validateLength } from "../../src/util/validateLength.ts"; import { assertEquals } from "../deps.ts"; Deno.test({