From 592ea91c36d4d8be94c6090b65608b0f42ecf69f Mon Sep 17 00:00:00 2001 From: H01001000 Date: Thu, 1 Dec 2022 16:06:33 +0800 Subject: [PATCH] fixing: bot --- packages/bot/package.json | 1 + packages/bot/src/bot.ts | 156 +++--------------- .../src/handlers/channels/CHANNEL_CREATE.ts | 2 +- .../src/handlers/channels/CHANNEL_DELETE.ts | 2 +- .../handlers/channels/CHANNEL_PINS_UPDATE.ts | 2 +- .../src/handlers/channels/CHANNEL_UPDATE.ts | 2 +- .../channels/STAGE_INSTANCE_CREATE.ts | 2 +- .../channels/STAGE_INSTANCE_DELETE.ts | 2 +- .../channels/STAGE_INSTANCE_UPDATE.ts | 2 +- .../src/handlers/channels/THREAD_CREATE.ts | 2 +- .../src/handlers/channels/THREAD_DELETE.ts | 2 +- .../src/handlers/channels/THREAD_LIST_SYNC.ts | 2 +- .../channels/THREAD_MEMBERS_UPDATE.ts | 2 +- .../handlers/channels/THREAD_MEMBER_UPDATE.ts | 2 +- .../src/handlers/channels/THREAD_UPDATE.ts | 2 +- .../handlers/channels/{mod.ts => index.ts} | 0 .../handlers/emojis/GUILD_EMOJIS_UPDATE.ts | 2 +- .../src/handlers/emojis/{mod.ts => index.ts} | 0 .../bot/src/handlers/guilds/GUILD_BAN_ADD.ts | 2 +- .../src/handlers/guilds/GUILD_BAN_REMOVE.ts | 2 +- .../bot/src/handlers/guilds/GUILD_CREATE.ts | 2 +- .../bot/src/handlers/guilds/GUILD_DELETE.ts | 2 +- .../guilds/GUILD_INTEGRATIONS_UPDATE.ts | 2 +- .../bot/src/handlers/guilds/GUILD_UPDATE.ts | 2 +- .../guilds/automod/{mod.ts => index.ts} | 0 .../src/handlers/guilds/{mod.ts => index.ts} | 2 +- .../GUILD_SCHEDULED_EVENT_CREATE.ts | 2 +- .../GUILD_SCHEDULED_EVENT_DELETE.ts | 2 +- .../GUILD_SCHEDULED_EVENT_UPDATE.ts | 2 +- .../GUILD_SCHEDULED_EVENT_USER_ADD.ts | 2 +- .../GUILD_SCHEDULED_EVENT_USER_REMOVE.ts | 2 +- .../scheduledEvents/{mod.ts => index.ts} | 0 packages/bot/src/handlers/index.ts | 12 ++ .../integrations/INTEGRATION_CREATE.ts | 2 +- .../integrations/INTEGRATION_DELETE.ts | 2 +- .../integrations/INTEGRATION_UPDATE.ts | 2 +- .../integrations/{mod.ts => index.ts} | 0 .../interactions/INTERACTION_CREATE.ts | 2 +- .../interactions/{mod.ts => index.ts} | 0 .../bot/src/handlers/invites/INVITE_CREATE.ts | 2 +- .../bot/src/handlers/invites/INVITE_DELETE.ts | 2 +- .../src/handlers/invites/{mod.ts => index.ts} | 0 .../handlers/members/GUILD_MEMBERS_CHUNK.ts | 3 +- .../src/handlers/members/GUILD_MEMBER_ADD.ts | 2 +- .../handlers/members/GUILD_MEMBER_REMOVE.ts | 2 +- .../handlers/members/GUILD_MEMBER_UPDATE.ts | 2 +- .../src/handlers/members/{mod.ts => index.ts} | 0 .../src/handlers/messages/MESSAGE_CREATE.ts | 2 +- .../src/handlers/messages/MESSAGE_DELETE.ts | 2 +- .../handlers/messages/MESSAGE_DELETE_BULK.ts | 2 +- .../handlers/messages/MESSAGE_REACTION_ADD.ts | 2 +- .../messages/MESSAGE_REACTION_REMOVE.ts | 2 +- .../messages/MESSAGE_REACTION_REMOVE_ALL.ts | 2 +- .../messages/MESSAGE_REACTION_REMOVE_EMOJI.ts | 2 +- .../src/handlers/messages/MESSAGE_UPDATE.ts | 2 +- .../handlers/messages/{mod.ts => index.ts} | 0 .../bot/src/handlers/misc/PRESENCE_UPDATE.ts | 2 +- packages/bot/src/handlers/misc/READY.ts | 2 +- .../bot/src/handlers/misc/TYPING_START.ts | 2 +- packages/bot/src/handlers/misc/USER_UPDATE.ts | 2 +- .../src/handlers/misc/{mod.ts => index.ts} | 0 packages/bot/src/handlers/mod.ts | 12 -- .../src/handlers/roles/GUILD_ROLE_CREATE.ts | 2 +- .../src/handlers/roles/GUILD_ROLE_DELETE.ts | 2 +- .../src/handlers/roles/GUILD_ROLE_UPDATE.ts | 2 +- .../src/handlers/roles/{mod.ts => index.ts} | 0 .../src/handlers/voice/VOICE_SERVER_UPDATE.ts | 2 +- .../src/handlers/voice/VOICE_STATE_UPDATE.ts | 2 +- .../src/handlers/voice/{mod.ts => index.ts} | 0 .../src/handlers/webhooks/WEBHOOKS_UPDATE.ts | 2 +- .../handlers/webhooks/{mod.ts => index.ts} | 0 .../followAnnouncementChannel.ts | 2 +- .../announcements/{mod.ts => index.ts} | 0 .../bot/src/helpers/channels/createChannel.ts | 6 +- .../bot/src/helpers/channels/deleteChannel.ts | 2 +- .../deleteChannelPermissionOverride.ts | 2 +- .../bot/src/helpers/channels/editChannel.ts | 6 +- .../editChannelPermissionOverrides.ts | 4 +- .../helpers/channels/editChannelPositions.ts | 2 +- .../channels/forums/createForumThread.ts | 4 +- .../channels/forums/{mod.ts => index.ts} | 0 .../bot/src/helpers/channels/getChannel.ts | 3 +- .../src/helpers/channels/getChannelInvites.ts | 5 +- .../bot/src/helpers/channels/getChannels.ts | 3 +- .../src/helpers/channels/{mod.ts => index.ts} | 8 +- .../channels/stages/createStageInstance.ts | 4 +- .../channels/stages/editStageInstance.ts | 4 +- .../channels/stages/getStageInstance.ts | 2 +- .../channels/stages/{mod.ts => index.ts} | 0 .../channels/threads/getActiveThreads.ts | 4 +- .../threads/getPrivateArchivedThreads.ts | 2 +- .../getPrivateJoinedArchivedThreads.ts | 2 +- .../threads/getPublicArchivedThreads.ts | 2 +- .../channels/threads/getThreadMember.ts | 2 +- .../channels/threads/getThreadMembers.ts | 2 +- .../channels/threads/{mod.ts => index.ts} | 0 .../threads/startThreadWithMessage.ts | 4 +- .../threads/startThreadWithoutMessage.ts | 4 +- .../channels/triggerTypingIndicator.ts | 2 +- .../bot/src/helpers/emojis/createEmoji.ts | 4 +- .../bot/src/helpers/emojis/deleteEmoji.ts | 2 +- packages/bot/src/helpers/emojis/editEmoji.ts | 4 +- packages/bot/src/helpers/emojis/getEmoji.ts | 3 +- .../bot/src/helpers/emojis/getEmojiUrl.ts | 2 +- packages/bot/src/helpers/emojis/getEmojis.ts | 3 +- .../src/helpers/emojis/{mod.ts => index.ts} | 0 .../guilds/automod/createAutomodRule.ts | 8 +- .../helpers/guilds/automod/editAutomodRule.ts | 8 +- .../helpers/guilds/automod/getAutomodRule.ts | 2 +- .../helpers/guilds/automod/getAutomodRules.ts | 2 +- .../guilds/automod/{mod.ts => index.ts} | 0 .../bot/src/helpers/guilds/createGuild.ts | 12 +- .../bot/src/helpers/guilds/deleteGuild.ts | 2 +- packages/bot/src/helpers/guilds/editGuild.ts | 10 +- .../src/helpers/guilds/editGuildMfaLevel.ts | 4 +- .../src/helpers/guilds/editWelcomeScreen.ts | 3 +- .../guilds/events/createScheduledEvent.ts | 4 +- .../guilds/events/editScheduledEvent.ts | 4 +- .../guilds/events/getScheduledEvent.ts | 2 +- .../guilds/events/getScheduledEventUsers.ts | 4 +- .../guilds/events/getScheduledEvents.ts | 2 +- .../guilds/events/{mod.ts => index.ts} | 0 .../bot/src/helpers/guilds/getAuditLog.ts | 3 +- packages/bot/src/helpers/guilds/getBan.ts | 3 +- packages/bot/src/helpers/guilds/getBans.ts | 3 +- packages/bot/src/helpers/guilds/getGuild.ts | 3 +- .../src/helpers/guilds/getGuildBannerUrl.ts | 2 +- .../bot/src/helpers/guilds/getGuildIconUrl.ts | 2 +- .../bot/src/helpers/guilds/getGuildPreview.ts | 3 +- .../src/helpers/guilds/getGuildSplashUrl.ts | 2 +- .../bot/src/helpers/guilds/getPruneCount.ts | 2 +- .../bot/src/helpers/guilds/getVanityUrl.ts | 2 +- .../src/helpers/guilds/getWelcomeScreen.ts | 3 +- .../src/helpers/guilds/{mod.ts => index.ts} | 12 +- .../guilds/integrations/getIntegrations.ts | 2 +- .../guilds/integrations/{mod.ts => index.ts} | 0 .../helpers/guilds/invites/createInvite.ts | 4 +- .../src/helpers/guilds/invites/getInvite.ts | 4 +- .../src/helpers/guilds/invites/getInvites.ts | 4 +- .../guilds/invites/{mod.ts => index.ts} | 0 packages/bot/src/helpers/guilds/leaveGuild.ts | 2 +- .../guilds/voice/getAvailableVoiceRegions.ts | 2 +- .../helpers/guilds/voice/getVoiceRegions.ts | 2 +- .../helpers/guilds/voice/{mod.ts => index.ts} | 0 .../guilds/widget/editWidgetSettings.ts | 2 +- .../src/helpers/guilds/widget/getWidget.ts | 2 +- .../guilds/widget/getWidgetSettings.ts | 2 +- .../guilds/widget/{mod.ts => index.ts} | 0 packages/bot/src/helpers/index.ts | 11 ++ .../createGlobalApplicationCommand.ts | 4 +- .../commands/createGuildApplicationCommand.ts | 2 +- .../editApplicationCommandPermissions.ts | 2 +- .../commands/editGlobalApplicationCommand.ts | 2 +- .../commands/editGuildApplicationCommand.ts | 2 +- .../getApplicationCommandPermission.ts | 2 +- .../getApplicationCommandPermissions.ts | 2 +- .../commands/getGlobalApplicationCommand.ts | 2 +- .../commands/getGlobalApplicationCommands.ts | 2 +- .../commands/getGuildApplicationCommand.ts | 2 +- .../commands/getGuildApplicationCommands.ts | 2 +- .../commands/{mod.ts => index.ts} | 0 .../upsertGlobalApplicationCommands.ts | 2 +- .../upsertGuildApplicationCommands.ts | 2 +- .../bot/src/helpers/interactions/index.ts | 2 + packages/bot/src/helpers/interactions/mod.ts | 2 - .../responses/editFollowupMessage.ts | 4 +- .../editOriginalInteractionResponse.ts | 4 +- .../responses/getFollowupMessage.ts | 2 +- .../getOriginalInteractionResponse.ts | 2 +- .../responses/{mod.ts => index.ts} | 0 .../responses/sendFollowupMessage.ts | 4 +- .../responses/sendInteractionResponse.ts | 2 +- packages/bot/src/helpers/members/banMember.ts | 2 +- .../bot/src/helpers/members/editBotMember.ts | 2 +- .../bot/src/helpers/members/editMember.ts | 3 +- .../bot/src/helpers/members/fetchMembers.ts | 2 +- .../bot/src/helpers/members/getAvatarUrl.ts | 2 +- .../bot/src/helpers/members/getDmChannel.ts | 3 +- packages/bot/src/helpers/members/getMember.ts | 3 +- .../bot/src/helpers/members/getMembers.ts | 3 +- .../src/helpers/members/{mod.ts => index.ts} | 0 .../bot/src/helpers/members/kickMember.ts | 2 +- .../bot/src/helpers/members/pruneMembers.ts | 2 +- .../bot/src/helpers/members/searchMembers.ts | 5 +- .../bot/src/helpers/members/unbanMember.ts | 2 +- .../src/helpers/messages/crosspostMessage.ts | 3 +- .../bot/src/helpers/messages/deleteMessage.ts | 2 +- .../src/helpers/messages/deleteMessages.ts | 2 +- .../bot/src/helpers/messages/editMessage.ts | 4 +- .../bot/src/helpers/messages/getMessage.ts | 3 +- .../bot/src/helpers/messages/getMessages.ts | 3 +- .../src/helpers/messages/getPinnedMessages.ts | 3 +- .../src/helpers/messages/{mod.ts => index.ts} | 2 +- .../bot/src/helpers/messages/pinMessage.ts | 2 +- .../messages/reactions/getReactions.ts | 2 +- .../messages/reactions/{mod.ts => index.ts} | 0 .../bot/src/helpers/messages/sendMessage.ts | 5 +- .../bot/src/helpers/messages/unpinMessage.ts | 2 +- .../bot/src/helpers/misc/editBotProfile.ts | 2 +- .../bot/src/helpers/misc/editShardStatus.ts | 6 +- .../src/helpers/misc/getApplicationInfo.ts | 2 +- .../bot/src/helpers/misc/getGatewayBot.ts | 2 +- .../src/helpers/misc/getNitroStickerPacks.ts | 2 +- packages/bot/src/helpers/misc/getUser.ts | 3 +- .../bot/src/helpers/misc/{mod.ts => index.ts} | 0 packages/bot/src/helpers/mod.ts | 11 -- packages/bot/src/helpers/roles/addRole.ts | 2 +- packages/bot/src/helpers/roles/createRole.ts | 3 +- packages/bot/src/helpers/roles/deleteRole.ts | 2 +- packages/bot/src/helpers/roles/editRole.ts | 3 +- .../src/helpers/roles/editRolePositions.ts | 3 +- packages/bot/src/helpers/roles/getRoles.ts | 3 +- .../src/helpers/roles/{mod.ts => index.ts} | 0 packages/bot/src/helpers/roles/removeRole.ts | 2 +- .../helpers/stickers/createGuildSticker.ts | 2 +- .../src/helpers/stickers/editGuildSticker.ts | 3 +- .../src/helpers/stickers/getGuildSticker.ts | 2 +- .../src/helpers/stickers/getGuildStickers.ts | 4 +- .../bot/src/helpers/stickers/getSticker.ts | 4 +- .../src/helpers/stickers/{mod.ts => index.ts} | 0 .../templates/createGuildFromTemplate.ts | 2 +- .../helpers/templates/createGuildTemplate.ts | 4 +- .../helpers/templates/deleteGuildTemplate.ts | 2 +- .../helpers/templates/editGuildTemplate.ts | 4 +- .../src/helpers/templates/getGuildTemplate.ts | 2 +- .../helpers/templates/getGuildTemplates.ts | 4 +- .../helpers/templates/{mod.ts => index.ts} | 0 .../helpers/templates/syncGuildTemplate.ts | 4 +- .../bot/src/helpers/webhooks/createWebhook.ts | 4 +- .../bot/src/helpers/webhooks/deleteWebhook.ts | 2 +- .../helpers/webhooks/deleteWebhookMessage.ts | 2 +- .../webhooks/deleteWebhookWithToken.ts | 2 +- .../webhooks/editOriginalWebhookMessage.ts | 4 +- .../bot/src/helpers/webhooks/editWebhook.ts | 4 +- .../helpers/webhooks/editWebhookMessage.ts | 4 +- .../helpers/webhooks/editWebhookWithToken.ts | 3 +- .../src/helpers/webhooks/executeWebhook.ts | 4 +- .../helpers/webhooks/getChannelWebhooks.ts | 3 +- .../src/helpers/webhooks/getGuildWebhooks.ts | 3 +- .../bot/src/helpers/webhooks/getWebhook.ts | 3 +- .../src/helpers/webhooks/getWebhookMessage.ts | 3 +- .../helpers/webhooks/getWebhookWithToken.ts | 3 +- .../src/helpers/webhooks/{mod.ts => index.ts} | 0 packages/bot/src/index.ts | 4 + packages/bot/src/plugins/cache/deps.ts | 2 +- packages/bot/src/plugins/fileloader/deps.ts | 2 +- packages/bot/src/plugins/helpers/deps.ts | 2 +- packages/bot/src/plugins/mod.ts | 10 +- packages/bot/src/plugins/permissions/deps.ts | 4 +- packages/bot/src/plugins/permissions/mod.ts | 18 +- .../plugins/permissions/src/channels/mod.ts | 6 +- .../src/plugins/permissions/src/guilds/mod.ts | 8 +- .../plugins/permissions/src/messages/mod.ts | 2 +- packages/bot/src/plugins/validations/deps.ts | 2 +- packages/bot/src/plugins/validations/mod.ts | 18 +- .../plugins/validations/src/channels/mod.ts | 2 +- .../src/plugins/validations/src/guilds/mod.ts | 2 +- .../validations/src/interaction/mod.ts | 4 +- packages/bot/src/transformers/activity.ts | 4 +- packages/bot/src/transformers/application.ts | 4 +- .../src/transformers/applicationCommand.ts | 4 +- .../transformers/applicationCommandOption.ts | 3 +- .../applicationCommandOptionChoice.ts | 4 +- .../applicationCommandPermission.ts | 4 +- packages/bot/src/transformers/attachment.ts | 4 +- .../bot/src/transformers/auditLogEntry.ts | 4 +- .../transformers/automodActionExecution.ts | 4 +- packages/bot/src/transformers/automodRule.ts | 4 +- packages/bot/src/transformers/channel.ts | 14 +- packages/bot/src/transformers/component.ts | 4 +- packages/bot/src/transformers/embed.ts | 3 +- packages/bot/src/transformers/emoji.ts | 3 +- packages/bot/src/transformers/gatewayBot.ts | 7 +- packages/bot/src/transformers/guild.ts | 3 +- .../bot/src/transformers/{mod.ts => index.ts} | 6 +- packages/bot/src/transformers/integration.ts | 3 +- packages/bot/src/transformers/interaction.ts | 9 +- packages/bot/src/transformers/invite.ts | 3 +- packages/bot/src/transformers/member.ts | 3 +- packages/bot/src/transformers/message.ts | 3 +- packages/bot/src/transformers/presence.ts | 3 +- .../bot/src/transformers/reverse/activity.ts | 2 +- .../transformers/reverse/allowedMentions.ts | 2 +- .../src/transformers/reverse/application.ts | 2 +- .../reverse/applicationCommand.ts | 2 +- .../reverse/applicationCommandOption.ts | 2 +- .../reverse/applicationCommandOptionChoice.ts | 2 +- .../reverse/applicationCommandPermission.ts | 2 +- .../src/transformers/reverse/attachment.ts | 2 +- .../src/transformers/reverse/auditLogEntry.ts | 2 +- .../bot/src/transformers/reverse/component.ts | 2 +- .../reverse/createApplicationCommand.ts | 2 +- .../bot/src/transformers/reverse/embed.ts | 2 +- .../bot/src/transformers/reverse/emoji.ts | 2 +- .../src/transformers/reverse/gatewayBot.ts | 2 +- .../transformers/reverse/{mod.ts => index.ts} | 3 + .../reverse/interactionResponse.ts | 2 +- .../bot/src/transformers/reverse/member.ts | 2 +- .../bot/src/transformers/reverse/presence.ts | 3 +- packages/bot/src/transformers/reverse/team.ts | 2 +- .../transformers/reverse/widgetSettings.ts | 2 +- packages/bot/src/transformers/role.ts | 3 +- .../bot/src/transformers/scheduledEvent.ts | 3 +- .../bot/src/transformers/stageInstance.ts | 3 +- packages/bot/src/transformers/sticker.ts | 3 +- packages/bot/src/transformers/team.ts | 3 +- packages/bot/src/transformers/template.ts | 3 +- packages/bot/src/transformers/threadMember.ts | 3 +- .../bot/src/transformers/toggles/emoji.ts | 2 +- .../bot/src/transformers/toggles/guild.ts | 3 +- .../transformers/toggles/{mod.ts => index.ts} | 0 .../bot/src/transformers/toggles/member.ts | 2 +- packages/bot/src/transformers/toggles/role.ts | 2 +- packages/bot/src/transformers/toggles/user.ts | 2 +- .../bot/src/transformers/toggles/voice.ts | 2 +- packages/bot/src/transformers/voiceRegion.ts | 3 +- packages/bot/src/transformers/voiceState.ts | 3 +- packages/bot/src/transformers/webhook.ts | 3 +- .../bot/src/transformers/welcomeScreen.ts | 3 +- packages/bot/src/transformers/widget.ts | 3 +- .../bot/src/transformers/widgetSettings.ts | 3 +- packages/bot/src/{discordeno.ts => types.ts} | 0 packages/bot/src/utils/index.ts | 2 + packages/bot/src/utils/routes.ts | 8 +- 324 files changed, 444 insertions(+), 623 deletions(-) rename packages/bot/src/handlers/channels/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/emojis/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/guilds/automod/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/guilds/{mod.ts => index.ts} (83%) rename packages/bot/src/handlers/guilds/scheduledEvents/{mod.ts => index.ts} (100%) create mode 100644 packages/bot/src/handlers/index.ts rename packages/bot/src/handlers/integrations/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/interactions/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/invites/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/members/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/messages/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/misc/{mod.ts => index.ts} (100%) delete mode 100644 packages/bot/src/handlers/mod.ts rename packages/bot/src/handlers/roles/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/voice/{mod.ts => index.ts} (100%) rename packages/bot/src/handlers/webhooks/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/channels/announcements/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/channels/forums/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/channels/{mod.ts => index.ts} (73%) rename packages/bot/src/helpers/channels/stages/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/channels/threads/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/emojis/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/automod/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/events/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/{mod.ts => index.ts} (73%) rename packages/bot/src/helpers/guilds/integrations/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/invites/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/voice/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/guilds/widget/{mod.ts => index.ts} (100%) create mode 100644 packages/bot/src/helpers/index.ts rename packages/bot/src/helpers/interactions/commands/{mod.ts => index.ts} (100%) create mode 100644 packages/bot/src/helpers/interactions/index.ts delete mode 100644 packages/bot/src/helpers/interactions/mod.ts rename packages/bot/src/helpers/interactions/responses/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/members/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/messages/{mod.ts => index.ts} (90%) rename packages/bot/src/helpers/messages/reactions/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/misc/{mod.ts => index.ts} (100%) delete mode 100644 packages/bot/src/helpers/mod.ts rename packages/bot/src/helpers/roles/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/stickers/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/templates/{mod.ts => index.ts} (100%) rename packages/bot/src/helpers/webhooks/{mod.ts => index.ts} (100%) create mode 100644 packages/bot/src/index.ts rename packages/bot/src/transformers/{mod.ts => index.ts} (88%) rename packages/bot/src/transformers/reverse/{mod.ts => index.ts} (81%) rename packages/bot/src/transformers/toggles/{mod.ts => index.ts} (100%) rename packages/bot/src/{discordeno.ts => types.ts} (100%) create mode 100644 packages/bot/src/utils/index.ts diff --git a/packages/bot/package.json b/packages/bot/package.json index 1eb101c84..455789cc9 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -22,6 +22,7 @@ "@discordeno/gateway": "18.0.0-alpha.1", "@discordeno/rest": "18.0.0-alpha.1", "@discordeno/types": "18.0.0-alpha.1", + "@discordeno/utils": "18.0.0-alpha.1", "typescript": "^4.9.3" }, "dependencies": { diff --git a/packages/bot/src/bot.ts b/packages/bot/src/bot.ts index c5c851aa0..cd2dc2a95 100644 --- a/packages/bot/src/bot.ts +++ b/packages/bot/src/bot.ts @@ -1,7 +1,13 @@ -import { createGatewayManager } from './gateway/manager/gatewayManager.js' -import * as handlers from './handlers/mod.js' -import * as helpers from './helpers/mod.js' -import { createRestManager, CreateRestManagerOptions } from './rest/mod.js' +import { calculateShardId, createGatewayManager, CreateShardManager, ShardSocketCloseCodes } from '@discordeno/gateway' +import { createRestManager, CreateRestManagerOptions } from '@discordeno/rest' +import { + AllowedMentions, BigString, DiscordActivity, DiscordAllowedMentions, DiscordApplication, DiscordApplicationCommand, DiscordApplicationCommandOption, DiscordApplicationCommandOptionChoice, DiscordAttachment, DiscordAuditLogEntry, DiscordAutoModerationActionExecution, DiscordAutoModerationRule, DiscordChannel, DiscordComponent, DiscordCreateApplicationCommand, DiscordEmbed, DiscordEmoji, DiscordGatewayPayload, DiscordGetGatewayBot, DiscordGuild, DiscordGuildApplicationCommandPermissions, DiscordGuildWidget, DiscordGuildWidgetSettings, DiscordIntegrationCreateUpdate, DiscordInteraction, DiscordInteractionDataOption, DiscordInteractionResponse, DiscordInviteCreate, DiscordMember, DiscordMessage, DiscordPresenceUpdate, DiscordReady, DiscordRole, DiscordScheduledEvent, DiscordStageInstance, DiscordSticker, DiscordStickerPack, DiscordTeam, DiscordTemplate, DiscordThreadMember, DiscordUser, DiscordVoiceRegion, DiscordVoiceState, DiscordWebhook, DiscordWelcomeScreen, Errors, GatewayDispatchEventNames, GatewayIntents, GetGatewayBot +} from '@discordeno/types' +import { + baseEndpoints, bigintToSnowflake, calculateBits, calculatePermissions, CHANNEL_MENTION_REGEX, Collection, CONTEXT_MENU_COMMANDS_NAME_REGEX, DISCORDENO_VERSION, DISCORD_SNOWFLAKE_REGEX, getBotIdFromToken, iconBigintToHash, iconHashToBigInt, removeTokenPrefix, SLASH_COMMANDS_NAME_REGEX, snowflakeToBigint, urlToBase64, USER_AGENT, validateLength +} from '@discordeno/utils' +import * as handlers from './handlers/index.js' +import * as helpers from './helpers/index.js' import { Activity, transformActivity } from './transformers/activity.js' import { Application, transformApplication } from './transformers/application.js' import { ApplicationCommand, transformApplicationCommand } from './transformers/applicationCommand.js' @@ -12,140 +18,19 @@ import { AuditLogEntry, transformAuditLogEntry } from './transformers/auditLogEn import { Component, transformComponent } from './transformers/component.js' import { Embed, transformEmbed } from './transformers/embed.js' import { Emoji, transformEmoji } from './transformers/emoji.js' -import { GetGatewayBot, transformGatewayBot } from './transformers/gatewayBot.js' -import { Integration, transformIntegration } from './transformers/integration.js' +import { transformGatewayBot } from './transformers/gatewayBot.js' import { - Interaction, - InteractionDataOption, - transformInteraction, - transformInteractionDataOption -} from './transformers/interaction.js' -import { Invite, transformInvite } from './transformers/invite.js' + ApplicationCommandOptionChoice, AutoModerationActionExecution, AutoModerationRule, Channel, Guild, GuildWidget, GuildWidgetSettings, Integration, Interaction, InteractionDataOption, Invite, Member, Message, PresenceUpdate, Role, ScheduledEvent, StageInstance, Sticker, StickerPack, Team, Template, ThreadMember, transformActivityToDiscordActivity, transformAllowedMentionsToDiscordAllowedMentions, transformApplicationCommandOptionChoice, transformApplicationCommandOptionChoiceToDiscordApplicationCommandOptionChoice, transformApplicationCommandOptionToDiscordApplicationCommandOption, transformApplicationCommandToDiscordApplicationCommand, transformApplicationToDiscordApplication, transformAttachmentToDiscordAttachment, transformAutoModerationActionExecution, transformAutoModerationRule, transformChannel, transformComponentToDiscordComponent, transformCreateApplicationCommandToDiscordCreateApplicationCommand, transformEmbedToDiscordEmbed, transformGuild, transformIntegration, transformInteraction, transformInteractionDataOption, transformInteractionResponseToDiscordInteractionResponse, transformInvite, transformMember, transformMemberToDiscordMember, transformMessage, transformPresence, transformRole, transformScheduledEvent, transformStageInstance, transformSticker, transformStickerPack, transformTeam, transformTeamToDiscordTeam, transformTemplate, transformThreadMember, transformUser, transformUserToDiscordUser, transformVoiceRegion, transformVoiceState, transformWebhook, transformWelcomeScreen, transformWidget, transformWidgetSettings, User, VoiceRegions, VoiceState, Webhook, WelcomeScreen +} from './transformers/index.js' import { - Channel, - Guild, - Member, - Message, - Role, - ScheduledEvent, - Template, - transformApplicationCommandToDiscordApplicationCommand, - transformAttachmentToDiscordAttachment, - transformChannel, - transformGuild, - transformMember, - transformMessage, - transformRole, - transformTemplate, - transformUser, - transformVoiceState, - User, - VoiceState -} from './transformers/mod.js' -import { PresenceUpdate, transformPresence } from './transformers/presence.js' -import { transformScheduledEvent } from './transformers/scheduledEvent.js' -import { StageInstance, transformStageInstance } from './transformers/stageInstance.js' -import { Sticker, StickerPack, transformSticker, transformStickerPack } from './transformers/sticker.js' -import { transformTeam, Team } from './transformers/team.js' -import { ThreadMember, transformThreadMember } from './transformers/threadMember.js' -import { transformVoiceRegion, VoiceRegions } from './transformers/voiceRegion.js' -import { transformWebhook, Webhook } from './transformers/webhook.js' -import { transformWelcomeScreen, WelcomeScreen } from './transformers/welcomeScreen.js' -import { transformWidget, GuildWidget } from './transformers/widget.js' -import { transformWidgetSettings, GuildWidgetSettings } from './transformers/widgetSettings.js' -import { - DiscordAllowedMentions, - DiscordApplicationCommandOptionChoice, - DiscordAutoModerationActionExecution, - DiscordAutoModerationRule, - DiscordCreateApplicationCommand, - DiscordEmoji, - DiscordGatewayPayload, - DiscordInteractionDataOption, - DiscordInteractionResponse, - DiscordReady, - DiscordStickerPack, - DiscordTemplate - , - DiscordActivity, - DiscordApplication, - DiscordApplicationCommand, - DiscordApplicationCommandOption, - DiscordAttachment, - DiscordAuditLogEntry, - DiscordChannel, - DiscordComponent, - DiscordEmbed, - DiscordGetGatewayBot, - DiscordGuild, - DiscordGuildApplicationCommandPermissions, - DiscordGuildWidget, - DiscordGuildWidgetSettings, - DiscordIntegrationCreateUpdate, - DiscordInteraction, - DiscordInviteCreate, - DiscordMember, - DiscordMessage, - DiscordPresenceUpdate, - DiscordRole, - DiscordScheduledEvent, - DiscordStageInstance, - DiscordSticker, - DiscordTeam, - DiscordThreadMember, - DiscordUser, - DiscordVoiceRegion, - DiscordVoiceState, - DiscordWebhook, - DiscordWelcomeScreen -} from './types/discord.js' -import { BigString, Errors, GatewayDispatchEventNames, GatewayIntents } from './types/shared.js' -import { bigintToSnowflake, snowflakeToBigint } from './util/bigint.js' -import { calculateShardId } from './util/calculateShardId.js' -import { Collection } from './util/collection.js' -import { - baseEndpoints, - CHANNEL_MENTION_REGEX, - CONTEXT_MENU_COMMANDS_NAME_REGEX, DISCORDENO_VERSION, DISCORD_SNOWFLAKE_REGEX, SLASH_COMMANDS_NAME_REGEX, - USER_AGENT -} from './util/constants.js' -import { iconBigintToHash, iconHashToBigInt } from './util/hash.js' -import { calculateBits, calculatePermissions } from './util/permissions.js' -import { urlToBase64 } from './util/urlToBase64.js' -import { delay, formatImageURL } from './util/utils.js' -import { validateLength } from './util/validateLength.js' - -import { CreateShardManager } from './gateway/manager/shardManager.js' -import { - AllowedMentions, CreateApplicationCommand, - InteractionResponse, - ShardSocketCloseCodes, - transformApplicationCommandOptionChoiceToDiscordApplicationCommandOptionChoice, - transformApplicationCommandOptionToDiscordApplicationCommandOption -} from './mod.js' -import { - ApplicationCommandOptionChoice, - transformApplicationCommandOptionChoice -} from './transformers/applicationCommandOptionChoice.js' -import { - AutoModerationActionExecution, - transformAutoModerationActionExecution -} from './transformers/automodActionExecution.js' -import { AutoModerationRule, transformAutoModerationRule } from './transformers/automodRule.js' -import { transformActivityToDiscordActivity } from './transformers/reverse/activity.js' -import { transformAllowedMentionsToDiscordAllowedMentions } from './transformers/reverse/allowedMentions.js' -import { transformApplicationToDiscordApplication } from './transformers/reverse/application.js' -import { transformComponentToDiscordComponent } from './transformers/reverse/component.js' -import { transformCreateApplicationCommandToDiscordCreateApplicationCommand } from './transformers/reverse/createApplicationCommand.js' -import { transformEmbedToDiscordEmbed } from './transformers/reverse/embed.js' -import { transformInteractionResponseToDiscordInteractionResponse } from './transformers/reverse/interactionResponse.js' -import { transformMemberToDiscordMember, transformUserToDiscordUser } from './transformers/reverse/member.js' -import { transformTeamToDiscordTeam } from './transformers/reverse/team.js' -import { routes } from './util/routes.js' -import { getBotIdFromToken, removeTokenPrefix } from './util/token.js' + InteractionResponse +} from './types.js' +import { routes } from './utils/routes.js' +import { delay, formatImageURL } from './utils/utils.js' export function createBot (options: CreateBotOptions): Bot { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions const bot = { id: options.botId ?? getBotIdFromToken(options.token), applicationId: options.applicationId || options.botId || getBotIdFromToken(options.token), @@ -267,7 +152,7 @@ export function createEventHandlers ( } } -export async function startBot (bot: Bot) { +export async function startBot (bot: Bot): Promise { if (Object.keys(bot.botGatewayData ?? {}).length === 0) { bot.gateway.gatewayBot = await bot.helpers.getGatewayBot() bot.gateway.lastShardId = bot.gateway.gatewayBot.shards - 1 @@ -277,6 +162,7 @@ export async function startBot (bot: Bot) { bot.gateway.spawnShards() } +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function createUtils (options: Partial) { return { snowflakeToBigint, @@ -307,7 +193,7 @@ export interface HelperUtils { calculatePermissions: typeof calculatePermissions } -export async function stopBot (bot: Bot) { +export async function stopBot (bot: Bot): Promise { await bot.gateway.stop(ShardSocketCloseCodes.Shutdown, 'User requested bot stop') return bot diff --git a/packages/bot/src/handlers/channels/CHANNEL_CREATE.ts b/packages/bot/src/handlers/channels/CHANNEL_CREATE.ts index 150ba3115..6eb6a7127 100644 --- a/packages/bot/src/handlers/channels/CHANNEL_CREATE.ts +++ b/packages/bot/src/handlers/channels/CHANNEL_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleChannelCreate (bot: Bot, payload: DiscordGatewayPayload) { const channel = bot.transformers.channel(bot, { channel: payload.d as DiscordChannel }) diff --git a/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts b/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts index 7925cd423..cc3351de6 100644 --- a/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts +++ b/packages/bot/src/handlers/channels/CHANNEL_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleChannelDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannel diff --git a/packages/bot/src/handlers/channels/CHANNEL_PINS_UPDATE.ts b/packages/bot/src/handlers/channels/CHANNEL_PINS_UPDATE.ts index 971eae0ce..076ed886e 100644 --- a/packages/bot/src/handlers/channels/CHANNEL_PINS_UPDATE.ts +++ b/packages/bot/src/handlers/channels/CHANNEL_PINS_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordChannelPinsUpdate, DiscordGatewayPayload } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordChannelPinsUpdate, DiscordGatewayPayload } from '../../types/discord.js' export async function handleChannelPinsUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannelPinsUpdate diff --git a/packages/bot/src/handlers/channels/CHANNEL_UPDATE.ts b/packages/bot/src/handlers/channels/CHANNEL_UPDATE.ts index 81b983c44..ce5b09935 100644 --- a/packages/bot/src/handlers/channels/CHANNEL_UPDATE.ts +++ b/packages/bot/src/handlers/channels/CHANNEL_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleChannelUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannel diff --git a/packages/bot/src/handlers/channels/STAGE_INSTANCE_CREATE.ts b/packages/bot/src/handlers/channels/STAGE_INSTANCE_CREATE.ts index b80c28cc3..a5af72e1e 100644 --- a/packages/bot/src/handlers/channels/STAGE_INSTANCE_CREATE.ts +++ b/packages/bot/src/handlers/channels/STAGE_INSTANCE_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordStageInstance } from '../../types/discord.js' export function handleStageInstanceCreate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordStageInstance diff --git a/packages/bot/src/handlers/channels/STAGE_INSTANCE_DELETE.ts b/packages/bot/src/handlers/channels/STAGE_INSTANCE_DELETE.ts index d41a7facc..14b288039 100644 --- a/packages/bot/src/handlers/channels/STAGE_INSTANCE_DELETE.ts +++ b/packages/bot/src/handlers/channels/STAGE_INSTANCE_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordStageInstance } from '../../types/discord.js' export function handleStageInstanceDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordStageInstance diff --git a/packages/bot/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts b/packages/bot/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts index fd4a51823..2a53859db 100644 --- a/packages/bot/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts +++ b/packages/bot/src/handlers/channels/STAGE_INSTANCE_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordStageInstance } from '../../types/discord.js' export function handleStageInstanceUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordStageInstance diff --git a/packages/bot/src/handlers/channels/THREAD_CREATE.ts b/packages/bot/src/handlers/channels/THREAD_CREATE.ts index f003eaf7e..b8360fb84 100644 --- a/packages/bot/src/handlers/channels/THREAD_CREATE.ts +++ b/packages/bot/src/handlers/channels/THREAD_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleThreadCreate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannel diff --git a/packages/bot/src/handlers/channels/THREAD_DELETE.ts b/packages/bot/src/handlers/channels/THREAD_DELETE.ts index 3f7e37c5b..a0d36081b 100644 --- a/packages/bot/src/handlers/channels/THREAD_DELETE.ts +++ b/packages/bot/src/handlers/channels/THREAD_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleThreadDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannel diff --git a/packages/bot/src/handlers/channels/THREAD_LIST_SYNC.ts b/packages/bot/src/handlers/channels/THREAD_LIST_SYNC.ts index edf6742fe..bb70d9cb6 100644 --- a/packages/bot/src/handlers/channels/THREAD_LIST_SYNC.ts +++ b/packages/bot/src/handlers/channels/THREAD_LIST_SYNC.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordThreadListSync } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordThreadListSync } from '../../types/discord.js' export async function handleThreadListSync (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordThreadListSync diff --git a/packages/bot/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts b/packages/bot/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts index d80a402aa..34bf86de5 100644 --- a/packages/bot/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts +++ b/packages/bot/src/handlers/channels/THREAD_MEMBERS_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordThreadMembersUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordThreadMembersUpdate } from '../../types/discord.js' export async function handleThreadMembersUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordThreadMembersUpdate diff --git a/packages/bot/src/handlers/channels/THREAD_MEMBER_UPDATE.ts b/packages/bot/src/handlers/channels/THREAD_MEMBER_UPDATE.ts index 57d619a81..d5c106d46 100644 --- a/packages/bot/src/handlers/channels/THREAD_MEMBER_UPDATE.ts +++ b/packages/bot/src/handlers/channels/THREAD_MEMBER_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordThreadMemberUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordThreadMemberUpdate } from '../../types/discord.js' export async function handleThreadMemberUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordThreadMemberUpdate diff --git a/packages/bot/src/handlers/channels/THREAD_UPDATE.ts b/packages/bot/src/handlers/channels/THREAD_UPDATE.ts index a06917b91..ab8850280 100644 --- a/packages/bot/src/handlers/channels/THREAD_UPDATE.ts +++ b/packages/bot/src/handlers/channels/THREAD_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordChannel, DiscordGatewayPayload } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordChannel, DiscordGatewayPayload } from '../../types/discord.js' export async function handleThreadUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordChannel diff --git a/packages/bot/src/handlers/channels/mod.ts b/packages/bot/src/handlers/channels/index.ts similarity index 100% rename from packages/bot/src/handlers/channels/mod.ts rename to packages/bot/src/handlers/channels/index.ts diff --git a/packages/bot/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts b/packages/bot/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts index c4ebe4463..c7b73feea 100644 --- a/packages/bot/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts +++ b/packages/bot/src/handlers/emojis/GUILD_EMOJIS_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildEmojisUpdate } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildEmojisUpdate } from '../../types/discord.js' import { Collection } from '../../util/collection.js' export async function handleGuildEmojisUpdate (bot: Bot, data: DiscordGatewayPayload) { diff --git a/packages/bot/src/handlers/emojis/mod.ts b/packages/bot/src/handlers/emojis/index.ts similarity index 100% rename from packages/bot/src/handlers/emojis/mod.ts rename to packages/bot/src/handlers/emojis/index.ts diff --git a/packages/bot/src/handlers/guilds/GUILD_BAN_ADD.ts b/packages/bot/src/handlers/guilds/GUILD_BAN_ADD.ts index fa0b3fb80..818a488c3 100644 --- a/packages/bot/src/handlers/guilds/GUILD_BAN_ADD.ts +++ b/packages/bot/src/handlers/guilds/GUILD_BAN_ADD.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildBanAddRemove } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildBanAddRemove } from '../../types/discord.js' export async function handleGuildBanAdd (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildBanAddRemove diff --git a/packages/bot/src/handlers/guilds/GUILD_BAN_REMOVE.ts b/packages/bot/src/handlers/guilds/GUILD_BAN_REMOVE.ts index af0b8ce73..e2a709b80 100644 --- a/packages/bot/src/handlers/guilds/GUILD_BAN_REMOVE.ts +++ b/packages/bot/src/handlers/guilds/GUILD_BAN_REMOVE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildBanAddRemove } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildBanAddRemove } from '../../types/discord.js' export async function handleGuildBanRemove (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildBanAddRemove diff --git a/packages/bot/src/handlers/guilds/GUILD_CREATE.ts b/packages/bot/src/handlers/guilds/GUILD_CREATE.ts index b0cbcd988..df9c489a1 100644 --- a/packages/bot/src/handlers/guilds/GUILD_CREATE.ts +++ b/packages/bot/src/handlers/guilds/GUILD_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuild } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuild } from '../../types/discord.js' export function handleGuildCreate (bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as DiscordGuild diff --git a/packages/bot/src/handlers/guilds/GUILD_DELETE.ts b/packages/bot/src/handlers/guilds/GUILD_DELETE.ts index 3230854a3..22e1bfee3 100644 --- a/packages/bot/src/handlers/guilds/GUILD_DELETE.ts +++ b/packages/bot/src/handlers/guilds/GUILD_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordUnavailableGuild } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordUnavailableGuild } from '../../types/discord.js' export async function handleGuildDelete (bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as DiscordUnavailableGuild diff --git a/packages/bot/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts b/packages/bot/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts index aa5a40129..4d14b8ac5 100644 --- a/packages/bot/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts +++ b/packages/bot/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildIntegrationsUpdate } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildIntegrationsUpdate } from '../../types/discord.js' export async function handleGuildIntegrationsUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildIntegrationsUpdate diff --git a/packages/bot/src/handlers/guilds/GUILD_UPDATE.ts b/packages/bot/src/handlers/guilds/GUILD_UPDATE.ts index fc43e6fb1..3c85bba75 100644 --- a/packages/bot/src/handlers/guilds/GUILD_UPDATE.ts +++ b/packages/bot/src/handlers/guilds/GUILD_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuild } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuild } from '../../types/discord.js' export function handleGuildUpdate (bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as DiscordGuild diff --git a/packages/bot/src/handlers/guilds/automod/mod.ts b/packages/bot/src/handlers/guilds/automod/index.ts similarity index 100% rename from packages/bot/src/handlers/guilds/automod/mod.ts rename to packages/bot/src/handlers/guilds/automod/index.ts diff --git a/packages/bot/src/handlers/guilds/mod.ts b/packages/bot/src/handlers/guilds/index.ts similarity index 83% rename from packages/bot/src/handlers/guilds/mod.ts rename to packages/bot/src/handlers/guilds/index.ts index f2be955be..1f278c2c8 100644 --- a/packages/bot/src/handlers/guilds/mod.ts +++ b/packages/bot/src/handlers/guilds/index.ts @@ -4,4 +4,4 @@ export * from './GUILD_CREATE.js' export * from './GUILD_DELETE.js' export * from './GUILD_INTEGRATIONS_UPDATE.js' export * from './GUILD_UPDATE.js' -export * from './scheduledEvents/mod.js' +export * from './scheduledEvents/index.js' diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_CREATE.ts b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_CREATE.ts index 3f92ee107..e3adcbebf 100644 --- a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_CREATE.ts +++ b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordScheduledEvent } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordGatewayPayload, DiscordScheduledEvent } from '../../../types/discord.js' export function handleGuildScheduledEventCreate (bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as DiscordScheduledEvent diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_DELETE.ts b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_DELETE.ts index 64d1b55c3..babe5aefb 100644 --- a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_DELETE.ts +++ b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordScheduledEvent } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordGatewayPayload, DiscordScheduledEvent } from '../../../types/discord.js' export function handleGuildScheduledEventDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordScheduledEvent diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_UPDATE.ts b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_UPDATE.ts index d14593eda..e432a42e2 100644 --- a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_UPDATE.ts +++ b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordScheduledEvent } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordGatewayPayload, DiscordScheduledEvent } from '../../../types/discord.js' export function handleGuildScheduledEventUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordScheduledEvent diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_ADD.ts b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_ADD.ts index 77fcc72f2..4cdcc5d4e 100644 --- a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_ADD.ts +++ b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_ADD.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordScheduledEventUserAdd } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordGatewayPayload, DiscordScheduledEventUserAdd } from '../../../types/discord.js' export function handleGuildScheduledEventUserAdd (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordScheduledEventUserAdd diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_REMOVE.ts b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_REMOVE.ts index 2c86fbff7..cd2fe072e 100644 --- a/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_REMOVE.ts +++ b/packages/bot/src/handlers/guilds/scheduledEvents/GUILD_SCHEDULED_EVENT_USER_REMOVE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordScheduledEventUserRemove } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordGatewayPayload, DiscordScheduledEventUserRemove } from '../../../types/discord.js' export function handleGuildScheduledEventUserRemove (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordScheduledEventUserRemove diff --git a/packages/bot/src/handlers/guilds/scheduledEvents/mod.ts b/packages/bot/src/handlers/guilds/scheduledEvents/index.ts similarity index 100% rename from packages/bot/src/handlers/guilds/scheduledEvents/mod.ts rename to packages/bot/src/handlers/guilds/scheduledEvents/index.ts diff --git a/packages/bot/src/handlers/index.ts b/packages/bot/src/handlers/index.ts new file mode 100644 index 000000000..243289d18 --- /dev/null +++ b/packages/bot/src/handlers/index.ts @@ -0,0 +1,12 @@ +export * from './channels/index.js' +export * from './emojis/index.js' +export * from './guilds/index.js' +export * from './integrations/index.js' +export * from './interactions/index.js' +export * from './invites/index.js' +export * from './members/index.js' +export * from './messages/index.js' +export * from './misc/index.js' +export * from './roles/index.js' +export * from './voice/index.js' +export * from './webhooks/index.js' diff --git a/packages/bot/src/handlers/integrations/INTEGRATION_CREATE.ts b/packages/bot/src/handlers/integrations/INTEGRATION_CREATE.ts index 73eb72898..c30b7551d 100644 --- a/packages/bot/src/handlers/integrations/INTEGRATION_CREATE.ts +++ b/packages/bot/src/handlers/integrations/INTEGRATION_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordIntegrationCreateUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordIntegrationCreateUpdate } from '../../types/discord.js' export function handleIntegrationCreate (bot: Bot, data: DiscordGatewayPayload) { bot.events.integrationCreate( diff --git a/packages/bot/src/handlers/integrations/INTEGRATION_DELETE.ts b/packages/bot/src/handlers/integrations/INTEGRATION_DELETE.ts index 8562c4f3c..3706b30f5 100644 --- a/packages/bot/src/handlers/integrations/INTEGRATION_DELETE.ts +++ b/packages/bot/src/handlers/integrations/INTEGRATION_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordIntegrationDelete } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordIntegrationDelete } from '../../types/discord.js' export function handleIntegrationDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordIntegrationDelete diff --git a/packages/bot/src/handlers/integrations/INTEGRATION_UPDATE.ts b/packages/bot/src/handlers/integrations/INTEGRATION_UPDATE.ts index 33bf4a8c2..aff94feec 100644 --- a/packages/bot/src/handlers/integrations/INTEGRATION_UPDATE.ts +++ b/packages/bot/src/handlers/integrations/INTEGRATION_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordIntegrationCreateUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordIntegrationCreateUpdate } from '../../types/discord.js' export function handleIntegrationUpdate (bot: Bot, data: DiscordGatewayPayload) { bot.events.integrationUpdate( diff --git a/packages/bot/src/handlers/integrations/mod.ts b/packages/bot/src/handlers/integrations/index.ts similarity index 100% rename from packages/bot/src/handlers/integrations/mod.ts rename to packages/bot/src/handlers/integrations/index.ts diff --git a/packages/bot/src/handlers/interactions/INTERACTION_CREATE.ts b/packages/bot/src/handlers/interactions/INTERACTION_CREATE.ts index c7c210524..fab235c79 100644 --- a/packages/bot/src/handlers/interactions/INTERACTION_CREATE.ts +++ b/packages/bot/src/handlers/interactions/INTERACTION_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordInteraction } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordInteraction } from '../../types/discord.js' export async function handleInteractionCreate (bot: Bot, data: DiscordGatewayPayload) { bot.cache.unrepliedInteractions.add(bot.transformers.snowflake((data.d as DiscordInteraction).id)) diff --git a/packages/bot/src/handlers/interactions/mod.ts b/packages/bot/src/handlers/interactions/index.ts similarity index 100% rename from packages/bot/src/handlers/interactions/mod.ts rename to packages/bot/src/handlers/interactions/index.ts diff --git a/packages/bot/src/handlers/invites/INVITE_CREATE.ts b/packages/bot/src/handlers/invites/INVITE_CREATE.ts index 4cdad7667..c9d961775 100644 --- a/packages/bot/src/handlers/invites/INVITE_CREATE.ts +++ b/packages/bot/src/handlers/invites/INVITE_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordInviteCreate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordInviteCreate } from '../../types/discord.js' export function handleInviteCreate (bot: Bot, data: DiscordGatewayPayload) { bot.events.inviteCreate(bot, bot.transformers.invite(bot, data.d as DiscordInviteCreate)) diff --git a/packages/bot/src/handlers/invites/INVITE_DELETE.ts b/packages/bot/src/handlers/invites/INVITE_DELETE.ts index 13af6bac5..1c8cdd2b9 100644 --- a/packages/bot/src/handlers/invites/INVITE_DELETE.ts +++ b/packages/bot/src/handlers/invites/INVITE_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordInviteDelete } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordInviteDelete } from '../../types/discord.js' export function handleInviteDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordInviteDelete diff --git a/packages/bot/src/handlers/invites/mod.ts b/packages/bot/src/handlers/invites/index.ts similarity index 100% rename from packages/bot/src/handlers/invites/mod.ts rename to packages/bot/src/handlers/invites/index.ts diff --git a/packages/bot/src/handlers/members/GUILD_MEMBERS_CHUNK.ts b/packages/bot/src/handlers/members/GUILD_MEMBERS_CHUNK.ts index 59fb7d124..ed4e12506 100644 --- a/packages/bot/src/handlers/members/GUILD_MEMBERS_CHUNK.ts +++ b/packages/bot/src/handlers/members/GUILD_MEMBERS_CHUNK.ts @@ -1,6 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildMembersChunk, PresenceStatus } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildMembersChunk } from '../../types/discord.js' -import { PresenceStatus } from '../../types/shared.js' export async function handleGuildMembersChunk (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildMembersChunk diff --git a/packages/bot/src/handlers/members/GUILD_MEMBER_ADD.ts b/packages/bot/src/handlers/members/GUILD_MEMBER_ADD.ts index 61a5dee17..6e601ddd9 100644 --- a/packages/bot/src/handlers/members/GUILD_MEMBER_ADD.ts +++ b/packages/bot/src/handlers/members/GUILD_MEMBER_ADD.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildMemberAdd } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildMemberAdd } from '../../types/discord.js' export async function handleGuildMemberAdd (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildMemberAdd diff --git a/packages/bot/src/handlers/members/GUILD_MEMBER_REMOVE.ts b/packages/bot/src/handlers/members/GUILD_MEMBER_REMOVE.ts index e61e9fddb..15c6cbcd5 100644 --- a/packages/bot/src/handlers/members/GUILD_MEMBER_REMOVE.ts +++ b/packages/bot/src/handlers/members/GUILD_MEMBER_REMOVE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildMemberRemove } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildMemberRemove } from '../../types/discord.js' export async function handleGuildMemberRemove (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildMemberRemove diff --git a/packages/bot/src/handlers/members/GUILD_MEMBER_UPDATE.ts b/packages/bot/src/handlers/members/GUILD_MEMBER_UPDATE.ts index 97c49c435..25ce6aba8 100644 --- a/packages/bot/src/handlers/members/GUILD_MEMBER_UPDATE.ts +++ b/packages/bot/src/handlers/members/GUILD_MEMBER_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildMemberUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildMemberUpdate } from '../../types/discord.js' export async function handleGuildMemberUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildMemberUpdate diff --git a/packages/bot/src/handlers/members/mod.ts b/packages/bot/src/handlers/members/index.ts similarity index 100% rename from packages/bot/src/handlers/members/mod.ts rename to packages/bot/src/handlers/members/index.ts diff --git a/packages/bot/src/handlers/messages/MESSAGE_CREATE.ts b/packages/bot/src/handlers/messages/MESSAGE_CREATE.ts index 4077c548d..2dd45582f 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_CREATE.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessage } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessage } from '../../types/discord.js' export async function handleMessageCreate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessage diff --git a/packages/bot/src/handlers/messages/MESSAGE_DELETE.ts b/packages/bot/src/handlers/messages/MESSAGE_DELETE.ts index cdefb8e0f..6ac302149 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_DELETE.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageDelete } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageDelete } from '../../types/discord.js' export async function handleMessageDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageDelete diff --git a/packages/bot/src/handlers/messages/MESSAGE_DELETE_BULK.ts b/packages/bot/src/handlers/messages/MESSAGE_DELETE_BULK.ts index 4adb34c4c..03c9c1dbd 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_DELETE_BULK.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_DELETE_BULK.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageDeleteBulk } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageDeleteBulk } from '../../types/discord.js' export async function handleMessageDeleteBulk (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageDeleteBulk diff --git a/packages/bot/src/handlers/messages/MESSAGE_REACTION_ADD.ts b/packages/bot/src/handlers/messages/MESSAGE_REACTION_ADD.ts index 9517c7ca4..f95f716fd 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_REACTION_ADD.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_REACTION_ADD.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageReactionAdd } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageReactionAdd } from '../../types/discord.js' export async function handleMessageReactionAdd (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageReactionAdd diff --git a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts index 182c08187..c1a97a542 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageReactionRemove } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageReactionRemove } from '../../types/discord.js' export async function handleMessageReactionRemove (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageReactionRemove diff --git a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts index a8b069a33..db66b30c3 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_ALL.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageReactionRemoveAll } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageReactionRemoveAll } from '../../types/discord.js' export async function handleMessageReactionRemoveAll (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageReactionRemoveAll diff --git a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts index 29452ce2a..fa41e8e6c 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_REACTION_REMOVE_EMOJI.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessageReactionRemoveEmoji } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessageReactionRemoveEmoji } from '../../types/discord.js' export async function handleMessageReactionRemoveEmoji (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessageReactionRemoveEmoji diff --git a/packages/bot/src/handlers/messages/MESSAGE_UPDATE.ts b/packages/bot/src/handlers/messages/MESSAGE_UPDATE.ts index 65ed0dcbb..cf41159d5 100644 --- a/packages/bot/src/handlers/messages/MESSAGE_UPDATE.ts +++ b/packages/bot/src/handlers/messages/MESSAGE_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordMessage } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordMessage } from '../../types/discord.js' export async function handleMessageUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordMessage diff --git a/packages/bot/src/handlers/messages/mod.ts b/packages/bot/src/handlers/messages/index.ts similarity index 100% rename from packages/bot/src/handlers/messages/mod.ts rename to packages/bot/src/handlers/messages/index.ts diff --git a/packages/bot/src/handlers/misc/PRESENCE_UPDATE.ts b/packages/bot/src/handlers/misc/PRESENCE_UPDATE.ts index eb017bf8c..9ea307ef8 100644 --- a/packages/bot/src/handlers/misc/PRESENCE_UPDATE.ts +++ b/packages/bot/src/handlers/misc/PRESENCE_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordPresenceUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordPresenceUpdate } from '../../types/discord.js' export async function handlePresenceUpdate (bot: Bot, data: DiscordGatewayPayload) { bot.events.presenceUpdate(bot, bot.transformers.presence(bot, data.d as DiscordPresenceUpdate)) diff --git a/packages/bot/src/handlers/misc/READY.ts b/packages/bot/src/handlers/misc/READY.ts index 5e7457c94..61fd85fdd 100644 --- a/packages/bot/src/handlers/misc/READY.ts +++ b/packages/bot/src/handlers/misc/READY.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordReady } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordReady } from '../../types/discord.js' export function handleReady (bot: Bot, data: DiscordGatewayPayload, shardId: number) { const payload = data.d as DiscordReady diff --git a/packages/bot/src/handlers/misc/TYPING_START.ts b/packages/bot/src/handlers/misc/TYPING_START.ts index 98a31dc11..5c0ddbb95 100644 --- a/packages/bot/src/handlers/misc/TYPING_START.ts +++ b/packages/bot/src/handlers/misc/TYPING_START.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordTypingStart } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordTypingStart } from '../../types/discord.js' export function handleTypingStart (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordTypingStart diff --git a/packages/bot/src/handlers/misc/USER_UPDATE.ts b/packages/bot/src/handlers/misc/USER_UPDATE.ts index 8eca326e8..e95b81584 100644 --- a/packages/bot/src/handlers/misc/USER_UPDATE.ts +++ b/packages/bot/src/handlers/misc/USER_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordUser } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordUser } from '../../types/discord.js' export async function handleUserUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordUser diff --git a/packages/bot/src/handlers/misc/mod.ts b/packages/bot/src/handlers/misc/index.ts similarity index 100% rename from packages/bot/src/handlers/misc/mod.ts rename to packages/bot/src/handlers/misc/index.ts diff --git a/packages/bot/src/handlers/mod.ts b/packages/bot/src/handlers/mod.ts deleted file mode 100644 index faa55da40..000000000 --- a/packages/bot/src/handlers/mod.ts +++ /dev/null @@ -1,12 +0,0 @@ -export * from './channels/mod.js' -export * from './emojis/mod.js' -export * from './guilds/mod.js' -export * from './integrations/mod.js' -export * from './interactions/mod.js' -export * from './invites/mod.js' -export * from './members/mod.js' -export * from './messages/mod.js' -export * from './misc/mod.js' -export * from './roles/mod.js' -export * from './voice/mod.js' -export * from './webhooks/mod.js' diff --git a/packages/bot/src/handlers/roles/GUILD_ROLE_CREATE.ts b/packages/bot/src/handlers/roles/GUILD_ROLE_CREATE.ts index 0c03a20be..af6edf3b4 100644 --- a/packages/bot/src/handlers/roles/GUILD_ROLE_CREATE.ts +++ b/packages/bot/src/handlers/roles/GUILD_ROLE_CREATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildRoleCreate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildRoleCreate } from '../../types/discord.js' export async function handleGuildRoleCreate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildRoleCreate diff --git a/packages/bot/src/handlers/roles/GUILD_ROLE_DELETE.ts b/packages/bot/src/handlers/roles/GUILD_ROLE_DELETE.ts index a750e14ea..6cc8ca834 100644 --- a/packages/bot/src/handlers/roles/GUILD_ROLE_DELETE.ts +++ b/packages/bot/src/handlers/roles/GUILD_ROLE_DELETE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildRoleDelete } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildRoleDelete } from '../../types/discord.js' export async function handleGuildRoleDelete (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildRoleDelete diff --git a/packages/bot/src/handlers/roles/GUILD_ROLE_UPDATE.ts b/packages/bot/src/handlers/roles/GUILD_ROLE_UPDATE.ts index 1d8b9e96a..6783f7512 100644 --- a/packages/bot/src/handlers/roles/GUILD_ROLE_UPDATE.ts +++ b/packages/bot/src/handlers/roles/GUILD_ROLE_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordGuildRoleUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordGuildRoleUpdate } from '../../types/discord.js' export async function handleGuildRoleUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordGuildRoleUpdate diff --git a/packages/bot/src/handlers/roles/mod.ts b/packages/bot/src/handlers/roles/index.ts similarity index 100% rename from packages/bot/src/handlers/roles/mod.ts rename to packages/bot/src/handlers/roles/index.ts diff --git a/packages/bot/src/handlers/voice/VOICE_SERVER_UPDATE.ts b/packages/bot/src/handlers/voice/VOICE_SERVER_UPDATE.ts index e220e9b02..812e717b2 100644 --- a/packages/bot/src/handlers/voice/VOICE_SERVER_UPDATE.ts +++ b/packages/bot/src/handlers/voice/VOICE_SERVER_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordVoiceServerUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordVoiceServerUpdate } from '../../types/discord.js' export async function handleVoiceServerUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordVoiceServerUpdate diff --git a/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts b/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts index d6e90ed82..06da87b13 100644 --- a/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts +++ b/packages/bot/src/handlers/voice/VOICE_STATE_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordVoiceState } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordVoiceState } from '../../types/discord.js' export async function handleVoiceStateUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordVoiceState diff --git a/packages/bot/src/handlers/voice/mod.ts b/packages/bot/src/handlers/voice/index.ts similarity index 100% rename from packages/bot/src/handlers/voice/mod.ts rename to packages/bot/src/handlers/voice/index.ts diff --git a/packages/bot/src/handlers/webhooks/WEBHOOKS_UPDATE.ts b/packages/bot/src/handlers/webhooks/WEBHOOKS_UPDATE.ts index f89a1ec03..ed85fdcec 100644 --- a/packages/bot/src/handlers/webhooks/WEBHOOKS_UPDATE.ts +++ b/packages/bot/src/handlers/webhooks/WEBHOOKS_UPDATE.ts @@ -1,5 +1,5 @@ +import { DiscordGatewayPayload, DiscordWebhookUpdate } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGatewayPayload, DiscordWebhookUpdate } from '../../types/discord.js' export function handleWebhooksUpdate (bot: Bot, data: DiscordGatewayPayload) { const payload = data.d as DiscordWebhookUpdate diff --git a/packages/bot/src/handlers/webhooks/mod.ts b/packages/bot/src/handlers/webhooks/index.ts similarity index 100% rename from packages/bot/src/handlers/webhooks/mod.ts rename to packages/bot/src/handlers/webhooks/index.ts diff --git a/packages/bot/src/helpers/channels/announcements/followAnnouncementChannel.ts b/packages/bot/src/helpers/channels/announcements/followAnnouncementChannel.ts index 3696efe66..66965811b 100644 --- a/packages/bot/src/helpers/channels/announcements/followAnnouncementChannel.ts +++ b/packages/bot/src/helpers/channels/announcements/followAnnouncementChannel.ts @@ -1,5 +1,5 @@ +import { DiscordFollowedChannel } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordFollowedChannel } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/channels/announcements/mod.ts b/packages/bot/src/helpers/channels/announcements/index.ts similarity index 100% rename from packages/bot/src/helpers/channels/announcements/mod.ts rename to packages/bot/src/helpers/channels/announcements/index.ts diff --git a/packages/bot/src/helpers/channels/createChannel.ts b/packages/bot/src/helpers/channels/createChannel.ts index d785074f8..9b7f93933 100644 --- a/packages/bot/src/helpers/channels/createChannel.ts +++ b/packages/bot/src/helpers/channels/createChannel.ts @@ -1,9 +1,7 @@ +import { BigString, ChannelTypes, DiscordChannel, OverwriteReadable, SortOrderTypes } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { WithReason } from '../../mod.js' +import { WithReason } from '../../index.js' import { Channel } from '../../transformers/channel.js' -import { DiscordChannel } from '../../types/discord.js' -import { OverwriteReadable } from '../../types/discordeno.js' -import { BigString, ChannelTypes, SortOrderTypes } from '../../types/shared.js' /** * Creates a channel within a guild. diff --git a/packages/bot/src/helpers/channels/deleteChannel.ts b/packages/bot/src/helpers/channels/deleteChannel.ts index 306245a8f..8e3ebf645 100644 --- a/packages/bot/src/helpers/channels/deleteChannel.ts +++ b/packages/bot/src/helpers/channels/deleteChannel.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a channel from within a guild. diff --git a/packages/bot/src/helpers/channels/deleteChannelPermissionOverride.ts b/packages/bot/src/helpers/channels/deleteChannelPermissionOverride.ts index 661d12f37..70ca57a2d 100644 --- a/packages/bot/src/helpers/channels/deleteChannelPermissionOverride.ts +++ b/packages/bot/src/helpers/channels/deleteChannelPermissionOverride.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a permission override for a user or role in a channel. diff --git a/packages/bot/src/helpers/channels/editChannel.ts b/packages/bot/src/helpers/channels/editChannel.ts index 1ba9dc6e6..b9c00b323 100644 --- a/packages/bot/src/helpers/channels/editChannel.ts +++ b/packages/bot/src/helpers/channels/editChannel.ts @@ -1,9 +1,7 @@ +import { BigString, ChannelTypes, DiscordChannel, OverwriteReadable, SortOrderTypes, VideoQualityModes } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { WithReason } from '../../mod.js' +import { WithReason } from '../../index.js' import { Channel } from '../../transformers/channel.js' -import { DiscordChannel } from '../../types/discord.js' -import { OverwriteReadable } from '../../types/discordeno.js' -import { BigString, ChannelTypes, SortOrderTypes, VideoQualityModes } from '../../types/shared.js' /** * Edits a channel's settings. diff --git a/packages/bot/src/helpers/channels/editChannelPermissionOverrides.ts b/packages/bot/src/helpers/channels/editChannelPermissionOverrides.ts index e5872abe2..67ba7036d 100644 --- a/packages/bot/src/helpers/channels/editChannelPermissionOverrides.ts +++ b/packages/bot/src/helpers/channels/editChannelPermissionOverrides.ts @@ -1,6 +1,6 @@ +import { OverwriteReadable } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' -import { OverwriteReadable } from '../../types/discordeno.js' +import { BigString, WithReason } from '../../index.js' /** * Edits the permission overrides for a user or role in a channel. diff --git a/packages/bot/src/helpers/channels/editChannelPositions.ts b/packages/bot/src/helpers/channels/editChannelPositions.ts index cdcbadc23..a2c76e483 100644 --- a/packages/bot/src/helpers/channels/editChannelPositions.ts +++ b/packages/bot/src/helpers/channels/editChannelPositions.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' export const swapChannels = editChannelPositions diff --git a/packages/bot/src/helpers/channels/forums/createForumThread.ts b/packages/bot/src/helpers/channels/forums/createForumThread.ts index bf574d8e2..f0d2e77fd 100644 --- a/packages/bot/src/helpers/channels/forums/createForumThread.ts +++ b/packages/bot/src/helpers/channels/forums/createForumThread.ts @@ -1,8 +1,8 @@ +import { DiscordChannel } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { Channel } from '../../../transformers/channel.js' import { Embed } from '../../../transformers/embed.js' -import { DiscordChannel } from '../../../types/discord.js' -import { AllowedMentions, BigString, FileContent, MessageComponents, WithReason } from '../../../types/mod.js' +import { AllowedMentions, BigString, FileContent, MessageComponents, WithReason } from '../../../types/index.js' /** * Creates a new thread in a forum channel, and sends a message within the created thread. diff --git a/packages/bot/src/helpers/channels/forums/mod.ts b/packages/bot/src/helpers/channels/forums/index.ts similarity index 100% rename from packages/bot/src/helpers/channels/forums/mod.ts rename to packages/bot/src/helpers/channels/forums/index.ts diff --git a/packages/bot/src/helpers/channels/getChannel.ts b/packages/bot/src/helpers/channels/getChannel.ts index 5402e90a7..ebf4c882d 100644 --- a/packages/bot/src/helpers/channels/getChannel.ts +++ b/packages/bot/src/helpers/channels/getChannel.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordChannel } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Channel } from '../../transformers/channel.js' -import { DiscordChannel } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets a channel by its ID. diff --git a/packages/bot/src/helpers/channels/getChannelInvites.ts b/packages/bot/src/helpers/channels/getChannelInvites.ts index 013f4b462..686d1aea1 100644 --- a/packages/bot/src/helpers/channels/getChannelInvites.ts +++ b/packages/bot/src/helpers/channels/getChannelInvites.ts @@ -1,8 +1,7 @@ +import { BigString, DiscordInviteMetadata, TargetTypes } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordInviteMetadata } from '../../types/discord.js' -import { BigString, TargetTypes } from '../../types/shared.js' import { Collection } from '../../util/collection.js' -import { InviteMetadata } from '../guilds/invites/mod.js' +import { InviteMetadata } from '../guilds/invites/index.js' /** * Gets the list of invites for a channel. diff --git a/packages/bot/src/helpers/channels/getChannels.ts b/packages/bot/src/helpers/channels/getChannels.ts index 5cbad63f9..3e45adc63 100644 --- a/packages/bot/src/helpers/channels/getChannels.ts +++ b/packages/bot/src/helpers/channels/getChannels.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordChannel } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Channel } from '../../transformers/channel.js' -import { DiscordChannel } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/channels/mod.ts b/packages/bot/src/helpers/channels/index.ts similarity index 73% rename from packages/bot/src/helpers/channels/mod.ts rename to packages/bot/src/helpers/channels/index.ts index 5447bf688..6eb1a0513 100644 --- a/packages/bot/src/helpers/channels/mod.ts +++ b/packages/bot/src/helpers/channels/index.ts @@ -1,14 +1,14 @@ -export * from './announcements/mod.js' +export * from './announcements/index.js' export * from './createChannel.js' export * from './deleteChannel.js' export * from './deleteChannelPermissionOverride.js' export * from './editChannel.js' export * from './editChannelPermissionOverrides.js' export * from './editChannelPositions.js' -export * from './forums/mod.js' +export * from './forums/index.js' export * from './getChannel.js' export * from './getChannelInvites.js' export * from './getChannels.js' -export * from './stages/mod.js' -export * from './threads/mod.js' +export * from './stages/index.js' +export * from './threads/index.js' export * from './triggerTypingIndicator.js' diff --git a/packages/bot/src/helpers/channels/stages/createStageInstance.ts b/packages/bot/src/helpers/channels/stages/createStageInstance.ts index 19526d008..17fb6b13a 100644 --- a/packages/bot/src/helpers/channels/stages/createStageInstance.ts +++ b/packages/bot/src/helpers/channels/stages/createStageInstance.ts @@ -1,7 +1,7 @@ +import { DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, WithReason } from '../../../mod.js' +import { BigString, WithReason } from '../../../index.js' import { StageInstance } from '../../../transformers/stageInstance.js' -import { DiscordStageInstance } from '../../../types/discord.js' /** * Creates a stage instance associated with a stage channel. diff --git a/packages/bot/src/helpers/channels/stages/editStageInstance.ts b/packages/bot/src/helpers/channels/stages/editStageInstance.ts index 9542b733f..840a62ae6 100644 --- a/packages/bot/src/helpers/channels/stages/editStageInstance.ts +++ b/packages/bot/src/helpers/channels/stages/editStageInstance.ts @@ -1,7 +1,7 @@ +import { DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, WithReason } from '../../../mod.js' +import { BigString, WithReason } from '../../../index.js' import { StageInstance } from '../../../transformers/stageInstance.js' -import { DiscordStageInstance } from '../../../types/discord.js' /** * Edits a stage instance. diff --git a/packages/bot/src/helpers/channels/stages/getStageInstance.ts b/packages/bot/src/helpers/channels/stages/getStageInstance.ts index 6b5795be2..b45191db2 100644 --- a/packages/bot/src/helpers/channels/stages/getStageInstance.ts +++ b/packages/bot/src/helpers/channels/stages/getStageInstance.ts @@ -1,6 +1,6 @@ +import { DiscordStageInstance } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { StageInstance } from '../../../transformers/stageInstance.js' -import { DiscordStageInstance } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/channels/stages/mod.ts b/packages/bot/src/helpers/channels/stages/index.ts similarity index 100% rename from packages/bot/src/helpers/channels/stages/mod.ts rename to packages/bot/src/helpers/channels/stages/index.ts diff --git a/packages/bot/src/helpers/channels/threads/getActiveThreads.ts b/packages/bot/src/helpers/channels/threads/getActiveThreads.ts index 99214d9d0..93d02d703 100644 --- a/packages/bot/src/helpers/channels/threads/getActiveThreads.ts +++ b/packages/bot/src/helpers/channels/threads/getActiveThreads.ts @@ -1,6 +1,6 @@ +import { DiscordListActiveThreads } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, Channel, ThreadMember } from '../../../mod.js' -import { DiscordListActiveThreads } from '../../../types/discord.js' +import { BigString, Channel, ThreadMember } from '../../../index.js' import { Collection } from '../../../util/collection.js' /** diff --git a/packages/bot/src/helpers/channels/threads/getPrivateArchivedThreads.ts b/packages/bot/src/helpers/channels/threads/getPrivateArchivedThreads.ts index 3efd24380..df6e03f82 100644 --- a/packages/bot/src/helpers/channels/threads/getPrivateArchivedThreads.ts +++ b/packages/bot/src/helpers/channels/threads/getPrivateArchivedThreads.ts @@ -1,5 +1,5 @@ +import { DiscordListArchivedThreads } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordListArchivedThreads } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' import { ArchivedThreads, ListArchivedThreads } from './getPublicArchivedThreads.js' diff --git a/packages/bot/src/helpers/channels/threads/getPrivateJoinedArchivedThreads.ts b/packages/bot/src/helpers/channels/threads/getPrivateJoinedArchivedThreads.ts index 82c55d163..5c0f881f9 100644 --- a/packages/bot/src/helpers/channels/threads/getPrivateJoinedArchivedThreads.ts +++ b/packages/bot/src/helpers/channels/threads/getPrivateJoinedArchivedThreads.ts @@ -1,5 +1,5 @@ +import { DiscordListArchivedThreads } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordListArchivedThreads } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' import { ArchivedThreads, ListArchivedThreads } from './getPublicArchivedThreads.js' diff --git a/packages/bot/src/helpers/channels/threads/getPublicArchivedThreads.ts b/packages/bot/src/helpers/channels/threads/getPublicArchivedThreads.ts index 09c1f251e..1e829ea48 100644 --- a/packages/bot/src/helpers/channels/threads/getPublicArchivedThreads.ts +++ b/packages/bot/src/helpers/channels/threads/getPublicArchivedThreads.ts @@ -1,5 +1,5 @@ +import { DiscordListArchivedThreads } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { DiscordListArchivedThreads } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' import { ActiveThreads } from './getActiveThreads.js' diff --git a/packages/bot/src/helpers/channels/threads/getThreadMember.ts b/packages/bot/src/helpers/channels/threads/getThreadMember.ts index 4c28232c8..e22abdaf4 100644 --- a/packages/bot/src/helpers/channels/threads/getThreadMember.ts +++ b/packages/bot/src/helpers/channels/threads/getThreadMember.ts @@ -1,6 +1,6 @@ +import { DiscordThreadMember } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ThreadMember } from '../../../transformers/threadMember.js' -import { DiscordThreadMember } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/channels/threads/getThreadMembers.ts b/packages/bot/src/helpers/channels/threads/getThreadMembers.ts index 597ae094a..1bcfef14d 100644 --- a/packages/bot/src/helpers/channels/threads/getThreadMembers.ts +++ b/packages/bot/src/helpers/channels/threads/getThreadMembers.ts @@ -1,6 +1,6 @@ +import { DiscordThreadMember } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ThreadMember } from '../../../transformers/threadMember.js' -import { DiscordThreadMember } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/channels/threads/mod.ts b/packages/bot/src/helpers/channels/threads/index.ts similarity index 100% rename from packages/bot/src/helpers/channels/threads/mod.ts rename to packages/bot/src/helpers/channels/threads/index.ts diff --git a/packages/bot/src/helpers/channels/threads/startThreadWithMessage.ts b/packages/bot/src/helpers/channels/threads/startThreadWithMessage.ts index 9c44f6ca3..10ae6a7ec 100644 --- a/packages/bot/src/helpers/channels/threads/startThreadWithMessage.ts +++ b/packages/bot/src/helpers/channels/threads/startThreadWithMessage.ts @@ -1,7 +1,7 @@ +import { DiscordChannel } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, WithReason } from '../../../mod.js' +import { BigString, WithReason } from '../../../index.js' import { Channel } from '../../../transformers/channel.js' -import { DiscordChannel } from '../../../types/discord.js' /** * Creates a thread, using an existing message as its point of origin. diff --git a/packages/bot/src/helpers/channels/threads/startThreadWithoutMessage.ts b/packages/bot/src/helpers/channels/threads/startThreadWithoutMessage.ts index 347a4b44b..7a197d70a 100644 --- a/packages/bot/src/helpers/channels/threads/startThreadWithoutMessage.ts +++ b/packages/bot/src/helpers/channels/threads/startThreadWithoutMessage.ts @@ -1,7 +1,7 @@ +import { DiscordChannel } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { WithReason } from '../../../mod.js' +import { WithReason } from '../../../index.js' import { Channel } from '../../../transformers/channel.js' -import { DiscordChannel } from '../../../types/discord.js' import { BigString, ChannelTypes } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/channels/triggerTypingIndicator.ts b/packages/bot/src/helpers/channels/triggerTypingIndicator.ts index ee4f5c459..1c15b71d3 100644 --- a/packages/bot/src/helpers/channels/triggerTypingIndicator.ts +++ b/packages/bot/src/helpers/channels/triggerTypingIndicator.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' export const startTyping = triggerTypingIndicator diff --git a/packages/bot/src/helpers/emojis/createEmoji.ts b/packages/bot/src/helpers/emojis/createEmoji.ts index 35db442ba..a7e13b797 100644 --- a/packages/bot/src/helpers/emojis/createEmoji.ts +++ b/packages/bot/src/helpers/emojis/createEmoji.ts @@ -1,7 +1,7 @@ +import { DiscordEmoji } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' +import { BigString, WithReason } from '../../index.js' import { Emoji } from '../../transformers/emoji.js' -import { DiscordEmoji } from '../../types/discord.js' /** * Creates an emoji in a guild. diff --git a/packages/bot/src/helpers/emojis/deleteEmoji.ts b/packages/bot/src/helpers/emojis/deleteEmoji.ts index 646489063..7286c04e9 100644 --- a/packages/bot/src/helpers/emojis/deleteEmoji.ts +++ b/packages/bot/src/helpers/emojis/deleteEmoji.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes an emoji from a guild. diff --git a/packages/bot/src/helpers/emojis/editEmoji.ts b/packages/bot/src/helpers/emojis/editEmoji.ts index 36dfc24fe..095ebf8c6 100644 --- a/packages/bot/src/helpers/emojis/editEmoji.ts +++ b/packages/bot/src/helpers/emojis/editEmoji.ts @@ -1,7 +1,7 @@ +import { DiscordEmoji } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' +import { BigString, WithReason } from '../../index.js' import { Emoji } from '../../transformers/emoji.js' -import { DiscordEmoji } from '../../types/discord.js' /** * Edits an emoji. diff --git a/packages/bot/src/helpers/emojis/getEmoji.ts b/packages/bot/src/helpers/emojis/getEmoji.ts index f8f7738e2..2d37a4e46 100644 --- a/packages/bot/src/helpers/emojis/getEmoji.ts +++ b/packages/bot/src/helpers/emojis/getEmoji.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordEmoji } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Emoji } from '../../transformers/emoji.js' -import { DiscordEmoji } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets an emoji by its ID. diff --git a/packages/bot/src/helpers/emojis/getEmojiUrl.ts b/packages/bot/src/helpers/emojis/getEmojiUrl.ts index fd4f52505..96cf4c39f 100644 --- a/packages/bot/src/helpers/emojis/getEmojiUrl.ts +++ b/packages/bot/src/helpers/emojis/getEmojiUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Builds a URL to an emoji in the Discord CDN. diff --git a/packages/bot/src/helpers/emojis/getEmojis.ts b/packages/bot/src/helpers/emojis/getEmojis.ts index b8b853fb2..406c69cc4 100644 --- a/packages/bot/src/helpers/emojis/getEmojis.ts +++ b/packages/bot/src/helpers/emojis/getEmojis.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordEmoji } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Emoji } from '../../transformers/emoji.js' -import { DiscordEmoji } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/emojis/mod.ts b/packages/bot/src/helpers/emojis/index.ts similarity index 100% rename from packages/bot/src/helpers/emojis/mod.ts rename to packages/bot/src/helpers/emojis/index.ts diff --git a/packages/bot/src/helpers/guilds/automod/createAutomodRule.ts b/packages/bot/src/helpers/guilds/automod/createAutomodRule.ts index 8e189349b..8bd0967ff 100644 --- a/packages/bot/src/helpers/guilds/automod/createAutomodRule.ts +++ b/packages/bot/src/helpers/guilds/automod/createAutomodRule.ts @@ -1,13 +1,13 @@ -import { Bot } from '../../../bot.js' -import { BigString, WithReason } from '../../../mod.js' -import { AutoModerationRule } from '../../../transformers/automodRule.js' import { AutoModerationActionType, AutoModerationEventTypes, AutoModerationTriggerTypes, DiscordAutoModerationRule, DiscordAutoModerationRuleTriggerMetadataPresets -} from '../../../types/discord.js' +} from '@discordeno/types' +import { Bot } from '../../../bot.js' +import { BigString, WithReason } from '../../../index.js' +import { AutoModerationRule } from '../../../transformers/automodRule.js' /** * Creates an automod rule in a guild. diff --git a/packages/bot/src/helpers/guilds/automod/editAutomodRule.ts b/packages/bot/src/helpers/guilds/automod/editAutomodRule.ts index 5ccf50e51..c18f220a8 100644 --- a/packages/bot/src/helpers/guilds/automod/editAutomodRule.ts +++ b/packages/bot/src/helpers/guilds/automod/editAutomodRule.ts @@ -1,12 +1,12 @@ -import { Bot } from '../../../bot.js' -import { BigString, WithReason } from '../../../mod.js' -import { AutoModerationRule } from '../../../transformers/automodRule.js' import { AutoModerationActionType, AutoModerationEventTypes, DiscordAutoModerationRule, DiscordAutoModerationRuleTriggerMetadataPresets -} from '../../../types/discord.js' +} from '@discordeno/types' +import { Bot } from '../../../bot.js' +import { BigString, WithReason } from '../../../index.js' +import { AutoModerationRule } from '../../../transformers/automodRule.js' /** * Edits an automod rule. diff --git a/packages/bot/src/helpers/guilds/automod/getAutomodRule.ts b/packages/bot/src/helpers/guilds/automod/getAutomodRule.ts index 076b879bf..7071f96d6 100644 --- a/packages/bot/src/helpers/guilds/automod/getAutomodRule.ts +++ b/packages/bot/src/helpers/guilds/automod/getAutomodRule.ts @@ -1,6 +1,6 @@ +import { DiscordAutoModerationRule } from '@discordeno/types' import { Bot } from '../../../bot.js' import { AutoModerationRule } from '../../../transformers/automodRule.js' -import { DiscordAutoModerationRule } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/guilds/automod/getAutomodRules.ts b/packages/bot/src/helpers/guilds/automod/getAutomodRules.ts index 991c94379..080d384e4 100644 --- a/packages/bot/src/helpers/guilds/automod/getAutomodRules.ts +++ b/packages/bot/src/helpers/guilds/automod/getAutomodRules.ts @@ -1,6 +1,6 @@ +import { DiscordAutoModerationRule } from '@discordeno/types' import { Bot } from '../../../bot.js' import { AutoModerationRule } from '../../../transformers/automodRule.js' -import { DiscordAutoModerationRule } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/guilds/automod/mod.ts b/packages/bot/src/helpers/guilds/automod/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/automod/mod.ts rename to packages/bot/src/helpers/guilds/automod/index.ts diff --git a/packages/bot/src/helpers/guilds/createGuild.ts b/packages/bot/src/helpers/guilds/createGuild.ts index 74f4cee0b..d57de3baf 100644 --- a/packages/bot/src/helpers/guilds/createGuild.ts +++ b/packages/bot/src/helpers/guilds/createGuild.ts @@ -1,14 +1,12 @@ +import { + DefaultMessageNotificationLevels, DiscordGuild, ExplicitContentFilterLevels, + SystemChannelFlags, + VerificationLevels +} from '@discordeno/types' import type { Bot } from '../../bot.js' import { Channel } from '../../transformers/channel.js' import { Guild } from '../../transformers/guild.js' import { Role } from '../../transformers/role.js' -import { DiscordGuild } from '../../types/discord.js' -import { - DefaultMessageNotificationLevels, - ExplicitContentFilterLevels, - SystemChannelFlags, - VerificationLevels -} from '../../types/shared.js' /** * Creates a guild. diff --git a/packages/bot/src/helpers/guilds/deleteGuild.ts b/packages/bot/src/helpers/guilds/deleteGuild.ts index def3f1c0d..9c75b3fd1 100644 --- a/packages/bot/src/helpers/guilds/deleteGuild.ts +++ b/packages/bot/src/helpers/guilds/deleteGuild.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a guild. diff --git a/packages/bot/src/helpers/guilds/editGuild.ts b/packages/bot/src/helpers/guilds/editGuild.ts index f1f0bc4a0..e565386f3 100644 --- a/packages/bot/src/helpers/guilds/editGuild.ts +++ b/packages/bot/src/helpers/guilds/editGuild.ts @@ -1,14 +1,12 @@ -import type { Bot } from '../../bot.js' -import { Guild } from '../../transformers/guild.js' -import { DiscordGuild } from '../../types/discord.js' import { BigString, - DefaultMessageNotificationLevels, - ExplicitContentFilterLevels, + DefaultMessageNotificationLevels, DiscordGuild, ExplicitContentFilterLevels, GuildFeatures, SystemChannelFlags, VerificationLevels -} from '../../types/shared.js' +} from '@discordeno/types' +import type { Bot } from '../../bot.js' +import { Guild } from '../../transformers/guild.js' // TODO: Put the `shardId` parameter before `options`. diff --git a/packages/bot/src/helpers/guilds/editGuildMfaLevel.ts b/packages/bot/src/helpers/guilds/editGuildMfaLevel.ts index c0522f5b1..b8e41be21 100644 --- a/packages/bot/src/helpers/guilds/editGuildMfaLevel.ts +++ b/packages/bot/src/helpers/guilds/editGuildMfaLevel.ts @@ -1,5 +1,5 @@ -import type { Bot } from '../../mod.js' -import type { BigString, MfaLevels } from '../../types/shared.js' +import type { BigString, MfaLevels } from '@discordeno/types' +import type { Bot } from '../../index.js' /** Modify a guild's MFA level. Requires guild ownership. */ export async function editGuildMfaLevel (bot: Bot, guildId: BigString, mfaLevel: MfaLevels, reason?: string) { diff --git a/packages/bot/src/helpers/guilds/editWelcomeScreen.ts b/packages/bot/src/helpers/guilds/editWelcomeScreen.ts index 9ebf4bf5d..02cc2c208 100644 --- a/packages/bot/src/helpers/guilds/editWelcomeScreen.ts +++ b/packages/bot/src/helpers/guilds/editWelcomeScreen.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWelcomeScreen } from '@discordeno/types' import type { Bot } from '../../bot.js' import { WelcomeScreen } from '../../transformers/welcomeScreen.js' -import { DiscordWelcomeScreen } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Edits a guild's welcome screen. diff --git a/packages/bot/src/helpers/guilds/events/createScheduledEvent.ts b/packages/bot/src/helpers/guilds/events/createScheduledEvent.ts index 77bf2013e..e4b22850b 100644 --- a/packages/bot/src/helpers/guilds/events/createScheduledEvent.ts +++ b/packages/bot/src/helpers/guilds/events/createScheduledEvent.ts @@ -1,7 +1,7 @@ +import { DiscordScheduledEvent } from '@discordeno/types' import { Bot } from '../../../bot.js' -import { WithReason } from '../../../mod.js' +import { WithReason } from '../../../index.js' import { ScheduledEvent } from '../../../transformers/scheduledEvent.js' -import { DiscordScheduledEvent } from '../../../types/discord.js' import { BigString, ScheduledEventEntityType, ScheduledEventPrivacyLevel } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/guilds/events/editScheduledEvent.ts b/packages/bot/src/helpers/guilds/events/editScheduledEvent.ts index ba70eefe3..160d839a3 100644 --- a/packages/bot/src/helpers/guilds/events/editScheduledEvent.ts +++ b/packages/bot/src/helpers/guilds/events/editScheduledEvent.ts @@ -1,7 +1,7 @@ +import { DiscordScheduledEvent } from '@discordeno/types' import { Bot } from '../../../bot.js' -import { WithReason } from '../../../mod.js' +import { WithReason } from '../../../index.js' import { ScheduledEvent } from '../../../transformers/scheduledEvent.js' -import { DiscordScheduledEvent } from '../../../types/discord.js' import { BigString, ScheduledEventEntityType, diff --git a/packages/bot/src/helpers/guilds/events/getScheduledEvent.ts b/packages/bot/src/helpers/guilds/events/getScheduledEvent.ts index 844942550..eafb20e90 100644 --- a/packages/bot/src/helpers/guilds/events/getScheduledEvent.ts +++ b/packages/bot/src/helpers/guilds/events/getScheduledEvent.ts @@ -1,6 +1,6 @@ +import { DiscordScheduledEvent } from '@discordeno/types' import { Bot } from '../../../bot.js' import { ScheduledEvent } from '../../../transformers/scheduledEvent.js' -import { DiscordScheduledEvent } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/guilds/events/getScheduledEventUsers.ts b/packages/bot/src/helpers/guilds/events/getScheduledEventUsers.ts index 02fb690ec..43a9220cc 100644 --- a/packages/bot/src/helpers/guilds/events/getScheduledEventUsers.ts +++ b/packages/bot/src/helpers/guilds/events/getScheduledEventUsers.ts @@ -1,6 +1,6 @@ +import { DiscordMember, DiscordUser } from '@discordeno/types' import { Bot } from '../../../bot.js' import { Member, User } from '../../../transformers/member.js' -import { DiscordMember, DiscordUser } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' @@ -74,7 +74,7 @@ export async function getScheduledEventUsers ( return new Collection( results.map((result) => { const user = bot.transformers.user(bot, result.user) - const member = bot.transformers.member(bot, result.member!, id, user.id) + const member = bot.transformers.member(bot, result.member, id, user.id) return [user.id, { member, user }] }) diff --git a/packages/bot/src/helpers/guilds/events/getScheduledEvents.ts b/packages/bot/src/helpers/guilds/events/getScheduledEvents.ts index 475993c09..d22fb0677 100644 --- a/packages/bot/src/helpers/guilds/events/getScheduledEvents.ts +++ b/packages/bot/src/helpers/guilds/events/getScheduledEvents.ts @@ -1,6 +1,6 @@ +import { DiscordScheduledEvent } from '@discordeno/types' import { Bot } from '../../../bot.js' import { ScheduledEvent } from '../../../transformers/scheduledEvent.js' -import { DiscordScheduledEvent } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/guilds/events/mod.ts b/packages/bot/src/helpers/guilds/events/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/events/mod.ts rename to packages/bot/src/helpers/guilds/events/index.ts diff --git a/packages/bot/src/helpers/guilds/getAuditLog.ts b/packages/bot/src/helpers/guilds/getAuditLog.ts index 0dd3b27c5..e206b9b02 100644 --- a/packages/bot/src/helpers/guilds/getAuditLog.ts +++ b/packages/bot/src/helpers/guilds/getAuditLog.ts @@ -1,3 +1,4 @@ +import { AuditLogEvents, BigString, DiscordAuditLog } from '@discordeno/types' import type { Bot } from '../../bot.js' import { ApplicationCommand } from '../../transformers/applicationCommand.js' import { AuditLogEntry } from '../../transformers/auditLogEntry.js' @@ -7,8 +8,6 @@ import { Integration } from '../../transformers/integration.js' import { User } from '../../transformers/member.js' import { ScheduledEvent } from '../../transformers/scheduledEvent.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordAuditLog } from '../../types/discord.js' -import { AuditLogEvents, BigString } from '../../types/shared.js' export interface AuditLog { auditLogEntries: AuditLogEntry[] diff --git a/packages/bot/src/helpers/guilds/getBan.ts b/packages/bot/src/helpers/guilds/getBan.ts index 826a9a35e..509a067a5 100644 --- a/packages/bot/src/helpers/guilds/getBan.ts +++ b/packages/bot/src/helpers/guilds/getBan.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordBan } from '@discordeno/types' import type { Bot } from '../../bot.js' import { User } from '../../transformers/member.js' -import { DiscordBan } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' export interface Ban { reason?: string diff --git a/packages/bot/src/helpers/guilds/getBans.ts b/packages/bot/src/helpers/guilds/getBans.ts index 6da0b28c8..e50980acb 100644 --- a/packages/bot/src/helpers/guilds/getBans.ts +++ b/packages/bot/src/helpers/guilds/getBans.ts @@ -1,6 +1,5 @@ +import { BigString, DiscordBan } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordBan } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' import { Ban } from './getBan.js' diff --git a/packages/bot/src/helpers/guilds/getGuild.ts b/packages/bot/src/helpers/guilds/getGuild.ts index 4f49c3099..29a248029 100644 --- a/packages/bot/src/helpers/guilds/getGuild.ts +++ b/packages/bot/src/helpers/guilds/getGuild.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordGuild } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Guild } from '../../transformers/guild.js' -import { DiscordGuild } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets a guild by its ID. diff --git a/packages/bot/src/helpers/guilds/getGuildBannerUrl.ts b/packages/bot/src/helpers/guilds/getGuildBannerUrl.ts index d5a2d0728..f906dc98e 100644 --- a/packages/bot/src/helpers/guilds/getGuildBannerUrl.ts +++ b/packages/bot/src/helpers/guilds/getGuildBannerUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' import { ImageFormat, ImageSize } from '../members/getAvatarUrl.js' // TODO: Move `banner` from `options` into the parameters and rename to `imageHash`. diff --git a/packages/bot/src/helpers/guilds/getGuildIconUrl.ts b/packages/bot/src/helpers/guilds/getGuildIconUrl.ts index ff75c4e92..173a6973c 100644 --- a/packages/bot/src/helpers/guilds/getGuildIconUrl.ts +++ b/packages/bot/src/helpers/guilds/getGuildIconUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' import { ImageFormat, ImageSize } from '../members/getAvatarUrl.js' /** diff --git a/packages/bot/src/helpers/guilds/getGuildPreview.ts b/packages/bot/src/helpers/guilds/getGuildPreview.ts index dd13fa74d..885480bd6 100644 --- a/packages/bot/src/helpers/guilds/getGuildPreview.ts +++ b/packages/bot/src/helpers/guilds/getGuildPreview.ts @@ -1,8 +1,7 @@ +import { BigString, DiscordGuildPreview, GuildFeatures } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Emoji } from '../../transformers/emoji.js' import { Sticker } from '../../transformers/sticker.js' -import { DiscordGuildPreview } from '../../types/discord.js' -import { BigString, GuildFeatures } from '../../types/shared.js' export interface GuildPreview { id: BigString diff --git a/packages/bot/src/helpers/guilds/getGuildSplashUrl.ts b/packages/bot/src/helpers/guilds/getGuildSplashUrl.ts index e376a7820..426436710 100644 --- a/packages/bot/src/helpers/guilds/getGuildSplashUrl.ts +++ b/packages/bot/src/helpers/guilds/getGuildSplashUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' import { ImageFormat, ImageSize } from '../members/getAvatarUrl.js' /** diff --git a/packages/bot/src/helpers/guilds/getPruneCount.ts b/packages/bot/src/helpers/guilds/getPruneCount.ts index 95b9c4d7b..63c25bcfe 100644 --- a/packages/bot/src/helpers/guilds/getPruneCount.ts +++ b/packages/bot/src/helpers/guilds/getPruneCount.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' interface DiscordPrunedCount { pruned: number diff --git a/packages/bot/src/helpers/guilds/getVanityUrl.ts b/packages/bot/src/helpers/guilds/getVanityUrl.ts index dbf2f42ba..b41b00ce0 100644 --- a/packages/bot/src/helpers/guilds/getVanityUrl.ts +++ b/packages/bot/src/helpers/guilds/getVanityUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' export interface VanityUrl { code: string | null diff --git a/packages/bot/src/helpers/guilds/getWelcomeScreen.ts b/packages/bot/src/helpers/guilds/getWelcomeScreen.ts index 07ea197a3..df30bc298 100644 --- a/packages/bot/src/helpers/guilds/getWelcomeScreen.ts +++ b/packages/bot/src/helpers/guilds/getWelcomeScreen.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWelcomeScreen } from '@discordeno/types' import type { Bot } from '../../bot.js' import { WelcomeScreen } from '../../transformers/welcomeScreen.js' -import { DiscordWelcomeScreen } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets the welcome screen for a guild. diff --git a/packages/bot/src/helpers/guilds/mod.ts b/packages/bot/src/helpers/guilds/index.ts similarity index 73% rename from packages/bot/src/helpers/guilds/mod.ts rename to packages/bot/src/helpers/guilds/index.ts index dc85fa909..59f2bec84 100644 --- a/packages/bot/src/helpers/guilds/mod.ts +++ b/packages/bot/src/helpers/guilds/index.ts @@ -1,10 +1,10 @@ -export * from './automod/mod.js' +export * from './automod/index.js' export * from './createGuild.js' export * from './deleteGuild.js' export * from './editGuild.js' export * from './editGuildMfaLevel.js' export * from './editWelcomeScreen.js' -export * from './events/mod.js' +export * from './events/index.js' export * from './getAuditLog.js' export * from './getBan.js' export * from './getBans.js' @@ -16,8 +16,8 @@ export * from './getGuildSplashUrl.js' export * from './getPruneCount.js' export * from './getVanityUrl.js' export * from './getWelcomeScreen.js' -export * from './integrations/mod.js' -export * from './invites/mod.js' +export * from './integrations/index.js' +export * from './invites/index.js' export * from './leaveGuild.js' -export * from './voice/mod.js' -export * from './widget/mod.js' +export * from './voice/index.js' +export * from './widget/index.js' diff --git a/packages/bot/src/helpers/guilds/integrations/getIntegrations.ts b/packages/bot/src/helpers/guilds/integrations/getIntegrations.ts index fb5a87903..93e0d1e46 100644 --- a/packages/bot/src/helpers/guilds/integrations/getIntegrations.ts +++ b/packages/bot/src/helpers/guilds/integrations/getIntegrations.ts @@ -1,6 +1,6 @@ +import { DiscordIntegration } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { Integration } from '../../../transformers/integration.js' -import { DiscordIntegration } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/guilds/integrations/mod.ts b/packages/bot/src/helpers/guilds/integrations/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/integrations/mod.ts rename to packages/bot/src/helpers/guilds/integrations/index.ts diff --git a/packages/bot/src/helpers/guilds/invites/createInvite.ts b/packages/bot/src/helpers/guilds/invites/createInvite.ts index 478d54cdd..34a75cb8a 100644 --- a/packages/bot/src/helpers/guilds/invites/createInvite.ts +++ b/packages/bot/src/helpers/guilds/invites/createInvite.ts @@ -1,6 +1,6 @@ +import { DiscordInvite } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { WithReason } from '../../../mod.js' -import { DiscordInvite } from '../../../types/discord.js' +import { WithReason } from '../../../index.js' import { BigString, TargetTypes } from '../../../types/shared.js' import { BaseInvite } from './getInvite.js' diff --git a/packages/bot/src/helpers/guilds/invites/getInvite.ts b/packages/bot/src/helpers/guilds/invites/getInvite.ts index b25382a42..b114c11da 100644 --- a/packages/bot/src/helpers/guilds/invites/getInvite.ts +++ b/packages/bot/src/helpers/guilds/invites/getInvite.ts @@ -1,6 +1,6 @@ +import { DiscordInviteMetadata } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, ScheduledEvent, TargetTypes, User } from '../../../mod.js' -import { DiscordInviteMetadata } from '../../../types/discord.js' +import { BigString, ScheduledEvent, TargetTypes, User } from '../../../index.js' export interface BaseInvite { code: string diff --git a/packages/bot/src/helpers/guilds/invites/getInvites.ts b/packages/bot/src/helpers/guilds/invites/getInvites.ts index 8799d0c37..fed922b68 100644 --- a/packages/bot/src/helpers/guilds/invites/getInvites.ts +++ b/packages/bot/src/helpers/guilds/invites/getInvites.ts @@ -1,6 +1,6 @@ +import { DiscordInviteMetadata } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { BigString, TargetTypes } from '../../../mod.js' -import { DiscordInviteMetadata } from '../../../types/discord.js' +import { BigString, TargetTypes } from '../../../index.js' import { Collection } from '../../../util/collection.js' import { InviteMetadata } from './getInvite.js' diff --git a/packages/bot/src/helpers/guilds/invites/mod.ts b/packages/bot/src/helpers/guilds/invites/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/invites/mod.ts rename to packages/bot/src/helpers/guilds/invites/index.ts diff --git a/packages/bot/src/helpers/guilds/leaveGuild.ts b/packages/bot/src/helpers/guilds/leaveGuild.ts index 4a6d7ac6d..a02e26a88 100644 --- a/packages/bot/src/helpers/guilds/leaveGuild.ts +++ b/packages/bot/src/helpers/guilds/leaveGuild.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Leaves a guild. diff --git a/packages/bot/src/helpers/guilds/voice/getAvailableVoiceRegions.ts b/packages/bot/src/helpers/guilds/voice/getAvailableVoiceRegions.ts index 211d29acc..467bcba93 100644 --- a/packages/bot/src/helpers/guilds/voice/getAvailableVoiceRegions.ts +++ b/packages/bot/src/helpers/guilds/voice/getAvailableVoiceRegions.ts @@ -1,6 +1,6 @@ +import { DiscordVoiceRegion } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { VoiceRegions } from '../../../transformers/voiceRegion.js' -import { DiscordVoiceRegion } from '../../../types/discord.js' import { Collection } from '../../../util/collection.js' /** diff --git a/packages/bot/src/helpers/guilds/voice/getVoiceRegions.ts b/packages/bot/src/helpers/guilds/voice/getVoiceRegions.ts index 3ad8e3804..af6a318f1 100644 --- a/packages/bot/src/helpers/guilds/voice/getVoiceRegions.ts +++ b/packages/bot/src/helpers/guilds/voice/getVoiceRegions.ts @@ -1,6 +1,6 @@ +import { DiscordVoiceRegion } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { VoiceRegions } from '../../../transformers/voiceRegion.js' -import { DiscordVoiceRegion } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/guilds/voice/mod.ts b/packages/bot/src/helpers/guilds/voice/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/voice/mod.ts rename to packages/bot/src/helpers/guilds/voice/index.ts diff --git a/packages/bot/src/helpers/guilds/widget/editWidgetSettings.ts b/packages/bot/src/helpers/guilds/widget/editWidgetSettings.ts index 0fa65a19a..1acc15c13 100644 --- a/packages/bot/src/helpers/guilds/widget/editWidgetSettings.ts +++ b/packages/bot/src/helpers/guilds/widget/editWidgetSettings.ts @@ -1,6 +1,6 @@ +import { DiscordGuildWidgetSettings } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { GuildWidgetSettings } from '../../../transformers/widgetSettings.js' -import { DiscordGuildWidgetSettings } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' // TODO: Use `options` instead of `enabled` and `channelId`. diff --git a/packages/bot/src/helpers/guilds/widget/getWidget.ts b/packages/bot/src/helpers/guilds/widget/getWidget.ts index 7f36080f6..b2c4900cd 100644 --- a/packages/bot/src/helpers/guilds/widget/getWidget.ts +++ b/packages/bot/src/helpers/guilds/widget/getWidget.ts @@ -1,6 +1,6 @@ +import { DiscordGuildWidget } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { GuildWidget } from '../../../transformers/widget.js' -import { DiscordGuildWidget } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/guilds/widget/getWidgetSettings.ts b/packages/bot/src/helpers/guilds/widget/getWidgetSettings.ts index cb8bb1024..0d6da2538 100644 --- a/packages/bot/src/helpers/guilds/widget/getWidgetSettings.ts +++ b/packages/bot/src/helpers/guilds/widget/getWidgetSettings.ts @@ -1,6 +1,6 @@ +import { DiscordGuildWidgetSettings } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { GuildWidgetSettings } from '../../../transformers/widgetSettings.js' -import { DiscordGuildWidgetSettings } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/guilds/widget/mod.ts b/packages/bot/src/helpers/guilds/widget/index.ts similarity index 100% rename from packages/bot/src/helpers/guilds/widget/mod.ts rename to packages/bot/src/helpers/guilds/widget/index.ts diff --git a/packages/bot/src/helpers/index.ts b/packages/bot/src/helpers/index.ts new file mode 100644 index 000000000..a372e2cc3 --- /dev/null +++ b/packages/bot/src/helpers/index.ts @@ -0,0 +1,11 @@ +export * from './channels/index.js' +export * from './emojis/index.js' +export * from './guilds/index.js' +export * from './interactions/index.js' +export * from './members/index.js' +export * from './messages/index.js' +export * from './misc/index.js' +export * from './roles/index.js' +export * from './stickers/index.js' +export * from './templates/index.js' +export * from './webhooks/index.js' diff --git a/packages/bot/src/helpers/interactions/commands/createGlobalApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/createGlobalApplicationCommand.ts index bf948693c..184fd89bd 100644 --- a/packages/bot/src/helpers/interactions/commands/createGlobalApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/createGlobalApplicationCommand.ts @@ -1,6 +1,6 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { ApplicationCommand, CreateApplicationCommand } from '../../../mod.js' -import { DiscordApplicationCommand } from '../../../types/discord.js' +import { ApplicationCommand, CreateApplicationCommand } from '../../../index.js' /** * Creates an application command accessible globally; across different guilds and channels. diff --git a/packages/bot/src/helpers/interactions/commands/createGuildApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/createGuildApplicationCommand.ts index c09bd7b84..d5dd5635c 100644 --- a/packages/bot/src/helpers/interactions/commands/createGuildApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/createGuildApplicationCommand.ts @@ -1,5 +1,5 @@ import { Bot } from '../../../bot.js' -import { ApplicationCommand, BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../mod.js' +import { ApplicationCommand, BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../index.js' /** * Creates an application command only accessible in a specific guild. diff --git a/packages/bot/src/helpers/interactions/commands/editApplicationCommandPermissions.ts b/packages/bot/src/helpers/interactions/commands/editApplicationCommandPermissions.ts index 3154ba10f..c174d024f 100644 --- a/packages/bot/src/helpers/interactions/commands/editApplicationCommandPermissions.ts +++ b/packages/bot/src/helpers/interactions/commands/editApplicationCommandPermissions.ts @@ -1,6 +1,6 @@ +import { DiscordGuildApplicationCommandPermissions } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommandPermission } from '../../../transformers/applicationCommandPermission.js' -import { DiscordGuildApplicationCommandPermissions } from '../../../types/discord.js' import { ApplicationCommandPermissionTypes, BigString } from '../../../types/shared.js' // TODO: Make `options` into an object with a `permissions` field. diff --git a/packages/bot/src/helpers/interactions/commands/editGlobalApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/editGlobalApplicationCommand.ts index c90a88e94..b30c291fd 100644 --- a/packages/bot/src/helpers/interactions/commands/editGlobalApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/editGlobalApplicationCommand.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/mod.js' +import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/index.js' /** * Edits a global application command. diff --git a/packages/bot/src/helpers/interactions/commands/editGuildApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/editGuildApplicationCommand.ts index c52f380d9..f36795e7b 100644 --- a/packages/bot/src/helpers/interactions/commands/editGuildApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/editGuildApplicationCommand.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/mod.js' +import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/index.js' // TODO: Swap `commandId` and `guildId` parameters. diff --git a/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermission.ts b/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermission.ts index 3701d609a..f72dedfd4 100644 --- a/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermission.ts +++ b/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermission.ts @@ -1,6 +1,6 @@ +import { DiscordGuildApplicationCommandPermissions } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommandPermission } from '../../../transformers/applicationCommandPermission.js' -import { DiscordGuildApplicationCommandPermissions } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermissions.ts b/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermissions.ts index f1d33f8df..520117224 100644 --- a/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermissions.ts +++ b/packages/bot/src/helpers/interactions/commands/getApplicationCommandPermissions.ts @@ -1,6 +1,6 @@ +import { DiscordGuildApplicationCommandPermissions } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommandPermission } from '../../../transformers/applicationCommandPermission.js' -import { DiscordGuildApplicationCommandPermissions } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommand.ts index c601f41bd..f464b67d6 100644 --- a/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommand.ts @@ -1,6 +1,6 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { DiscordApplicationCommand } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommands.ts b/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommands.ts index bcd11a771..d28f08dcb 100644 --- a/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommands.ts +++ b/packages/bot/src/helpers/interactions/commands/getGlobalApplicationCommands.ts @@ -1,6 +1,6 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { DiscordApplicationCommand } from '../../../types/discord.js' import { Collection } from '../../../util/collection.js' // TODO: Implement `with_localizations` options field. diff --git a/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommand.ts b/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommand.ts index 7a5006de1..38bfa9b14 100644 --- a/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommand.ts +++ b/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommand.ts @@ -1,6 +1,6 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { DiscordApplicationCommand } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' // TODO: Swap `commandId` and `guildId` parameters. diff --git a/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommands.ts b/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommands.ts index 220a4d388..8b0c8ef5a 100644 --- a/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommands.ts +++ b/packages/bot/src/helpers/interactions/commands/getGuildApplicationCommands.ts @@ -1,6 +1,6 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { DiscordApplicationCommand } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/interactions/commands/mod.ts b/packages/bot/src/helpers/interactions/commands/index.ts similarity index 100% rename from packages/bot/src/helpers/interactions/commands/mod.ts rename to packages/bot/src/helpers/interactions/commands/index.ts diff --git a/packages/bot/src/helpers/interactions/commands/upsertGlobalApplicationCommands.ts b/packages/bot/src/helpers/interactions/commands/upsertGlobalApplicationCommands.ts index 1eebaafc0..1a691719f 100644 --- a/packages/bot/src/helpers/interactions/commands/upsertGlobalApplicationCommands.ts +++ b/packages/bot/src/helpers/interactions/commands/upsertGlobalApplicationCommands.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/mod.js' +import { CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/index.js' import { Collection } from '../../../util/collection.js' /** diff --git a/packages/bot/src/helpers/interactions/commands/upsertGuildApplicationCommands.ts b/packages/bot/src/helpers/interactions/commands/upsertGuildApplicationCommands.ts index f6d71de07..05365a6ca 100644 --- a/packages/bot/src/helpers/interactions/commands/upsertGuildApplicationCommands.ts +++ b/packages/bot/src/helpers/interactions/commands/upsertGuildApplicationCommands.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../../bot.js' import { ApplicationCommand } from '../../../transformers/applicationCommand.js' -import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/mod.js' +import { BigString, CreateApplicationCommand, DiscordApplicationCommand } from '../../../types/index.js' import { Collection } from '../../../util/collection.js' /** diff --git a/packages/bot/src/helpers/interactions/index.ts b/packages/bot/src/helpers/interactions/index.ts new file mode 100644 index 000000000..e66d8fb8d --- /dev/null +++ b/packages/bot/src/helpers/interactions/index.ts @@ -0,0 +1,2 @@ +export * from './commands/index.js' +export * from './responses/index.js' diff --git a/packages/bot/src/helpers/interactions/mod.ts b/packages/bot/src/helpers/interactions/mod.ts deleted file mode 100644 index 4b6af4e72..000000000 --- a/packages/bot/src/helpers/interactions/mod.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './commands/mod.js' -export * from './responses/mod.js' diff --git a/packages/bot/src/helpers/interactions/responses/editFollowupMessage.ts b/packages/bot/src/helpers/interactions/responses/editFollowupMessage.ts index 2503a78a6..93ec9906c 100644 --- a/packages/bot/src/helpers/interactions/responses/editFollowupMessage.ts +++ b/packages/bot/src/helpers/interactions/responses/editFollowupMessage.ts @@ -1,7 +1,7 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { InteractionCallbackData } from '../../../mod.js' +import { InteractionCallbackData } from '../../../index.js' import { Message } from '../../../transformers/message.js' -import { DiscordMessage } from '../../../types/discord.js' import { BigString, InteractionResponseTypes } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/interactions/responses/editOriginalInteractionResponse.ts b/packages/bot/src/helpers/interactions/responses/editOriginalInteractionResponse.ts index 269df6b6b..2d1ad5f8b 100644 --- a/packages/bot/src/helpers/interactions/responses/editOriginalInteractionResponse.ts +++ b/packages/bot/src/helpers/interactions/responses/editOriginalInteractionResponse.ts @@ -1,7 +1,7 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { Message } from '../../../transformers/message.js' -import { DiscordMessage } from '../../../types/discord.js' -import { InteractionCallbackData, InteractionResponseTypes } from '../../../types/mod.js' +import { InteractionCallbackData, InteractionResponseTypes } from '../../../types/index.js' /** * Edits the initial message response to an interaction. diff --git a/packages/bot/src/helpers/interactions/responses/getFollowupMessage.ts b/packages/bot/src/helpers/interactions/responses/getFollowupMessage.ts index cf0b7d0e3..152d3b313 100644 --- a/packages/bot/src/helpers/interactions/responses/getFollowupMessage.ts +++ b/packages/bot/src/helpers/interactions/responses/getFollowupMessage.ts @@ -1,6 +1,6 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { Message } from '../../../transformers/message.js' -import { DiscordMessage } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' /** diff --git a/packages/bot/src/helpers/interactions/responses/getOriginalInteractionResponse.ts b/packages/bot/src/helpers/interactions/responses/getOriginalInteractionResponse.ts index 6fe1e6377..c4ad6b8a5 100644 --- a/packages/bot/src/helpers/interactions/responses/getOriginalInteractionResponse.ts +++ b/packages/bot/src/helpers/interactions/responses/getOriginalInteractionResponse.ts @@ -1,6 +1,6 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { Message } from '../../../transformers/message.js' -import { DiscordMessage } from '../../../types/discord.js' /** * Gets the initial message response to an interaction. diff --git a/packages/bot/src/helpers/interactions/responses/mod.ts b/packages/bot/src/helpers/interactions/responses/index.ts similarity index 100% rename from packages/bot/src/helpers/interactions/responses/mod.ts rename to packages/bot/src/helpers/interactions/responses/index.ts diff --git a/packages/bot/src/helpers/interactions/responses/sendFollowupMessage.ts b/packages/bot/src/helpers/interactions/responses/sendFollowupMessage.ts index 1e09568e5..6d59fc3d2 100644 --- a/packages/bot/src/helpers/interactions/responses/sendFollowupMessage.ts +++ b/packages/bot/src/helpers/interactions/responses/sendFollowupMessage.ts @@ -1,6 +1,6 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../../bot.js' -import { InteractionResponse, Message } from '../../../mod.js' -import { DiscordMessage } from '../../../types/discord.js' +import { InteractionResponse, Message } from '../../../index.js' /** * Sends a follow-up message to an interaction. diff --git a/packages/bot/src/helpers/interactions/responses/sendInteractionResponse.ts b/packages/bot/src/helpers/interactions/responses/sendInteractionResponse.ts index 4619ad4c9..e73b8e57c 100644 --- a/packages/bot/src/helpers/interactions/responses/sendInteractionResponse.ts +++ b/packages/bot/src/helpers/interactions/responses/sendInteractionResponse.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../../bot.js' -import { InteractionResponse } from '../../../types/discordeno.js' import { BigString } from '../../../types/shared.js' +import { InteractionResponse } from '../@discordeno/types' /** * Sends a response to an interaction. diff --git a/packages/bot/src/helpers/members/banMember.ts b/packages/bot/src/helpers/members/banMember.ts index c4a1dc77f..8317f68d0 100644 --- a/packages/bot/src/helpers/members/banMember.ts +++ b/packages/bot/src/helpers/members/banMember.ts @@ -1,5 +1,5 @@ import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' +import { BigString, WithReason } from '../../index.js' /** * Bans a user from a guild. diff --git a/packages/bot/src/helpers/members/editBotMember.ts b/packages/bot/src/helpers/members/editBotMember.ts index e336aebb4..772c2a1d1 100644 --- a/packages/bot/src/helpers/members/editBotMember.ts +++ b/packages/bot/src/helpers/members/editBotMember.ts @@ -1,5 +1,5 @@ import type { Bot } from '../../bot.js' -import { BigString, DiscordMember, Member, WithReason } from '../../mod.js' +import { BigString, DiscordMember, Member, WithReason } from '../../index.js' /** * Edits the nickname of the bot user. diff --git a/packages/bot/src/helpers/members/editMember.ts b/packages/bot/src/helpers/members/editMember.ts index 8946faac7..e7a4dbe3c 100644 --- a/packages/bot/src/helpers/members/editMember.ts +++ b/packages/bot/src/helpers/members/editMember.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMemberWithUser } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Member } from '../../transformers/member.js' -import { DiscordMemberWithUser } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Edits a member's properties. diff --git a/packages/bot/src/helpers/members/fetchMembers.ts b/packages/bot/src/helpers/members/fetchMembers.ts index 4161d0204..6e01fe44e 100644 --- a/packages/bot/src/helpers/members/fetchMembers.ts +++ b/packages/bot/src/helpers/members/fetchMembers.ts @@ -1,5 +1,5 @@ +import { BigString, GatewayIntents, GatewayOpcodes } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, GatewayIntents, GatewayOpcodes } from '../../types/shared.js' import { calculateShardId } from '../../util/calculateShardId.js' /** diff --git a/packages/bot/src/helpers/members/getAvatarUrl.ts b/packages/bot/src/helpers/members/getAvatarUrl.ts index 8569ec455..56c5169e2 100644 --- a/packages/bot/src/helpers/members/getAvatarUrl.ts +++ b/packages/bot/src/helpers/members/getAvatarUrl.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Builds a URL to a user's avatar stored in the Discord CDN. diff --git a/packages/bot/src/helpers/members/getDmChannel.ts b/packages/bot/src/helpers/members/getDmChannel.ts index 431b6712b..259831850 100644 --- a/packages/bot/src/helpers/members/getDmChannel.ts +++ b/packages/bot/src/helpers/members/getDmChannel.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordChannel } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Channel } from '../../transformers/channel.js' -import { DiscordChannel } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets or creates a DM channel with a user. diff --git a/packages/bot/src/helpers/members/getMember.ts b/packages/bot/src/helpers/members/getMember.ts index f5761773b..7af42d490 100644 --- a/packages/bot/src/helpers/members/getMember.ts +++ b/packages/bot/src/helpers/members/getMember.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMemberWithUser } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Member } from '../../transformers/member.js' -import { DiscordMemberWithUser } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets the member object by user ID. diff --git a/packages/bot/src/helpers/members/getMembers.ts b/packages/bot/src/helpers/members/getMembers.ts index da752d64d..6694a7e4c 100644 --- a/packages/bot/src/helpers/members/getMembers.ts +++ b/packages/bot/src/helpers/members/getMembers.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMemberWithUser } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Member } from '../../transformers/member.js' -import { DiscordMemberWithUser } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' // TODO: make options optional diff --git a/packages/bot/src/helpers/members/mod.ts b/packages/bot/src/helpers/members/index.ts similarity index 100% rename from packages/bot/src/helpers/members/mod.ts rename to packages/bot/src/helpers/members/index.ts diff --git a/packages/bot/src/helpers/members/kickMember.ts b/packages/bot/src/helpers/members/kickMember.ts index a07d82131..6db019057 100644 --- a/packages/bot/src/helpers/members/kickMember.ts +++ b/packages/bot/src/helpers/members/kickMember.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Kicks a member from a guild. diff --git a/packages/bot/src/helpers/members/pruneMembers.ts b/packages/bot/src/helpers/members/pruneMembers.ts index bb6b6abdf..5088fcb46 100644 --- a/packages/bot/src/helpers/members/pruneMembers.ts +++ b/packages/bot/src/helpers/members/pruneMembers.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Initiates the process of pruning inactive members. diff --git a/packages/bot/src/helpers/members/searchMembers.ts b/packages/bot/src/helpers/members/searchMembers.ts index 54d03cea0..20ab52cc1 100644 --- a/packages/bot/src/helpers/members/searchMembers.ts +++ b/packages/bot/src/helpers/members/searchMembers.ts @@ -1,9 +1,8 @@ -import type { DiscordMemberWithUser } from '../../types/discord.js' -import type { SearchMembers } from '../../types/discordeno.js' +import type { DiscordMemberWithUser, SearchMembers } from '@discordeno/types' +import { BigString } from '@discordeno/types' import { Bot } from '../../bot.js' import { Member } from '../../transformers/member.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/members/unbanMember.ts b/packages/bot/src/helpers/members/unbanMember.ts index b9dacb2e7..61fb7730e 100644 --- a/packages/bot/src/helpers/members/unbanMember.ts +++ b/packages/bot/src/helpers/members/unbanMember.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Unbans a user from a guild. diff --git a/packages/bot/src/helpers/messages/crosspostMessage.ts b/packages/bot/src/helpers/messages/crosspostMessage.ts index 728a905e8..8acb864f9 100644 --- a/packages/bot/src/helpers/messages/crosspostMessage.ts +++ b/packages/bot/src/helpers/messages/crosspostMessage.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' export const publishMessage = crosspostMessage diff --git a/packages/bot/src/helpers/messages/deleteMessage.ts b/packages/bot/src/helpers/messages/deleteMessage.ts index d116bf9c0..78e4fa845 100644 --- a/packages/bot/src/helpers/messages/deleteMessage.ts +++ b/packages/bot/src/helpers/messages/deleteMessage.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' // TODO: Remove `delayMilliseconds` parameter. diff --git a/packages/bot/src/helpers/messages/deleteMessages.ts b/packages/bot/src/helpers/messages/deleteMessages.ts index 5a416ae7a..dadddd4f1 100644 --- a/packages/bot/src/helpers/messages/deleteMessages.ts +++ b/packages/bot/src/helpers/messages/deleteMessages.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes multiple messages from a channel. diff --git a/packages/bot/src/helpers/messages/editMessage.ts b/packages/bot/src/helpers/messages/editMessage.ts index 875708bce..e7f6d9b58 100644 --- a/packages/bot/src/helpers/messages/editMessage.ts +++ b/packages/bot/src/helpers/messages/editMessage.ts @@ -1,10 +1,8 @@ +import { AllowedMentions, BigString, DiscordMessage, FileContent, MessageComponents } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Attachment } from '../../transformers/attachment.js' import { Embed } from '../../transformers/embed.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { AllowedMentions, FileContent, MessageComponents } from '../../types/discordeno.js' -import { BigString } from '../../types/shared.js' /** * Edits a message. diff --git a/packages/bot/src/helpers/messages/getMessage.ts b/packages/bot/src/helpers/messages/getMessage.ts index bb5e26e00..b7c31481d 100644 --- a/packages/bot/src/helpers/messages/getMessage.ts +++ b/packages/bot/src/helpers/messages/getMessage.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets a message from a channel by the ID of the message. diff --git a/packages/bot/src/helpers/messages/getMessages.ts b/packages/bot/src/helpers/messages/getMessages.ts index 89b2b9cb4..d780eca41 100644 --- a/packages/bot/src/helpers/messages/getMessages.ts +++ b/packages/bot/src/helpers/messages/getMessages.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' import { hasProperty } from '../../util/utils.js' diff --git a/packages/bot/src/helpers/messages/getPinnedMessages.ts b/packages/bot/src/helpers/messages/getPinnedMessages.ts index 110fe8354..b479b3b3f 100644 --- a/packages/bot/src/helpers/messages/getPinnedMessages.ts +++ b/packages/bot/src/helpers/messages/getPinnedMessages.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/messages/mod.ts b/packages/bot/src/helpers/messages/index.ts similarity index 90% rename from packages/bot/src/helpers/messages/mod.ts rename to packages/bot/src/helpers/messages/index.ts index f5559d738..e6c2b2459 100644 --- a/packages/bot/src/helpers/messages/mod.ts +++ b/packages/bot/src/helpers/messages/index.ts @@ -6,6 +6,6 @@ export * from './getMessage.js' export * from './getMessages.js' export * from './getPinnedMessages.js' export * from './pinMessage.js' -export * from './reactions/mod.js' +export * from './reactions/index.js' export * from './sendMessage.js' export * from './unpinMessage.js' diff --git a/packages/bot/src/helpers/messages/pinMessage.ts b/packages/bot/src/helpers/messages/pinMessage.ts index 5cec344a8..6b0682c48 100644 --- a/packages/bot/src/helpers/messages/pinMessage.ts +++ b/packages/bot/src/helpers/messages/pinMessage.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Pins a message in a channel. diff --git a/packages/bot/src/helpers/messages/reactions/getReactions.ts b/packages/bot/src/helpers/messages/reactions/getReactions.ts index 74bd05a52..57f085b72 100644 --- a/packages/bot/src/helpers/messages/reactions/getReactions.ts +++ b/packages/bot/src/helpers/messages/reactions/getReactions.ts @@ -1,6 +1,6 @@ +import { DiscordUser } from '@discordeno/types' import type { Bot } from '../../../bot.js' import { User } from '../../../transformers/member.js' -import { DiscordUser } from '../../../types/discord.js' import { BigString } from '../../../types/shared.js' import { Collection } from '../../../util/collection.js' diff --git a/packages/bot/src/helpers/messages/reactions/mod.ts b/packages/bot/src/helpers/messages/reactions/index.ts similarity index 100% rename from packages/bot/src/helpers/messages/reactions/mod.ts rename to packages/bot/src/helpers/messages/reactions/index.ts diff --git a/packages/bot/src/helpers/messages/sendMessage.ts b/packages/bot/src/helpers/messages/sendMessage.ts index 0d2d0b849..01f90330f 100644 --- a/packages/bot/src/helpers/messages/sendMessage.ts +++ b/packages/bot/src/helpers/messages/sendMessage.ts @@ -1,9 +1,8 @@ +import { BigString, DiscordMessage, MessageComponentTypes } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Embed } from '../../transformers/embed.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { AllowedMentions, FileContent, MessageComponents } from '../../types/mod.js' -import { BigString, MessageComponentTypes } from '../../types/shared.js' +import { AllowedMentions, FileContent, MessageComponents } from '../../types/index.js' /** * Sends a message to a channel. diff --git a/packages/bot/src/helpers/messages/unpinMessage.ts b/packages/bot/src/helpers/messages/unpinMessage.ts index 8647e4ac5..6a539aa6f 100644 --- a/packages/bot/src/helpers/messages/unpinMessage.ts +++ b/packages/bot/src/helpers/messages/unpinMessage.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Unpins a pinned message in a channel. diff --git a/packages/bot/src/helpers/misc/editBotProfile.ts b/packages/bot/src/helpers/misc/editBotProfile.ts index 952f373d2..812ed0dc9 100644 --- a/packages/bot/src/helpers/misc/editBotProfile.ts +++ b/packages/bot/src/helpers/misc/editBotProfile.ts @@ -1,6 +1,6 @@ +import { DiscordUser } from '@discordeno/types' import type { Bot } from '../../bot.js' import { User } from '../../transformers/member.js' -import { DiscordUser } from '../../types/discord.js' /** * Modifies the bot's username or avatar. diff --git a/packages/bot/src/helpers/misc/editShardStatus.ts b/packages/bot/src/helpers/misc/editShardStatus.ts index b62165925..6e705515c 100644 --- a/packages/bot/src/helpers/misc/editShardStatus.ts +++ b/packages/bot/src/helpers/misc/editShardStatus.ts @@ -1,6 +1,6 @@ +import { GatewayOpcodes, PresenceStatus } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Activity } from '../../transformers/activity.js' -import { GatewayOpcodes, PresenceStatus } from '../../types/shared.js' export async function editShardStatus (bot: Bot, shardId: number, data: StatusUpdate): Promise { const shard = bot.gateway.manager.shards.get(shardId) @@ -8,7 +8,7 @@ export async function editShardStatus (bot: Bot, shardId: number, data: StatusUp throw new Error(`Shard (id: ${shardId}) not found.`) } - return await shard.send({ + return shard.send({ op: GatewayOpcodes.PresenceUpdate, d: { since: null, @@ -64,7 +64,7 @@ export async function editShardStatus (bot: Bot, shardId: number, data: StatusUp }) } -/** https://discord.com/developers/docs/topics/gateway#update-status */ +/** https://discord.com/developers/docs/topics/gateway-events#update-presence */ export interface StatusUpdate { // /** Unix time (in milliseconds) of when the client went idle, or null if the client is not idle */ // since: number | null; diff --git a/packages/bot/src/helpers/misc/getApplicationInfo.ts b/packages/bot/src/helpers/misc/getApplicationInfo.ts index 4fe001fc8..e64432b9d 100644 --- a/packages/bot/src/helpers/misc/getApplicationInfo.ts +++ b/packages/bot/src/helpers/misc/getApplicationInfo.ts @@ -1,6 +1,6 @@ +import { DiscordApplication } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Application } from '../../transformers/application.js' -import { DiscordApplication } from '../../types/discord.js' /** Get the applications info */ export async function getApplicationInfo (bot: Bot): Promise { diff --git a/packages/bot/src/helpers/misc/getGatewayBot.ts b/packages/bot/src/helpers/misc/getGatewayBot.ts index 5d28a89c8..9b3b96f56 100644 --- a/packages/bot/src/helpers/misc/getGatewayBot.ts +++ b/packages/bot/src/helpers/misc/getGatewayBot.ts @@ -1,6 +1,6 @@ +import { DiscordGetGatewayBot } from '@discordeno/types' import type { Bot } from '../../bot.js' import { GetGatewayBot } from '../../transformers/gatewayBot.js' -import { DiscordGetGatewayBot } from '../../types/discord.js' /** Get the bots Gateway metadata that can help during the operation of large or sharded bots. */ export async function getGatewayBot (bot: Bot): Promise { diff --git a/packages/bot/src/helpers/misc/getNitroStickerPacks.ts b/packages/bot/src/helpers/misc/getNitroStickerPacks.ts index d8db44eb7..61a2eae58 100644 --- a/packages/bot/src/helpers/misc/getNitroStickerPacks.ts +++ b/packages/bot/src/helpers/misc/getNitroStickerPacks.ts @@ -1,6 +1,6 @@ +import { DiscordStickerPack } from '@discordeno/types' import { Bot } from '../../bot.js' import { StickerPack } from '../../transformers/sticker.js' -import { DiscordStickerPack } from '../../types/discord.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/misc/getUser.ts b/packages/bot/src/helpers/misc/getUser.ts index e22cc3e94..868d7a631 100644 --- a/packages/bot/src/helpers/misc/getUser.ts +++ b/packages/bot/src/helpers/misc/getUser.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordUser } from '@discordeno/types' import type { Bot } from '../../bot.js' import { User } from '../../transformers/member.js' -import { DiscordUser } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** This function will return the raw user payload in the rare cases you need to fetch a user directly from the API. */ export async function getUser (bot: Bot, userId: BigString): Promise { diff --git a/packages/bot/src/helpers/misc/mod.ts b/packages/bot/src/helpers/misc/index.ts similarity index 100% rename from packages/bot/src/helpers/misc/mod.ts rename to packages/bot/src/helpers/misc/index.ts diff --git a/packages/bot/src/helpers/mod.ts b/packages/bot/src/helpers/mod.ts deleted file mode 100644 index 2f2f24e06..000000000 --- a/packages/bot/src/helpers/mod.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from './channels/mod.js' -export * from './emojis/mod.js' -export * from './guilds/mod.js' -export * from './interactions/mod.js' -export * from './members/mod.js' -export * from './messages/mod.js' -export * from './misc/mod.js' -export * from './roles/mod.js' -export * from './stickers/mod.js' -export * from './templates/mod.js' -export * from './webhooks/mod.js' diff --git a/packages/bot/src/helpers/roles/addRole.ts b/packages/bot/src/helpers/roles/addRole.ts index 23f3b5de3..37cfbce53 100644 --- a/packages/bot/src/helpers/roles/addRole.ts +++ b/packages/bot/src/helpers/roles/addRole.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Adds a role to a member. diff --git a/packages/bot/src/helpers/roles/createRole.ts b/packages/bot/src/helpers/roles/createRole.ts index ae3c2fb6c..ef6cbf3e7 100644 --- a/packages/bot/src/helpers/roles/createRole.ts +++ b/packages/bot/src/helpers/roles/createRole.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordRole, PermissionStrings } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Role } from '../../transformers/role.js' -import { DiscordRole } from '../../types/discord.js' -import { BigString, PermissionStrings } from '../../types/shared.js' /** * Creates a role in a guild. diff --git a/packages/bot/src/helpers/roles/deleteRole.ts b/packages/bot/src/helpers/roles/deleteRole.ts index e0783658b..e9a3a8a20 100644 --- a/packages/bot/src/helpers/roles/deleteRole.ts +++ b/packages/bot/src/helpers/roles/deleteRole.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a role from a guild. diff --git a/packages/bot/src/helpers/roles/editRole.ts b/packages/bot/src/helpers/roles/editRole.ts index c909fadbf..8d57dce96 100644 --- a/packages/bot/src/helpers/roles/editRole.ts +++ b/packages/bot/src/helpers/roles/editRole.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordRole, PermissionStrings } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Role } from '../../transformers/role.js' -import { DiscordRole } from '../../types/discord.js' -import { BigString, PermissionStrings } from '../../types/shared.js' /** * Edits a role in a guild. diff --git a/packages/bot/src/helpers/roles/editRolePositions.ts b/packages/bot/src/helpers/roles/editRolePositions.ts index 50afef735..5e8eb0222 100644 --- a/packages/bot/src/helpers/roles/editRolePositions.ts +++ b/packages/bot/src/helpers/roles/editRolePositions.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordRole } from '@discordeno/types' import { Bot } from '../../bot.js' import { Role } from '../../transformers/role.js' -import { DiscordRole } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/roles/getRoles.ts b/packages/bot/src/helpers/roles/getRoles.ts index 79b15afa1..54067dfc7 100644 --- a/packages/bot/src/helpers/roles/getRoles.ts +++ b/packages/bot/src/helpers/roles/getRoles.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordRole } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Role } from '../../transformers/role.js' -import { DiscordRole } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/roles/mod.ts b/packages/bot/src/helpers/roles/index.ts similarity index 100% rename from packages/bot/src/helpers/roles/mod.ts rename to packages/bot/src/helpers/roles/index.ts diff --git a/packages/bot/src/helpers/roles/removeRole.ts b/packages/bot/src/helpers/roles/removeRole.ts index 1d95d1b40..f72db1e8c 100644 --- a/packages/bot/src/helpers/roles/removeRole.ts +++ b/packages/bot/src/helpers/roles/removeRole.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Removes a role from a member. diff --git a/packages/bot/src/helpers/stickers/createGuildSticker.ts b/packages/bot/src/helpers/stickers/createGuildSticker.ts index 205222a5d..0df435564 100644 --- a/packages/bot/src/helpers/stickers/createGuildSticker.ts +++ b/packages/bot/src/helpers/stickers/createGuildSticker.ts @@ -1,6 +1,6 @@ +import { FileContent, WithReason } from '@discordeno/types' import { Bot } from '../../bot.js' import { Sticker } from '../../transformers/sticker.js' -import { FileContent, WithReason } from '../../types/discordeno.js' /** * Create a new sticker for the guild. diff --git a/packages/bot/src/helpers/stickers/editGuildSticker.ts b/packages/bot/src/helpers/stickers/editGuildSticker.ts index 8c97c114c..9f480f18a 100644 --- a/packages/bot/src/helpers/stickers/editGuildSticker.ts +++ b/packages/bot/src/helpers/stickers/editGuildSticker.ts @@ -1,7 +1,6 @@ +import { AtLeastOne, WithReason } from '@discordeno/types' import { Bot } from '../../bot.js' import { Sticker } from '../../transformers/sticker.js' -import { WithReason } from '../../types/discordeno.js' -import { AtLeastOne } from '../../types/shared.js' /** * Edit the given sticker. diff --git a/packages/bot/src/helpers/stickers/getGuildSticker.ts b/packages/bot/src/helpers/stickers/getGuildSticker.ts index 6ebc892ff..9adc02956 100644 --- a/packages/bot/src/helpers/stickers/getGuildSticker.ts +++ b/packages/bot/src/helpers/stickers/getGuildSticker.ts @@ -1,4 +1,4 @@ -import { Bot, Sticker } from '../../mod.js' +import { Bot, Sticker } from '../../index.js' /** * Returns a sticker object for the given guild and sticker IDs. diff --git a/packages/bot/src/helpers/stickers/getGuildStickers.ts b/packages/bot/src/helpers/stickers/getGuildStickers.ts index 9854f1d9b..df53e9368 100644 --- a/packages/bot/src/helpers/stickers/getGuildStickers.ts +++ b/packages/bot/src/helpers/stickers/getGuildStickers.ts @@ -1,6 +1,6 @@ +import { DiscordSticker } from '@discordeno/types' import { Bot } from '../../bot.js' -import { Collection, Sticker } from '../../mod.js' -import { DiscordSticker } from '../../types/discord.js' +import { Collection, Sticker } from '../../index.js' /** * Returns an array of sticker objects for the given guild. diff --git a/packages/bot/src/helpers/stickers/getSticker.ts b/packages/bot/src/helpers/stickers/getSticker.ts index bc993d42c..4e5b0bf99 100644 --- a/packages/bot/src/helpers/stickers/getSticker.ts +++ b/packages/bot/src/helpers/stickers/getSticker.ts @@ -1,6 +1,6 @@ +import { DiscordSticker } from '@discordeno/types' import { Bot } from '../../bot.js' -import { Sticker } from '../../mod.js' -import { DiscordSticker } from '../../types/discord.js' +import { Sticker } from '../../index.js' /** * Returns a sticker object for the given sticker ID. diff --git a/packages/bot/src/helpers/stickers/mod.ts b/packages/bot/src/helpers/stickers/index.ts similarity index 100% rename from packages/bot/src/helpers/stickers/mod.ts rename to packages/bot/src/helpers/stickers/index.ts diff --git a/packages/bot/src/helpers/templates/createGuildFromTemplate.ts b/packages/bot/src/helpers/templates/createGuildFromTemplate.ts index a7e7a4a09..9a3420c34 100644 --- a/packages/bot/src/helpers/templates/createGuildFromTemplate.ts +++ b/packages/bot/src/helpers/templates/createGuildFromTemplate.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../bot.js' import { Guild } from '../../transformers/guild.js' -import { DiscordGuild } from '../../types/discord.js' +import { DiscordGuild } from '@discordeno/types' /** * Creates a guild from a template. diff --git a/packages/bot/src/helpers/templates/createGuildTemplate.ts b/packages/bot/src/helpers/templates/createGuildTemplate.ts index 301fd5a00..daf1163b2 100644 --- a/packages/bot/src/helpers/templates/createGuildTemplate.ts +++ b/packages/bot/src/helpers/templates/createGuildTemplate.ts @@ -1,7 +1,7 @@ import type { Bot } from '../../bot.js' import { Template } from '../../transformers/template.js' -import { DiscordTemplate } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' +import { DiscordTemplate } from '@discordeno/types' +import { BigString } from '@discordeno/types' /** * Creates a template from a guild. diff --git a/packages/bot/src/helpers/templates/deleteGuildTemplate.ts b/packages/bot/src/helpers/templates/deleteGuildTemplate.ts index 114e20313..e6f535404 100644 --- a/packages/bot/src/helpers/templates/deleteGuildTemplate.ts +++ b/packages/bot/src/helpers/templates/deleteGuildTemplate.ts @@ -1,5 +1,5 @@ import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' +import { BigString } from '@discordeno/types' /** * Deletes a template from a guild. diff --git a/packages/bot/src/helpers/templates/editGuildTemplate.ts b/packages/bot/src/helpers/templates/editGuildTemplate.ts index fbdf16dce..a99cb5507 100644 --- a/packages/bot/src/helpers/templates/editGuildTemplate.ts +++ b/packages/bot/src/helpers/templates/editGuildTemplate.ts @@ -1,7 +1,7 @@ import type { Bot } from '../../bot.js' import { Template } from '../../transformers/template.js' -import { DiscordTemplate } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' +import { DiscordTemplate } from '@discordeno/types' +import { BigString } from '@discordeno/types' /** * Edits a template's settings. diff --git a/packages/bot/src/helpers/templates/getGuildTemplate.ts b/packages/bot/src/helpers/templates/getGuildTemplate.ts index fc78ec3d9..5a670cbeb 100644 --- a/packages/bot/src/helpers/templates/getGuildTemplate.ts +++ b/packages/bot/src/helpers/templates/getGuildTemplate.ts @@ -1,6 +1,6 @@ import type { Bot } from '../../bot.js' import { Template } from '../../transformers/template.js' -import { DiscordTemplate } from '../../types/discord.js' +import { DiscordTemplate } from '@discordeno/types' /** * Gets a template by its code. diff --git a/packages/bot/src/helpers/templates/getGuildTemplates.ts b/packages/bot/src/helpers/templates/getGuildTemplates.ts index 4f5e472b7..4f9d388f4 100644 --- a/packages/bot/src/helpers/templates/getGuildTemplates.ts +++ b/packages/bot/src/helpers/templates/getGuildTemplates.ts @@ -1,7 +1,7 @@ import type { Bot } from '../../bot.js' import { Template } from '../../transformers/template.js' -import { DiscordTemplate } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' +import { DiscordTemplate } from '@discordeno/types' +import { BigString } from '@discordeno/types' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/templates/mod.ts b/packages/bot/src/helpers/templates/index.ts similarity index 100% rename from packages/bot/src/helpers/templates/mod.ts rename to packages/bot/src/helpers/templates/index.ts diff --git a/packages/bot/src/helpers/templates/syncGuildTemplate.ts b/packages/bot/src/helpers/templates/syncGuildTemplate.ts index bfdb80dcb..dd378a02f 100644 --- a/packages/bot/src/helpers/templates/syncGuildTemplate.ts +++ b/packages/bot/src/helpers/templates/syncGuildTemplate.ts @@ -1,7 +1,7 @@ import type { Bot } from '../../bot.js' import { Template } from '../../transformers/template.js' -import { DiscordTemplate } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' +import { DiscordTemplate } from '@discordeno/types' +import { BigString } from '@discordeno/types' /** * Synchronises a template with the current state of a guild. diff --git a/packages/bot/src/helpers/webhooks/createWebhook.ts b/packages/bot/src/helpers/webhooks/createWebhook.ts index 909536e25..2b6fcae0c 100644 --- a/packages/bot/src/helpers/webhooks/createWebhook.ts +++ b/packages/bot/src/helpers/webhooks/createWebhook.ts @@ -1,7 +1,7 @@ +import { DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' +import { BigString, WithReason } from '../../index.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' /** * Creates a webhook. diff --git a/packages/bot/src/helpers/webhooks/deleteWebhook.ts b/packages/bot/src/helpers/webhooks/deleteWebhook.ts index 9876a6327..21b530294 100644 --- a/packages/bot/src/helpers/webhooks/deleteWebhook.ts +++ b/packages/bot/src/helpers/webhooks/deleteWebhook.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a webhook. diff --git a/packages/bot/src/helpers/webhooks/deleteWebhookMessage.ts b/packages/bot/src/helpers/webhooks/deleteWebhookMessage.ts index 500a62d55..ed247307f 100644 --- a/packages/bot/src/helpers/webhooks/deleteWebhookMessage.ts +++ b/packages/bot/src/helpers/webhooks/deleteWebhookMessage.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a webhook message. diff --git a/packages/bot/src/helpers/webhooks/deleteWebhookWithToken.ts b/packages/bot/src/helpers/webhooks/deleteWebhookWithToken.ts index f7053c2b0..b5423ff36 100644 --- a/packages/bot/src/helpers/webhooks/deleteWebhookWithToken.ts +++ b/packages/bot/src/helpers/webhooks/deleteWebhookWithToken.ts @@ -1,5 +1,5 @@ +import { BigString } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString } from '../../types/shared.js' /** * Deletes a webhook message using the webhook token, thereby bypassing the need for authentication + permissions. diff --git a/packages/bot/src/helpers/webhooks/editOriginalWebhookMessage.ts b/packages/bot/src/helpers/webhooks/editOriginalWebhookMessage.ts index ee4f9ec55..72993b6e3 100644 --- a/packages/bot/src/helpers/webhooks/editOriginalWebhookMessage.ts +++ b/packages/bot/src/helpers/webhooks/editOriginalWebhookMessage.ts @@ -1,7 +1,7 @@ +import { DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString, InteractionCallbackData, InteractionResponseTypes } from '../../types/mod.js' +import { BigString, InteractionCallbackData, InteractionResponseTypes } from '../../types/index.js' /** * Edits the original webhook message. diff --git a/packages/bot/src/helpers/webhooks/editWebhook.ts b/packages/bot/src/helpers/webhooks/editWebhook.ts index 8123bad8e..3d773a92d 100644 --- a/packages/bot/src/helpers/webhooks/editWebhook.ts +++ b/packages/bot/src/helpers/webhooks/editWebhook.ts @@ -1,7 +1,7 @@ +import { DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { BigString, WithReason } from '../../mod.js' +import { BigString, WithReason } from '../../index.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' /** * Edits a webhook. diff --git a/packages/bot/src/helpers/webhooks/editWebhookMessage.ts b/packages/bot/src/helpers/webhooks/editWebhookMessage.ts index 236d74d5a..826b07b44 100644 --- a/packages/bot/src/helpers/webhooks/editWebhookMessage.ts +++ b/packages/bot/src/helpers/webhooks/editWebhookMessage.ts @@ -1,8 +1,6 @@ +import { BigString, DiscordMessage, InteractionCallbackData, InteractionResponseTypes } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { InteractionCallbackData } from '../../types/discordeno.js' -import { BigString, InteractionResponseTypes } from '../../types/shared.js' /** * Edits a webhook message. diff --git a/packages/bot/src/helpers/webhooks/editWebhookWithToken.ts b/packages/bot/src/helpers/webhooks/editWebhookWithToken.ts index 75963fd32..40aeff64f 100644 --- a/packages/bot/src/helpers/webhooks/editWebhookWithToken.ts +++ b/packages/bot/src/helpers/webhooks/editWebhookWithToken.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { ModifyWebhook } from './editWebhook.js' /** diff --git a/packages/bot/src/helpers/webhooks/executeWebhook.ts b/packages/bot/src/helpers/webhooks/executeWebhook.ts index ea61dc6ac..47289abdb 100644 --- a/packages/bot/src/helpers/webhooks/executeWebhook.ts +++ b/packages/bot/src/helpers/webhooks/executeWebhook.ts @@ -1,9 +1,7 @@ +import { AllowedMentions, BigString, DiscordMessage, FileContent, MessageComponents } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Embed } from '../../transformers/embed.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { AllowedMentions, FileContent, MessageComponents } from '../../types/discordeno.js' -import { BigString } from '../../types/shared.js' export const sendWebhookMessage = executeWebhook diff --git a/packages/bot/src/helpers/webhooks/getChannelWebhooks.ts b/packages/bot/src/helpers/webhooks/getChannelWebhooks.ts index 381d60218..191383ac9 100644 --- a/packages/bot/src/helpers/webhooks/getChannelWebhooks.ts +++ b/packages/bot/src/helpers/webhooks/getChannelWebhooks.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/webhooks/getGuildWebhooks.ts b/packages/bot/src/helpers/webhooks/getGuildWebhooks.ts index 18f6ae8a6..856935ce8 100644 --- a/packages/bot/src/helpers/webhooks/getGuildWebhooks.ts +++ b/packages/bot/src/helpers/webhooks/getGuildWebhooks.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' import { Collection } from '../../util/collection.js' /** diff --git a/packages/bot/src/helpers/webhooks/getWebhook.ts b/packages/bot/src/helpers/webhooks/getWebhook.ts index a5a5e112f..b2fb0ba35 100644 --- a/packages/bot/src/helpers/webhooks/getWebhook.ts +++ b/packages/bot/src/helpers/webhooks/getWebhook.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets a webhook by its ID. diff --git a/packages/bot/src/helpers/webhooks/getWebhookMessage.ts b/packages/bot/src/helpers/webhooks/getWebhookMessage.ts index 1baed6385..72972646c 100644 --- a/packages/bot/src/helpers/webhooks/getWebhookMessage.ts +++ b/packages/bot/src/helpers/webhooks/getWebhookMessage.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordMessage } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Message } from '../../transformers/message.js' -import { DiscordMessage } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' export interface GetWebhookMessageOptions { threadId: BigString diff --git a/packages/bot/src/helpers/webhooks/getWebhookWithToken.ts b/packages/bot/src/helpers/webhooks/getWebhookWithToken.ts index 457b8d2ef..f7932ea4b 100644 --- a/packages/bot/src/helpers/webhooks/getWebhookWithToken.ts +++ b/packages/bot/src/helpers/webhooks/getWebhookWithToken.ts @@ -1,7 +1,6 @@ +import { BigString, DiscordWebhook } from '@discordeno/types' import type { Bot } from '../../bot.js' import { Webhook } from '../../transformers/webhook.js' -import { DiscordWebhook } from '../../types/discord.js' -import { BigString } from '../../types/shared.js' /** * Gets a webhook using the webhook token, thereby bypassing the need for authentication + permissions. diff --git a/packages/bot/src/helpers/webhooks/mod.ts b/packages/bot/src/helpers/webhooks/index.ts similarity index 100% rename from packages/bot/src/helpers/webhooks/mod.ts rename to packages/bot/src/helpers/webhooks/index.ts diff --git a/packages/bot/src/index.ts b/packages/bot/src/index.ts new file mode 100644 index 000000000..af342916a --- /dev/null +++ b/packages/bot/src/index.ts @@ -0,0 +1,4 @@ +export * from './bot.js' +export * from './transformers/index.js' +export * from './types.js' +export * from './utils/index.js' diff --git a/packages/bot/src/plugins/cache/deps.ts b/packages/bot/src/plugins/cache/deps.ts index 500eab45b..cbba4b3bf 100644 --- a/packages/bot/src/plugins/cache/deps.ts +++ b/packages/bot/src/plugins/cache/deps.ts @@ -1 +1 @@ -export * from '../../mod.js' +export * from '../../index.js' diff --git a/packages/bot/src/plugins/fileloader/deps.ts b/packages/bot/src/plugins/fileloader/deps.ts index 500eab45b..cbba4b3bf 100644 --- a/packages/bot/src/plugins/fileloader/deps.ts +++ b/packages/bot/src/plugins/fileloader/deps.ts @@ -1 +1 @@ -export * from '../../mod.js' +export * from '../../index.js' diff --git a/packages/bot/src/plugins/helpers/deps.ts b/packages/bot/src/plugins/helpers/deps.ts index 500eab45b..cbba4b3bf 100644 --- a/packages/bot/src/plugins/helpers/deps.ts +++ b/packages/bot/src/plugins/helpers/deps.ts @@ -1 +1 @@ -export * from '../../mod.js' +export * from '../../index.js' diff --git a/packages/bot/src/plugins/mod.ts b/packages/bot/src/plugins/mod.ts index 35ad3e5f6..82c422482 100644 --- a/packages/bot/src/plugins/mod.ts +++ b/packages/bot/src/plugins/mod.ts @@ -1,5 +1,5 @@ -export * from './cache/mod.js' -export * from './fileloader/mod.js' -export * from './helpers/mod.js' -export * from './permissions/mod.js' -export * from './validations/mod.js' +export * from './cache/index.js' +export * from './fileloader/index.js' +export * from './helpers/index.js' +export * from './permissions/index.js' +export * from './validations/index.js' diff --git a/packages/bot/src/plugins/permissions/deps.ts b/packages/bot/src/plugins/permissions/deps.ts index 97e031653..7b4a87878 100644 --- a/packages/bot/src/plugins/permissions/deps.ts +++ b/packages/bot/src/plugins/permissions/deps.ts @@ -1,2 +1,2 @@ -export * from '../../mod.js' -export type { BotWithCache } from '../cache/mod.js' +export * from '../../index.js' +export type { BotWithCache } from '../cache/index.js' diff --git a/packages/bot/src/plugins/permissions/mod.ts b/packages/bot/src/plugins/permissions/mod.ts index f638c5a5a..b33dd08fa 100644 --- a/packages/bot/src/plugins/permissions/mod.ts +++ b/packages/bot/src/plugins/permissions/mod.ts @@ -1,13 +1,13 @@ import { BotWithCache } from './deps.js' -import { channels } from './src/channels/mod.js' -import { emojis } from './src/emojis/mod.js' -import { guilds } from './src/guilds/mod.js' -import { integrations } from './src/integrations/mod.js' -import { members } from './src/members/mod.js' -import { messages } from './src/messages/mod.js' -import { roles } from './src/roles/mod.js' -import { stickers } from './src/stickers/mod.js' -import { webhooks } from './src/webhooks/mod.js' +import { channels } from './src/channels/index.js' +import { emojis } from './src/emojis/index.js' +import { guilds } from './src/guilds/index.js' +import { integrations } from './src/integrations/index.js' +import { members } from './src/members/index.js' +import { messages } from './src/messages/index.js' +import { roles } from './src/roles/index.js' +import { stickers } from './src/stickers/index.js' +import { webhooks } from './src/webhooks/index.js' // PLUGINS MUST TAKE A BOT ARGUMENT WHICH WILL BE MODIFIED export function enablePermissionsPlugin (bot: B): B { diff --git a/packages/bot/src/plugins/permissions/src/channels/mod.ts b/packages/bot/src/plugins/permissions/src/channels/mod.ts index 8d9b9677c..0a2fc07c6 100644 --- a/packages/bot/src/plugins/permissions/src/channels/mod.ts +++ b/packages/bot/src/plugins/permissions/src/channels/mod.ts @@ -5,11 +5,11 @@ import { deleteChannelPermissionOverride } from './deleteChannelPermissionOverri import { editChannel } from './editChannel.js' import { editChannelPermissionOverrides } from './editChannelPermissionOverrides.js' import { followAnnouncementChannel } from './followAnnouncementChannel.js' -import { forums } from './forums/mod.js' +import { forums } from './forums/index.js' import { getChannelWebhooks } from './getChannelWebhooks.js' -import { stages } from './stages/mod.js' +import { stages } from './stages/index.js' import { swapChannels } from './swapChannels.js' -import { threads } from './threads/mod.js' +import { threads } from './threads/index.js' export function channels (bot: BotWithCache) { forums(bot) diff --git a/packages/bot/src/plugins/permissions/src/guilds/mod.ts b/packages/bot/src/plugins/permissions/src/guilds/mod.ts index fcab31e7c..286330685 100644 --- a/packages/bot/src/plugins/permissions/src/guilds/mod.ts +++ b/packages/bot/src/plugins/permissions/src/guilds/mod.ts @@ -1,19 +1,19 @@ import { BotWithCache } from '../../deps.js' -import { automod } from './automod/mod.js' +import { automod } from './automod/index.js' import { createGuild } from './createGuild.js' import { deleteGuild } from './deleteGuild.js' import { editGuild } from './editGuild.js' import { editGuildMfaLevel } from './editGuildMfaLevel.js' import { editWelcomeScreen } from './editWelcomeScreen.js' -import { events } from './events/mod.js' +import { events } from './events/index.js' import { getAuditLog } from './getAuditLog.js' import { getBan } from './getBan.js' import { getBans } from './getBans.js' import { getPruneCount } from './getPruneCount.js' import { getVanityUrl } from './getVanityUrl.js' import { getWelcomeScreen } from './getWelcomeScreen.js' -import { voice } from './voice/mod.js' -import { widgets } from './widgets/mod.js' +import { voice } from './voice/index.js' +import { widgets } from './widgets/index.js' export function guilds (bot: BotWithCache) { automod(bot) diff --git a/packages/bot/src/plugins/permissions/src/messages/mod.ts b/packages/bot/src/plugins/permissions/src/messages/mod.ts index b1ada9dbb..e48cdd890 100644 --- a/packages/bot/src/plugins/permissions/src/messages/mod.ts +++ b/packages/bot/src/plugins/permissions/src/messages/mod.ts @@ -4,7 +4,7 @@ import { deleteMessages } from './deleteMessages.js' import { getMessage } from './getMessage.js' import { getMessages } from './getMessages.js' import { pinMessage } from './pinMessage.js' -import { reactions } from './reactions/mod.js' +import { reactions } from './reactions/index.js' import { sendMessage } from './sendMessage.js' import { unpinMessage } from './unpinMessage.js' diff --git a/packages/bot/src/plugins/validations/deps.ts b/packages/bot/src/plugins/validations/deps.ts index 500eab45b..cbba4b3bf 100644 --- a/packages/bot/src/plugins/validations/deps.ts +++ b/packages/bot/src/plugins/validations/deps.ts @@ -1 +1 @@ -export * from '../../mod.js' +export * from '../../index.js' diff --git a/packages/bot/src/plugins/validations/mod.ts b/packages/bot/src/plugins/validations/mod.ts index 590d97130..7e286ab97 100644 --- a/packages/bot/src/plugins/validations/mod.ts +++ b/packages/bot/src/plugins/validations/mod.ts @@ -1,13 +1,13 @@ import { Bot } from './deps.js' -import { channels } from './src/channels/mod.js' -import { guilds } from './src/guilds/mod.js' -import { interactions } from './src/interaction/mod.js' -import { invites } from './src/invites/mod.js' -import { members } from './src/members/mod.js' -import { messages } from './src/messages/mod.js' -import { misc } from './src/misc/mod.js' -import { stickers } from './src/stickers/mod.js' -import { webhooks } from './src/webhooks/mod.js' +import { channels } from './src/channels/index.js' +import { guilds } from './src/guilds/index.js' +import { interactions } from './src/interaction/index.js' +import { invites } from './src/invites/index.js' +import { members } from './src/members/index.js' +import { messages } from './src/messages/index.js' +import { misc } from './src/misc/index.js' +import { stickers } from './src/stickers/index.js' +import { webhooks } from './src/webhooks/index.js' // PLUGINS MUST TAKE A BOT ARGUMENT WHICH WILL BE MODIFIED export function enableValidationsPlugin (bot: B): B { diff --git a/packages/bot/src/plugins/validations/src/channels/mod.ts b/packages/bot/src/plugins/validations/src/channels/mod.ts index d7083ae28..1afe3b080 100644 --- a/packages/bot/src/plugins/validations/src/channels/mod.ts +++ b/packages/bot/src/plugins/validations/src/channels/mod.ts @@ -1,5 +1,5 @@ import { Bot } from '../../deps.js' -import { threads } from './threads/mod.js' +import { threads } from './threads/index.js' export function channels (bot: Bot) { threads(bot) diff --git a/packages/bot/src/plugins/validations/src/guilds/mod.ts b/packages/bot/src/plugins/validations/src/guilds/mod.ts index 246c96b01..f727f0e2d 100644 --- a/packages/bot/src/plugins/validations/src/guilds/mod.ts +++ b/packages/bot/src/plugins/validations/src/guilds/mod.ts @@ -1,6 +1,6 @@ import { Bot } from '../../deps.js' import { createGuild } from './createGuild.js' -import { events } from './events/mod.js' +import { events } from './events/index.js' export function guilds (bot: Bot) { events(bot) diff --git a/packages/bot/src/plugins/validations/src/interaction/mod.ts b/packages/bot/src/plugins/validations/src/interaction/mod.ts index aa123dfec..ce027c428 100644 --- a/packages/bot/src/plugins/validations/src/interaction/mod.ts +++ b/packages/bot/src/plugins/validations/src/interaction/mod.ts @@ -1,6 +1,6 @@ import { Bot } from '../../deps.js' -import { commands } from './commands/mod.js' -import { responses } from './responses/mod.js' +import { commands } from './commands/index.js' +import { responses } from './responses/index.js' export function interactions (bot: Bot) { commands(bot) diff --git a/packages/bot/src/transformers/activity.ts b/packages/bot/src/transformers/activity.ts index 9b0e38c8b..b127eeb4d 100644 --- a/packages/bot/src/transformers/activity.ts +++ b/packages/bot/src/transformers/activity.ts @@ -1,7 +1,7 @@ +import { DiscordActivity, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordActivity } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformActivity (bot: Bot, payload: DiscordActivity) { const activity = { name: payload.name, diff --git a/packages/bot/src/transformers/application.ts b/packages/bot/src/transformers/application.ts index d8be0c8c9..e75b377ca 100644 --- a/packages/bot/src/transformers/application.ts +++ b/packages/bot/src/transformers/application.ts @@ -1,7 +1,7 @@ +import { DiscordApplication, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordApplication } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformApplication (bot: Bot, payload: DiscordApplication) { const application = { name: payload.name, diff --git a/packages/bot/src/transformers/applicationCommand.ts b/packages/bot/src/transformers/applicationCommand.ts index d64a2d7f9..b74fd2728 100644 --- a/packages/bot/src/transformers/applicationCommand.ts +++ b/packages/bot/src/transformers/applicationCommand.ts @@ -1,7 +1,7 @@ +import { DiscordApplicationCommand, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordApplicationCommand } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformApplicationCommand (bot: Bot, payload: DiscordApplicationCommand) { const applicationCommand = { id: bot.transformers.snowflake(payload.id), diff --git a/packages/bot/src/transformers/applicationCommandOption.ts b/packages/bot/src/transformers/applicationCommandOption.ts index 9d15e14ba..8f55e453b 100644 --- a/packages/bot/src/transformers/applicationCommandOption.ts +++ b/packages/bot/src/transformers/applicationCommandOption.ts @@ -1,6 +1,5 @@ +import { ApplicationCommandOptionTypes, ChannelTypes, DiscordApplicationCommandOption, Localization } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordApplicationCommandOption } from '../types/discord.js' -import { ApplicationCommandOptionTypes, ChannelTypes, Localization } from '../types/shared.js' import { ApplicationCommandOptionChoice } from './applicationCommandOptionChoice.js' export function transformApplicationCommandOption ( diff --git a/packages/bot/src/transformers/applicationCommandOptionChoice.ts b/packages/bot/src/transformers/applicationCommandOptionChoice.ts index df046452c..d92bc90c7 100644 --- a/packages/bot/src/transformers/applicationCommandOptionChoice.ts +++ b/packages/bot/src/transformers/applicationCommandOptionChoice.ts @@ -1,7 +1,7 @@ +import { DiscordApplicationCommandOptionChoice, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordApplicationCommandOptionChoice } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformApplicationCommandOptionChoice (bot: Bot, payload: DiscordApplicationCommandOptionChoice) { const applicationCommandChoice = { name: payload.name, diff --git a/packages/bot/src/transformers/applicationCommandPermission.ts b/packages/bot/src/transformers/applicationCommandPermission.ts index 5109e3f2a..703806047 100644 --- a/packages/bot/src/transformers/applicationCommandPermission.ts +++ b/packages/bot/src/transformers/applicationCommandPermission.ts @@ -1,7 +1,7 @@ +import { DiscordGuildApplicationCommandPermissions, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordGuildApplicationCommandPermissions } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformApplicationCommandPermission (bot: Bot, payload: DiscordGuildApplicationCommandPermissions) { const applicationCommandPermission = { id: bot.transformers.snowflake(payload.id), diff --git a/packages/bot/src/transformers/attachment.ts b/packages/bot/src/transformers/attachment.ts index 7f700ad7d..67ec4bd0b 100644 --- a/packages/bot/src/transformers/attachment.ts +++ b/packages/bot/src/transformers/attachment.ts @@ -1,7 +1,7 @@ +import { DiscordAttachment, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordAttachment } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformAttachment (bot: Bot, payload: DiscordAttachment) { const attachment = { id: bot.transformers.snowflake(payload.id), diff --git a/packages/bot/src/transformers/auditLogEntry.ts b/packages/bot/src/transformers/auditLogEntry.ts index 17d866ef2..bb31b556e 100644 --- a/packages/bot/src/transformers/auditLogEntry.ts +++ b/packages/bot/src/transformers/auditLogEntry.ts @@ -1,7 +1,7 @@ +import { DiscordAuditLogEntry, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordAuditLogEntry } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformAuditLogEntry (bot: Bot, payload: DiscordAuditLogEntry) { const auditLogEntry = { id: bot.transformers.snowflake(payload.id), diff --git a/packages/bot/src/transformers/automodActionExecution.ts b/packages/bot/src/transformers/automodActionExecution.ts index caf8e8afd..01eca9187 100644 --- a/packages/bot/src/transformers/automodActionExecution.ts +++ b/packages/bot/src/transformers/automodActionExecution.ts @@ -1,7 +1,7 @@ +import { DiscordAutoModerationActionExecution, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordAutoModerationActionExecution } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformAutoModerationActionExecution (bot: Bot, payload: DiscordAutoModerationActionExecution) { const rule = { content: payload.content, diff --git a/packages/bot/src/transformers/automodRule.ts b/packages/bot/src/transformers/automodRule.ts index 5fb82f670..acc195dfe 100644 --- a/packages/bot/src/transformers/automodRule.ts +++ b/packages/bot/src/transformers/automodRule.ts @@ -1,7 +1,7 @@ +import { DiscordAutoModerationRule, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordAutoModerationRule } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformAutoModerationRule (bot: Bot, payload: DiscordAutoModerationRule) { const rule = { name: payload.name, diff --git a/packages/bot/src/transformers/channel.ts b/packages/bot/src/transformers/channel.ts index 65e8055ae..96adae5b2 100644 --- a/packages/bot/src/transformers/channel.ts +++ b/packages/bot/src/transformers/channel.ts @@ -1,24 +1,24 @@ +import { DiscordChannel, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordChannel } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' const Mask = (1n << 64n) - 1n -export function packOverwrites (allow: string, deny: string, id: string, type: number) { +export function packOverwrites (allow: string, deny: string, id: string, type: number): bigint { return pack64(allow, 0) | pack64(deny, 1) | pack64(id, 2) | pack64(type, 3) } -function unpack64 (v: bigint, shift: number) { +function unpack64 (v: bigint, shift: number): bigint { return (v >> BigInt(shift * 64)) & Mask } -function pack64 (v: string | number, shift: number) { +function pack64 (v: string | number, shift: number): bigint { const b = BigInt(v) - if (b < 0 || b > Mask) throw new Error('should have been a 64 bit unsigned integer: ' + v) + if (b < 0 || b > Mask) throw new Error(`should have been a 64 bit unsigned integer: ${v}`) return b << BigInt(shift * 64) } -export function separateOverwrites (v: bigint) { +export function separateOverwrites (v: bigint): [number, bigint, bigint, bigint] { return [Number(unpack64(v, 3)), unpack64(v, 2), unpack64(v, 0), unpack64(v, 1)] as [number, bigint, bigint, bigint] } +// eslint-disable-next-line @typescript-eslint/explicit-function-return-type export function transformChannel (bot: Bot, payload: { channel: DiscordChannel } & { guildId?: bigint }) { const channel = { // UNTRANSFORMED STUFF HERE diff --git a/packages/bot/src/transformers/component.ts b/packages/bot/src/transformers/component.ts index 8a8322fdf..bd130da6d 100644 --- a/packages/bot/src/transformers/component.ts +++ b/packages/bot/src/transformers/component.ts @@ -1,6 +1,6 @@ +import { DiscordComponent } from '@discordeno/types' import { Bot } from '../bot.js' -import { ButtonStyles, MessageComponentTypes, SelectOption, TextStyles } from '../mod.js' -import { DiscordComponent } from '../types/discord.js' +import { ButtonStyles, MessageComponentTypes, SelectOption, TextStyles } from '../index.js' export function transformComponent (bot: Bot, payload: DiscordComponent): Component { return { diff --git a/packages/bot/src/transformers/embed.ts b/packages/bot/src/transformers/embed.ts index 9595f281b..913cdbbe8 100644 --- a/packages/bot/src/transformers/embed.ts +++ b/packages/bot/src/transformers/embed.ts @@ -1,6 +1,5 @@ +import { DiscordEmbed, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordEmbed } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformEmbed (bot: Bot, payload: DiscordEmbed) { const embed = { diff --git a/packages/bot/src/transformers/emoji.ts b/packages/bot/src/transformers/emoji.ts index 704545655..7fb94844e 100644 --- a/packages/bot/src/transformers/emoji.ts +++ b/packages/bot/src/transformers/emoji.ts @@ -1,6 +1,5 @@ +import { DiscordEmoji, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordEmoji } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { EmojiToggles } from './toggles/emoji.js' export function transformEmoji (bot: Bot, payload: DiscordEmoji) { diff --git a/packages/bot/src/transformers/gatewayBot.ts b/packages/bot/src/transformers/gatewayBot.ts index 99ffd5095..aa234a88b 100644 --- a/packages/bot/src/transformers/gatewayBot.ts +++ b/packages/bot/src/transformers/gatewayBot.ts @@ -1,7 +1,6 @@ -import { DiscordGetGatewayBot } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' +import { DiscordGetGatewayBot, GetGatewayBot, Optionalize } from '@discordeno/types' -export function transformGatewayBot (payload: DiscordGetGatewayBot) { +export function transformGatewayBot (payload: DiscordGetGatewayBot): GetGatewayBot { const gatewayBot = { url: payload.url, shards: payload.shards, @@ -15,5 +14,3 @@ export function transformGatewayBot (payload: DiscordGetGatewayBot) { return gatewayBot as Optionalize } - -export interface GetGatewayBot extends ReturnType { } diff --git a/packages/bot/src/transformers/guild.ts b/packages/bot/src/transformers/guild.ts index 08aec579e..42e78a3e9 100644 --- a/packages/bot/src/transformers/guild.ts +++ b/packages/bot/src/transformers/guild.ts @@ -1,7 +1,6 @@ +import { DiscordGuild, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' import type { Emoji } from '../transformers/emoji.js' -import { DiscordGuild } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { Collection } from '../util/collection.js' import { GuildToggles } from './toggles/guild.js' diff --git a/packages/bot/src/transformers/mod.ts b/packages/bot/src/transformers/index.ts similarity index 88% rename from packages/bot/src/transformers/mod.ts rename to packages/bot/src/transformers/index.ts index 6680b1a4e..ecc68e01f 100644 --- a/packages/bot/src/transformers/mod.ts +++ b/packages/bot/src/transformers/index.ts @@ -6,6 +6,8 @@ export * from './applicationCommandOptionChoice.js' export * from './applicationCommandPermission.js' export * from './attachment.js' export * from './auditLogEntry.js' +export * from './automodActionExecution.js' +export * from './automodRule.js' export * from './channel.js' export * from './component.js' export * from './embed.js' @@ -18,7 +20,7 @@ export * from './invite.js' export * from './member.js' export * from './message.js' export * from './presence.js' -export * from './reverse/mod.js' +export * from './reverse/index.js' export * from './role.js' export * from './scheduledEvent.js' export * from './stageInstance.js' @@ -26,7 +28,7 @@ export * from './sticker.js' export * from './team.js' export * from './template.js' export * from './threadMember.js' -export * from './toggles/mod.js' +export * from './toggles/index.js' export * from './voiceRegion.js' export * from './voiceState.js' export * from './webhook.js' diff --git a/packages/bot/src/transformers/integration.ts b/packages/bot/src/transformers/integration.ts index dd984cea6..9e45e1996 100644 --- a/packages/bot/src/transformers/integration.ts +++ b/packages/bot/src/transformers/integration.ts @@ -1,6 +1,5 @@ +import { DiscordIntegrationCreateUpdate, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordIntegrationCreateUpdate } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformIntegration (bot: Bot, payload: DiscordIntegrationCreateUpdate) { const integration = { diff --git a/packages/bot/src/transformers/interaction.ts b/packages/bot/src/transformers/interaction.ts index 9dc3f3188..6990828ed 100644 --- a/packages/bot/src/transformers/interaction.ts +++ b/packages/bot/src/transformers/interaction.ts @@ -1,10 +1,9 @@ -import { Bot } from '../bot.js' import { - DiscordInteraction, + ChannelTypes, DiscordInteraction, DiscordInteractionDataOption, - DiscordInteractionDataResolved -} from '../types/discord.js' -import { ChannelTypes, Optionalize } from '../types/shared.js' + DiscordInteractionDataResolved, Optionalize +} from '@discordeno/types' +import { Bot } from '../bot.js' import { Collection } from '../util/collection.js' import { Attachment } from './attachment.js' import { Member, User } from './member.js' diff --git a/packages/bot/src/transformers/invite.ts b/packages/bot/src/transformers/invite.ts index 3300aee6b..040db1584 100644 --- a/packages/bot/src/transformers/invite.ts +++ b/packages/bot/src/transformers/invite.ts @@ -1,6 +1,5 @@ +import { DiscordInviteCreate, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordInviteCreate } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformInvite (bot: Bot, invite: DiscordInviteCreate) { const transformedInvite = { diff --git a/packages/bot/src/transformers/member.ts b/packages/bot/src/transformers/member.ts index b5cb11248..3bf064ccd 100644 --- a/packages/bot/src/transformers/member.ts +++ b/packages/bot/src/transformers/member.ts @@ -1,6 +1,5 @@ +import { DiscordMember, DiscordUser, Optionalize } from '@discordeno/types' import type { Bot } from '../bot.js' -import { DiscordMember, DiscordUser } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { MemberToggles } from './toggles/member.js' import { UserToggles } from './toggles/user.js' diff --git a/packages/bot/src/transformers/message.ts b/packages/bot/src/transformers/message.ts index c0f5ace37..3ec563e21 100644 --- a/packages/bot/src/transformers/message.ts +++ b/packages/bot/src/transformers/message.ts @@ -1,6 +1,5 @@ +import { DiscordMessage, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordMessage } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { CHANNEL_MENTION_REGEX } from '../util/constants.js' import { MemberToggles } from './toggles/member.js' diff --git a/packages/bot/src/transformers/presence.ts b/packages/bot/src/transformers/presence.ts index 01de5adb4..72a6f5b59 100644 --- a/packages/bot/src/transformers/presence.ts +++ b/packages/bot/src/transformers/presence.ts @@ -1,6 +1,5 @@ +import { DiscordPresenceUpdate, Optionalize, PresenceStatus } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordPresenceUpdate } from '../types/discord.js' -import { Optionalize, PresenceStatus } from '../types/shared.js' import { UserToggles } from './toggles/user.js' export function transformPresence (bot: Bot, payload: DiscordPresenceUpdate) { diff --git a/packages/bot/src/transformers/reverse/activity.ts b/packages/bot/src/transformers/reverse/activity.ts index c33034ea1..c8979a454 100644 --- a/packages/bot/src/transformers/reverse/activity.ts +++ b/packages/bot/src/transformers/reverse/activity.ts @@ -1,5 +1,5 @@ +import { DiscordActivity } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordActivity } from '../../types/discord.js' import { Activity } from '../activity.js' export function transformActivityToDiscordActivity (bot: Bot, payload: Activity): DiscordActivity { diff --git a/packages/bot/src/transformers/reverse/allowedMentions.ts b/packages/bot/src/transformers/reverse/allowedMentions.ts index 124002f24..6275fdd86 100644 --- a/packages/bot/src/transformers/reverse/allowedMentions.ts +++ b/packages/bot/src/transformers/reverse/allowedMentions.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, Bot, DiscordAllowedMentions } from '../../mod.js' +import { AllowedMentions, Bot, DiscordAllowedMentions } from '../../index.js' export function transformAllowedMentionsToDiscordAllowedMentions ( bot: Bot, diff --git a/packages/bot/src/transformers/reverse/application.ts b/packages/bot/src/transformers/reverse/application.ts index b1aa8fd92..8205824c7 100644 --- a/packages/bot/src/transformers/reverse/application.ts +++ b/packages/bot/src/transformers/reverse/application.ts @@ -1,5 +1,5 @@ +import { DiscordApplication } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordApplication } from '../../types/discord.js' import { Application } from '../application.js' export function transformApplicationToDiscordApplication (bot: Bot, payload: Application): DiscordApplication { diff --git a/packages/bot/src/transformers/reverse/applicationCommand.ts b/packages/bot/src/transformers/reverse/applicationCommand.ts index 74d063cc8..f7f715215 100644 --- a/packages/bot/src/transformers/reverse/applicationCommand.ts +++ b/packages/bot/src/transformers/reverse/applicationCommand.ts @@ -1,5 +1,5 @@ +import { DiscordApplicationCommand } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordApplicationCommand } from '../../types/discord.js' import { ApplicationCommand } from '../applicationCommand.js' export function transformApplicationCommandToDiscordApplicationCommand ( diff --git a/packages/bot/src/transformers/reverse/applicationCommandOption.ts b/packages/bot/src/transformers/reverse/applicationCommandOption.ts index 38851f480..bc01eb8de 100644 --- a/packages/bot/src/transformers/reverse/applicationCommandOption.ts +++ b/packages/bot/src/transformers/reverse/applicationCommandOption.ts @@ -1,5 +1,5 @@ +import { DiscordApplicationCommandOption } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordApplicationCommandOption } from '../../types/discord.js' import { ApplicationCommandOption } from '../applicationCommandOption.js' export function transformApplicationCommandOptionToDiscordApplicationCommandOption ( diff --git a/packages/bot/src/transformers/reverse/applicationCommandOptionChoice.ts b/packages/bot/src/transformers/reverse/applicationCommandOptionChoice.ts index 97d3e521e..e07db79a7 100644 --- a/packages/bot/src/transformers/reverse/applicationCommandOptionChoice.ts +++ b/packages/bot/src/transformers/reverse/applicationCommandOptionChoice.ts @@ -1,5 +1,5 @@ +import { DiscordApplicationCommandOptionChoice } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordApplicationCommandOptionChoice } from '../../types/discord.js' import { ApplicationCommandOptionChoice } from '../applicationCommandOptionChoice.js' export function transformApplicationCommandOptionChoiceToDiscordApplicationCommandOptionChoice ( diff --git a/packages/bot/src/transformers/reverse/applicationCommandPermission.ts b/packages/bot/src/transformers/reverse/applicationCommandPermission.ts index 15ccb5811..3f29dafa4 100644 --- a/packages/bot/src/transformers/reverse/applicationCommandPermission.ts +++ b/packages/bot/src/transformers/reverse/applicationCommandPermission.ts @@ -1,5 +1,5 @@ +import { DiscordGuildApplicationCommandPermissions } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGuildApplicationCommandPermissions } from '../../types/discord.js' import { ApplicationCommandPermission } from '../applicationCommandPermission.js' export function transformApplicationCommandPermissionToDiscordApplicationCommandPermission ( diff --git a/packages/bot/src/transformers/reverse/attachment.ts b/packages/bot/src/transformers/reverse/attachment.ts index 7ac2dde99..1b2dbaacf 100644 --- a/packages/bot/src/transformers/reverse/attachment.ts +++ b/packages/bot/src/transformers/reverse/attachment.ts @@ -1,5 +1,5 @@ +import { DiscordAttachment } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordAttachment } from '../../types/discord.js' import { Attachment } from '../attachment.js' export function transformAttachmentToDiscordAttachment (bot: Bot, payload: Attachment): DiscordAttachment { diff --git a/packages/bot/src/transformers/reverse/auditLogEntry.ts b/packages/bot/src/transformers/reverse/auditLogEntry.ts index 4f6ba06e8..ba2cb22fa 100644 --- a/packages/bot/src/transformers/reverse/auditLogEntry.ts +++ b/packages/bot/src/transformers/reverse/auditLogEntry.ts @@ -1,5 +1,5 @@ +import { DiscordAuditLogEntry } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordAuditLogEntry } from '../../types/discord.js' import { AuditLogEntry } from '../auditLogEntry.js' export function transformAuditLogEntryToDiscordAuditLogEntry (bot: Bot, payload: AuditLogEntry): DiscordAuditLogEntry { diff --git a/packages/bot/src/transformers/reverse/component.ts b/packages/bot/src/transformers/reverse/component.ts index 9d6375550..fdb2460af 100644 --- a/packages/bot/src/transformers/reverse/component.ts +++ b/packages/bot/src/transformers/reverse/component.ts @@ -1,5 +1,5 @@ +import { DiscordComponent } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordComponent } from '../../types/discord.js' import { Component } from '../component.js' export function transformComponentToDiscordComponent (bot: Bot, payload: Component): DiscordComponent { diff --git a/packages/bot/src/transformers/reverse/createApplicationCommand.ts b/packages/bot/src/transformers/reverse/createApplicationCommand.ts index 46e772c97..d3c777f7a 100644 --- a/packages/bot/src/transformers/reverse/createApplicationCommand.ts +++ b/packages/bot/src/transformers/reverse/createApplicationCommand.ts @@ -3,7 +3,7 @@ import { CreateApplicationCommand, DiscordCreateApplicationCommand, isContextApplicationCommand -} from '../../types/mod.js' +} from '../../types/index.js' export function transformCreateApplicationCommandToDiscordCreateApplicationCommand ( bot: Bot, diff --git a/packages/bot/src/transformers/reverse/embed.ts b/packages/bot/src/transformers/reverse/embed.ts index dc86d7e99..4e59eaa30 100644 --- a/packages/bot/src/transformers/reverse/embed.ts +++ b/packages/bot/src/transformers/reverse/embed.ts @@ -1,5 +1,5 @@ +import { DiscordEmbed } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordEmbed } from '../../types/discord.js' import { Embed } from '../embed.js' export function transformEmbedToDiscordEmbed (bot: Bot, payload: Embed): DiscordEmbed { diff --git a/packages/bot/src/transformers/reverse/emoji.ts b/packages/bot/src/transformers/reverse/emoji.ts index 7326c89e0..c65a5b71c 100644 --- a/packages/bot/src/transformers/reverse/emoji.ts +++ b/packages/bot/src/transformers/reverse/emoji.ts @@ -1,5 +1,5 @@ +import { DiscordEmoji } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordEmoji } from '../../types/discord.js' import { Emoji } from '../emoji.js' export function transformEmojiToDiscordEmoji (bot: Bot, payload: Emoji): DiscordEmoji { diff --git a/packages/bot/src/transformers/reverse/gatewayBot.ts b/packages/bot/src/transformers/reverse/gatewayBot.ts index 13c4d97f9..28c7e6d61 100644 --- a/packages/bot/src/transformers/reverse/gatewayBot.ts +++ b/packages/bot/src/transformers/reverse/gatewayBot.ts @@ -1,4 +1,4 @@ -import { DiscordGetGatewayBot } from '../../types/discord.js' +import { DiscordGetGatewayBot } from '@discordeno/types' import { GetGatewayBot } from '../gatewayBot.js' export function transformGatewayBotToDiscordGatewayBot (payload: GetGatewayBot): DiscordGetGatewayBot { diff --git a/packages/bot/src/transformers/reverse/mod.ts b/packages/bot/src/transformers/reverse/index.ts similarity index 81% rename from packages/bot/src/transformers/reverse/mod.ts rename to packages/bot/src/transformers/reverse/index.ts index 1d2707510..f6e9be5a3 100644 --- a/packages/bot/src/transformers/reverse/mod.ts +++ b/packages/bot/src/transformers/reverse/index.ts @@ -1,4 +1,5 @@ export * from './activity.js' +export * from './allowedMentions.js' export * from './application.js' export * from './applicationCommand.js' export * from './applicationCommandOption.js' @@ -7,9 +8,11 @@ export * from './applicationCommandPermission.js' export * from './attachment.js' export * from './auditLogEntry.js' export * from './component.js' +export * from './createApplicationCommand.js' export * from './embed.js' export * from './emoji.js' export * from './gatewayBot.js' +export * from './interactionResponse.js' export * from './member.js' export * from './presence.js' export * from './team.js' diff --git a/packages/bot/src/transformers/reverse/interactionResponse.ts b/packages/bot/src/transformers/reverse/interactionResponse.ts index 04d9a372c..070819e49 100644 --- a/packages/bot/src/transformers/reverse/interactionResponse.ts +++ b/packages/bot/src/transformers/reverse/interactionResponse.ts @@ -1,5 +1,5 @@ import { Bot } from '../../bot.js' -import { DiscordInteractionResponse, InteractionResponse } from '../../types/mod.js' +import { DiscordInteractionResponse, InteractionResponse } from '../../types/index.js' export function transformInteractionResponseToDiscordInteractionResponse ( bot: Bot, diff --git a/packages/bot/src/transformers/reverse/member.ts b/packages/bot/src/transformers/reverse/member.ts index 8fd5134ce..572caef0c 100644 --- a/packages/bot/src/transformers/reverse/member.ts +++ b/packages/bot/src/transformers/reverse/member.ts @@ -1,5 +1,5 @@ +import { DiscordMember, DiscordUser } from '@discordeno/types' import type { Bot } from '../../bot.js' -import { DiscordMember, DiscordUser } from '../../types/discord.js' import { Member, User } from '../member.js' export function transformUserToDiscordUser (bot: Bot, payload: User): DiscordUser { diff --git a/packages/bot/src/transformers/reverse/presence.ts b/packages/bot/src/transformers/reverse/presence.ts index a3148569d..0c3b9e29e 100644 --- a/packages/bot/src/transformers/reverse/presence.ts +++ b/packages/bot/src/transformers/reverse/presence.ts @@ -1,6 +1,5 @@ +import { DiscordPresenceUpdate, PresenceStatus } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordPresenceUpdate } from '../../types/discord.js' -import { PresenceStatus } from '../../types/shared.js' import { PresenceUpdate } from '../presence.js' export const reverseStatusTypes = Object.freeze( diff --git a/packages/bot/src/transformers/reverse/team.ts b/packages/bot/src/transformers/reverse/team.ts index 4e93ea311..fa02cdccd 100644 --- a/packages/bot/src/transformers/reverse/team.ts +++ b/packages/bot/src/transformers/reverse/team.ts @@ -1,5 +1,5 @@ +import { DiscordTeam } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordTeam } from '../../types/discord.js' import { Team } from '../team.js' export function transformTeamToDiscordTeam (bot: Bot, payload: Team): DiscordTeam { diff --git a/packages/bot/src/transformers/reverse/widgetSettings.ts b/packages/bot/src/transformers/reverse/widgetSettings.ts index 225cc5f99..7ad8851d2 100644 --- a/packages/bot/src/transformers/reverse/widgetSettings.ts +++ b/packages/bot/src/transformers/reverse/widgetSettings.ts @@ -1,5 +1,5 @@ +import { DiscordGuildWidgetSettings } from '@discordeno/types' import { Bot } from '../../bot.js' -import { DiscordGuildWidgetSettings } from '../../types/discord.js' import { GuildWidgetSettings } from '../widgetSettings.js' export function transformWidgetSettingsToDiscordWidgetSettings ( diff --git a/packages/bot/src/transformers/role.ts b/packages/bot/src/transformers/role.ts index 635d715b6..5e2fcd776 100644 --- a/packages/bot/src/transformers/role.ts +++ b/packages/bot/src/transformers/role.ts @@ -1,6 +1,5 @@ +import { DiscordRole, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordRole } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { RoleToggles } from './toggles/role.js' export function transformRole (bot: Bot, payload: { role: DiscordRole } & { guildId: bigint }) { diff --git a/packages/bot/src/transformers/scheduledEvent.ts b/packages/bot/src/transformers/scheduledEvent.ts index 7e60db283..86fbcdf38 100644 --- a/packages/bot/src/transformers/scheduledEvent.ts +++ b/packages/bot/src/transformers/scheduledEvent.ts @@ -1,6 +1,5 @@ +import { DiscordScheduledEvent, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordScheduledEvent } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformScheduledEvent ( bot: Bot, diff --git a/packages/bot/src/transformers/stageInstance.ts b/packages/bot/src/transformers/stageInstance.ts index 04bcd2815..ca7344dc6 100644 --- a/packages/bot/src/transformers/stageInstance.ts +++ b/packages/bot/src/transformers/stageInstance.ts @@ -1,6 +1,5 @@ +import { DiscordStageInstance, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordStageInstance } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformStageInstance (bot: Bot, payload: DiscordStageInstance) { const stageInstance = { diff --git a/packages/bot/src/transformers/sticker.ts b/packages/bot/src/transformers/sticker.ts index 17b79eab7..c63f463c6 100644 --- a/packages/bot/src/transformers/sticker.ts +++ b/packages/bot/src/transformers/sticker.ts @@ -1,6 +1,5 @@ +import { DiscordSticker, DiscordStickerPack, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordSticker, DiscordStickerPack } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformSticker (bot: Bot, payload: DiscordSticker) { const sticker = { diff --git a/packages/bot/src/transformers/team.ts b/packages/bot/src/transformers/team.ts index 0e42d109d..75d215426 100644 --- a/packages/bot/src/transformers/team.ts +++ b/packages/bot/src/transformers/team.ts @@ -1,6 +1,5 @@ +import { DiscordTeam, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordTeam } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformTeam (bot: Bot, payload: DiscordTeam) { const id = bot.transformers.snowflake(payload.id) diff --git a/packages/bot/src/transformers/template.ts b/packages/bot/src/transformers/template.ts index 191a936b7..bf8c54309 100644 --- a/packages/bot/src/transformers/template.ts +++ b/packages/bot/src/transformers/template.ts @@ -1,6 +1,5 @@ +import { DiscordTemplate, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordTemplate } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformTemplate (bot: Bot, payload: DiscordTemplate) { const template = { diff --git a/packages/bot/src/transformers/threadMember.ts b/packages/bot/src/transformers/threadMember.ts index 0804a523f..aef38f530 100644 --- a/packages/bot/src/transformers/threadMember.ts +++ b/packages/bot/src/transformers/threadMember.ts @@ -1,6 +1,5 @@ +import { DiscordThreadMember, DiscordThreadMemberGuildCreate, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordThreadMember, DiscordThreadMemberGuildCreate } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformThreadMember (bot: Bot, payload: DiscordThreadMember) { const threadMember = { diff --git a/packages/bot/src/transformers/toggles/emoji.ts b/packages/bot/src/transformers/toggles/emoji.ts index e364324e5..2203c9f82 100644 --- a/packages/bot/src/transformers/toggles/emoji.ts +++ b/packages/bot/src/transformers/toggles/emoji.ts @@ -1,4 +1,4 @@ -import { DiscordEmoji } from '../../types/discord.js' +import { DiscordEmoji } from '@discordeno/types' import { ToggleBitfield } from './ToggleBitfield.js' export const EmojiToggle = { diff --git a/packages/bot/src/transformers/toggles/guild.ts b/packages/bot/src/transformers/toggles/guild.ts index 9ad62b212..17d2de4c8 100644 --- a/packages/bot/src/transformers/toggles/guild.ts +++ b/packages/bot/src/transformers/toggles/guild.ts @@ -1,5 +1,4 @@ -import { DiscordGuild } from '../../types/discord.js' -import { GuildFeatures } from '../../types/shared.js' +import { DiscordGuild, GuildFeatures } from '@discordeno/types' import { ToggleBitfieldBigint } from './ToggleBitfield.js' const featureNames = [ diff --git a/packages/bot/src/transformers/toggles/mod.ts b/packages/bot/src/transformers/toggles/index.ts similarity index 100% rename from packages/bot/src/transformers/toggles/mod.ts rename to packages/bot/src/transformers/toggles/index.ts diff --git a/packages/bot/src/transformers/toggles/member.ts b/packages/bot/src/transformers/toggles/member.ts index 298a1bfb8..4ac570037 100644 --- a/packages/bot/src/transformers/toggles/member.ts +++ b/packages/bot/src/transformers/toggles/member.ts @@ -1,4 +1,4 @@ -import { DiscordMember } from '../../types/discord.js' +import { DiscordMember } from '@discordeno/types' import { ToggleBitfield } from './ToggleBitfield.js' export const MemberToggle = { diff --git a/packages/bot/src/transformers/toggles/role.ts b/packages/bot/src/transformers/toggles/role.ts index 947d4fb47..ddd14b49d 100644 --- a/packages/bot/src/transformers/toggles/role.ts +++ b/packages/bot/src/transformers/toggles/role.ts @@ -1,4 +1,4 @@ -import { DiscordRole } from '../../types/discord.js' +import { DiscordRole } from '@discordeno/types' import { ToggleBitfield } from './ToggleBitfield.js' export const RoleToggle = { diff --git a/packages/bot/src/transformers/toggles/user.ts b/packages/bot/src/transformers/toggles/user.ts index de1b1795b..a76c0b5e9 100644 --- a/packages/bot/src/transformers/toggles/user.ts +++ b/packages/bot/src/transformers/toggles/user.ts @@ -1,4 +1,4 @@ -import { DiscordUser } from '../../types/discord.js' +import { DiscordUser } from '@discordeno/types' import { ToggleBitfield } from './ToggleBitfield.js' export const UserToggle = { diff --git a/packages/bot/src/transformers/toggles/voice.ts b/packages/bot/src/transformers/toggles/voice.ts index 56b6cb426..28c971821 100644 --- a/packages/bot/src/transformers/toggles/voice.ts +++ b/packages/bot/src/transformers/toggles/voice.ts @@ -1,4 +1,4 @@ -import { DiscordVoiceState } from '../../types/discord.js' +import { DiscordVoiceState } from '@discordeno/types' import { ToggleBitfield } from './ToggleBitfield.js' export const VoiceStateToggle = { diff --git a/packages/bot/src/transformers/voiceRegion.ts b/packages/bot/src/transformers/voiceRegion.ts index d95646532..241355942 100644 --- a/packages/bot/src/transformers/voiceRegion.ts +++ b/packages/bot/src/transformers/voiceRegion.ts @@ -1,6 +1,5 @@ +import { DiscordVoiceRegion, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordVoiceRegion } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' // TODO: Rename `VoiceRegions` to `VoiceRegion`. diff --git a/packages/bot/src/transformers/voiceState.ts b/packages/bot/src/transformers/voiceState.ts index b09dabeba..360f69fe1 100644 --- a/packages/bot/src/transformers/voiceState.ts +++ b/packages/bot/src/transformers/voiceState.ts @@ -1,6 +1,5 @@ +import { DiscordVoiceState, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordVoiceState } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' import { VoiceStateToggles } from './toggles/voice.js' export function transformVoiceState (bot: Bot, payload: { voiceState: DiscordVoiceState } & { guildId: bigint }) { diff --git a/packages/bot/src/transformers/webhook.ts b/packages/bot/src/transformers/webhook.ts index de0c8528a..8d3ab5249 100644 --- a/packages/bot/src/transformers/webhook.ts +++ b/packages/bot/src/transformers/webhook.ts @@ -1,6 +1,5 @@ +import { DiscordWebhook, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordWebhook } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformWebhook (bot: Bot, payload: DiscordWebhook) { const webhook = { diff --git a/packages/bot/src/transformers/welcomeScreen.ts b/packages/bot/src/transformers/welcomeScreen.ts index 436cc336e..f67db9199 100644 --- a/packages/bot/src/transformers/welcomeScreen.ts +++ b/packages/bot/src/transformers/welcomeScreen.ts @@ -1,6 +1,5 @@ +import { DiscordWelcomeScreen, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordWelcomeScreen } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformWelcomeScreen (bot: Bot, payload: DiscordWelcomeScreen) { const welcomeScreen = { diff --git a/packages/bot/src/transformers/widget.ts b/packages/bot/src/transformers/widget.ts index 82b661f08..3fb07589e 100644 --- a/packages/bot/src/transformers/widget.ts +++ b/packages/bot/src/transformers/widget.ts @@ -1,6 +1,5 @@ +import { DiscordGuildWidget, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordGuildWidget } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformWidget (bot: Bot, payload: DiscordGuildWidget) { const widget = { diff --git a/packages/bot/src/transformers/widgetSettings.ts b/packages/bot/src/transformers/widgetSettings.ts index ca9c93dd1..cdb350039 100644 --- a/packages/bot/src/transformers/widgetSettings.ts +++ b/packages/bot/src/transformers/widgetSettings.ts @@ -1,6 +1,5 @@ +import { DiscordGuildWidgetSettings, Optionalize } from '@discordeno/types' import { Bot } from '../bot.js' -import { DiscordGuildWidgetSettings } from '../types/discord.js' -import { Optionalize } from '../types/shared.js' export function transformWidgetSettings (bot: Bot, payload: DiscordGuildWidgetSettings) { const widget = { diff --git a/packages/bot/src/discordeno.ts b/packages/bot/src/types.ts similarity index 100% rename from packages/bot/src/discordeno.ts rename to packages/bot/src/types.ts diff --git a/packages/bot/src/utils/index.ts b/packages/bot/src/utils/index.ts new file mode 100644 index 000000000..4bf4948a3 --- /dev/null +++ b/packages/bot/src/utils/index.ts @@ -0,0 +1,2 @@ +export * from './routes' +export * from './utils' diff --git a/packages/bot/src/utils/routes.ts b/packages/bot/src/utils/routes.ts index 1dcd92aa6..f0140e85f 100644 --- a/packages/bot/src/utils/routes.ts +++ b/packages/bot/src/utils/routes.ts @@ -1,3 +1,5 @@ +import { BigString } from '@discordeno/types' +import { baseEndpoints } from '@discordeno/utils' import { GetBans, GetGuildAuditLog, @@ -12,13 +14,11 @@ import { isGetMessagesLimit, ListArchivedThreads, ListGuildMembers -} from '../helpers/mod.js' -import { BigString } from '../types/shared.js' -import { baseEndpoints } from './constants.js' +} from '../helpers/index.js' export const routes = { GATEWAY_BOT: () => { - return `/gateway/bot` + return '/gateway/bot' }, // Automod Endpoints