diff --git a/packages/types/src/discord.ts b/packages/types/src/discord.ts index 8cbe8ca11..3ef41afb0 100644 --- a/packages/types/src/discord.ts +++ b/packages/types/src/discord.ts @@ -1,49 +1,4 @@ -// import type { FileContent } from './discordeno.js' -import type { Localization, WebhookTypes } from './shared.js' - -// ActivityTypes, -// AllowedMentionsTypes, -// ApplicationCommandOptionTypes, -// ApplicationCommandPermissionTypes, -// ApplicationCommandTypes, -// ApplicationFlags, -// AuditLogEvents, -// ButtonStyles, -// ChannelFlags, -// ChannelTypes, -// DefaultMessageNotificationLevels, -// EmbedTypes, -// ExplicitContentFilterLevels, -// GatewayEventNames, -// GuildFeatures, -// GuildNsfwLevel, -// IntegrationExpireBehaviors, -// InteractionResponseTypes, -// InteractionTypes, -// Localization, -// MessageActivityTypes, -// MessageComponentTypes, -// MessageTypes, -// MfaLevels, -// OverwriteTypes, -// PickPartial, -// PremiumTiers, -// PremiumTypes, -// ScheduledEventEntityType, -// ScheduledEventPrivacyLevel, -// ScheduledEventStatus, -// SortOrderTypes, -// StickerFormatTypes, -// StickerTypes, -// SystemChannelFlags, -// TargetTypes, -// TeamMembershipStates, -// TextStyles, -// UserFlags, -// VerificationLevels, -// VideoQualityModes, -// VisibilityTypes, - +import type { FileContent } from './discordeno.js' import type { ActivityTypes, AllowedMentionsTypes, @@ -63,6 +18,7 @@ import type { GuildNsfwLevel, IntegrationExpireBehaviors, InteractionTypes, + Localization, MessageActivityTypes, MessageComponentTypes, MessageTypes, @@ -84,8 +40,8 @@ import type { UserFlags, VerificationLevels, VideoQualityModes, -} from './shared' -import type { FileContent } from './discordeno.js' + WebhookTypes, +} from './shared.js' /** https://discord.com/developers/docs/resources/user#user-object */ export interface DiscordUser { @@ -1896,8 +1852,7 @@ export interface DiscordInviteStageInstance { } /** https://discord.com/developers/docs/interactions/application-commands#application-command-object-application-command-structure */ -export interface DiscordApplicationCommand - extends DiscordCreateApplicationCommand { +export interface DiscordApplicationCommand extends DiscordCreateApplicationCommand { /** Unique ID of command */ id: string /** ID of the parent application */ @@ -3187,4 +3142,4 @@ export type DiscordArchivedThreads = DiscordActiveThreads & { export interface DiscordActiveThreads { threads: DiscordChannel[] members: DiscordThreadMember[] -} \ No newline at end of file +} diff --git a/packages/types/src/discordeno.ts b/packages/types/src/discordeno.ts index 91e580785..671fff85d 100644 --- a/packages/types/src/discordeno.ts +++ b/packages/types/src/discordeno.ts @@ -4,8 +4,8 @@ import type { AutoModerationTriggerTypes, DiscordAttachment, DiscordAutoModerationRuleTriggerMetadataPresets, - DiscordEmbed -} from './discord' + DiscordEmbed, +} from './discord.js' import type { AllowedMentionsTypes, ApplicationCommandOptionTypes, @@ -26,8 +26,8 @@ import type { SortOrderTypes, TargetTypes, TextStyles, - VideoQualityModes -} from './shared' + VideoQualityModes, +} from './shared.js' export interface CreateMessageOptions { /** The message contents (up to 2000 characters) */ @@ -399,9 +399,7 @@ export interface GetInvite { scheduledEventId?: BigString } -export type CreateApplicationCommand = - | CreateSlashApplicationCommand - | CreateContextApplicationCommand +export type CreateApplicationCommand = CreateSlashApplicationCommand | CreateContextApplicationCommand /** https://discord.com/developers/docs/interactions/application-commands#endpoints-json-params */ export interface CreateSlashApplicationCommand { @@ -428,15 +426,11 @@ export interface CreateSlashApplicationCommand { /** Indicates whether the command is available in DMs with the app, only for globally-scoped commands. By default, commands are visible. */ dmPermission?: boolean /** Indicates whether the command is age-restricted, defaults to `false` */ - nsfw?: boolean; + nsfw?: boolean } /** https://discord.com/developers/docs/interactions/application-commands#endpoints-json-params */ -export interface CreateContextApplicationCommand - extends Omit< - CreateSlashApplicationCommand, - 'options' | 'description' | 'descriptionLocalizations' - > { +export interface CreateContextApplicationCommand extends Omit { /** The type of the command */ type: ApplicationCommandTypes.Message | ApplicationCommandTypes.User }