From a381c19ea359a1a55d430b8a3a134ae9dc307742 Mon Sep 17 00:00:00 2001 From: ITOH <72305210+itohatweb@users.noreply.github.com> Date: Fri, 30 Apr 2021 19:42:21 +0200 Subject: [PATCH] remove Discord* types for messages --- src/types/messages/allowed_mentions.ts | 5 +---- src/types/messages/attachment.ts | 6 +----- src/types/messages/create_message.ts | 2 ++ src/types/messages/edit_message.ts | 5 +---- src/types/messages/get_messages.ts | 8 +++++--- src/types/messages/message.ts | 5 +---- src/types/messages/message_activity.ts | 5 +---- src/types/messages/message_delete.ts | 6 +----- src/types/messages/message_delete_bulk.ts | 8 +------- src/types/messages/message_get_reactions.ts | 4 +--- src/types/messages/message_reaction_add.ts | 7 +------ src/types/messages/message_reaction_remove.ts | 7 +------ src/types/messages/message_reaction_remove_all.ts | 7 +------ src/types/messages/message_reaction_remove_emoji.ts | 7 +------ src/types/messages/message_reference.ts | 8 +------- src/types/messages/message_sticker.ts | 5 +---- src/types/messages/reaction.ts | 4 +--- 17 files changed, 22 insertions(+), 77 deletions(-) diff --git a/src/types/messages/allowed_mentions.ts b/src/types/messages/allowed_mentions.ts index 8054ad286..f5e43a94d 100644 --- a/src/types/messages/allowed_mentions.ts +++ b/src/types/messages/allowed_mentions.ts @@ -1,6 +1,6 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { DiscordAllowedMentionsTypes } from "./allowed_mentions_types.ts"; +/** https://discord.com/developers/docs/resources/channel#allowed-mentions-object */ export interface AllowedMentions { /** An array of allowed mention types to parse from the content. */ parse?: DiscordAllowedMentionsTypes[]; @@ -11,6 +11,3 @@ export interface AllowedMentions { /** For replies, whether to mention the author of the message being replied to (default false) */ repliedUser?: boolean; } - -/** https://discord.com/developers/docs/resources/channel#allowed-mentions-object */ -export type DiscordAllowedMentions = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/attachment.ts b/src/types/messages/attachment.ts index 638945348..62bc4fc07 100644 --- a/src/types/messages/attachment.ts +++ b/src/types/messages/attachment.ts @@ -1,5 +1,4 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; - +/** https://discord.com/developers/docs/resources/channel#attachment-object */ export interface Attachment { /** Attachment id */ id: string; @@ -18,6 +17,3 @@ export interface Attachment { /** Width of file (if image) */ width?: number | null; } - -/** https://discord.com/developers/docs/resources/channel#attachment-object */ -export type DiscordAttachment = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/create_message.ts b/src/types/messages/create_message.ts index 1ec41fc32..e4cdcf7e4 100644 --- a/src/types/messages/create_message.ts +++ b/src/types/messages/create_message.ts @@ -25,3 +25,5 @@ export interface CreateMessage { export type DiscordCreateMessage = SnakeCasedPropertiesDeep< Omit >; + +// TODO: check this diff --git a/src/types/messages/edit_message.ts b/src/types/messages/edit_message.ts index fc586dab8..9b726a411 100644 --- a/src/types/messages/edit_message.ts +++ b/src/types/messages/edit_message.ts @@ -1,7 +1,7 @@ import { Embed } from "../embeds/embed.ts"; -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { AllowedMentions } from "./allowed_mentions.ts"; +/** https://discord.com/developers/docs/resources/channel#edit-message-json-params */ export interface EditMessage { /** The new message contents (up to 2000 characters) */ content?: string | null; @@ -12,6 +12,3 @@ export interface EditMessage { /** Allowed mentions for the message */ allowedMentions?: AllowedMentions | null; } - -/** https://discord.com/developers/docs/resources/channel#edit-message-json-params */ -export type DiscordEditMessage = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/get_messages.ts b/src/types/messages/get_messages.ts index 3c5767f99..9231d5577 100644 --- a/src/types/messages/get_messages.ts +++ b/src/types/messages/get_messages.ts @@ -1,28 +1,30 @@ +/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ export interface GetMessagesLimit { /** Max number of messages to return (1-100) default 50 */ limit?: number; } +/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ export interface GetMessagesAround extends GetMessagesLimit { /** Get messages around this message id */ around?: string; } +/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ export interface GetMessagesBefore extends GetMessagesLimit { /** Get messages before this message id */ before?: string; } +/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ export interface GetMessagesAfter extends GetMessagesLimit { /** Get messages after this message id */ after?: string; } +/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ export type GetMessages = & GetMessagesLimit & GetMessagesAfter & GetMessagesBefore & GetMessagesAround; - -/** https://discord.com/developers/docs/resources/channel#get-channel-messages-query-string-params */ -export type DiscordGetMessages = GetMessages; diff --git a/src/types/messages/message.ts b/src/types/messages/message.ts index c00b23d62..8b16b5e90 100644 --- a/src/types/messages/message.ts +++ b/src/types/messages/message.ts @@ -4,7 +4,6 @@ import { GuildMember } from "../guilds/guild_member.ts"; import { MessageInteraction } from "../interactions/message_interaction.ts"; import { Application } from "../oauth2/application.ts"; import { User } from "../users/user.ts"; -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { Attachment } from "./attachment.ts"; import { MessageActivity } from "./message_activity.ts"; import { MessageReference } from "./message_reference.ts"; @@ -12,6 +11,7 @@ import { MessageSticker } from "./message_sticker.ts"; import { DiscordMessageTypes } from "./message_types.ts"; import { DiscordReaction } from "./reaction.ts"; +/** https://discord.com/developers/docs/resources/channel#message-object */ export interface Message { /** id of the message */ id: string; @@ -83,6 +83,3 @@ export interface Message { /** Sent if the message is a response to an Interaction */ interaction?: MessageInteraction; } - -/** https://discord.com/developers/docs/resources/channel#message-object */ -export type DiscordMessage = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/message_activity.ts b/src/types/messages/message_activity.ts index 6cadebd28..8feab94cf 100644 --- a/src/types/messages/message_activity.ts +++ b/src/types/messages/message_activity.ts @@ -1,12 +1,9 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { DiscordMessageActivityTypes } from "./message_activity_types.ts"; +/** https://discord.com/developers/docs/resources/channel#message-object-message-activity-structure */ export interface MessageActivity { /** Type of message activity */ type: DiscordMessageActivityTypes; /** `party_id` from a Rich Presence event */ partyId?: string; } - -/** https://discord.com/developers/docs/resources/channel#message-object-message-activity-structure */ -export type DiscordMessageActivity = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/message_delete.ts b/src/types/messages/message_delete.ts index d292e9e62..222d0d8cf 100644 --- a/src/types/messages/message_delete.ts +++ b/src/types/messages/message_delete.ts @@ -1,5 +1,4 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; - +/** https://discord.com/developers/docs/topics/gateway#message-delete */ export interface MessageDelete { /** The id of the message */ id: string; @@ -8,6 +7,3 @@ export interface MessageDelete { /** The id of the guild */ guildId?: string; } - -/** https://discord.com/developers/docs/topics/gateway#message-delete */ -export type DiscordMessageDelete = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/message_delete_bulk.ts b/src/types/messages/message_delete_bulk.ts index 9d1a0f163..e4994af86 100644 --- a/src/types/messages/message_delete_bulk.ts +++ b/src/types/messages/message_delete_bulk.ts @@ -1,5 +1,4 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; - +/** https://discord.com/developers/docs/topics/gateway#message-delete-bulk */ export interface MessageDeleteBulk { /** The ids of the messages */ ids: string[]; @@ -8,8 +7,3 @@ export interface MessageDeleteBulk { /** The id of the guild */ guildId?: string; } - -/** https://discord.com/developers/docs/topics/gateway#message-delete-bulk */ -export type DiscordMessageDeleteBulk = SnakeCasedPropertiesDeep< - MessageDeleteBulk ->; diff --git a/src/types/messages/message_get_reactions.ts b/src/types/messages/message_get_reactions.ts index 2a91ba4fb..615bfd030 100644 --- a/src/types/messages/message_get_reactions.ts +++ b/src/types/messages/message_get_reactions.ts @@ -1,9 +1,7 @@ +/** https://discord.com/developers/docs/resources/channel#get-reactions-query-string-params */ export interface GetReactions { /** Get users after this user Id */ after?: string; /** Max number of users to return (1-100) */ limit?: number; } - -/** https://discord.com/developers/docs/resources/channel#get-reactions-query-string-params */ -export type DiscordGetReactions = GetReactions; diff --git a/src/types/messages/message_reaction_add.ts b/src/types/messages/message_reaction_add.ts index af3530ff6..ef3709af3 100644 --- a/src/types/messages/message_reaction_add.ts +++ b/src/types/messages/message_reaction_add.ts @@ -1,7 +1,7 @@ import { Emoji } from "../emojis/emoji.ts"; import { GuildMemberWithUser } from "../guilds/guild_member.ts"; -import { SnakeCasedPropertiesDeep } from "../util.ts"; +/** https://discord.com/developers/docs/topics/gateway#message-reaction-add */ export interface MessageReactionAdd { /** The id of the user */ userId: string; @@ -16,8 +16,3 @@ export interface MessageReactionAdd { /** The emoji used to react */ emoji: Partial; } - -/** https://discord.com/developers/docs/topics/gateway#message-reaction-add */ -export type DiscordMessageReactionAdd = SnakeCasedPropertiesDeep< - MessageReactionAdd ->; diff --git a/src/types/messages/message_reaction_remove.ts b/src/types/messages/message_reaction_remove.ts index 8ffd7c996..1fa3f4ef8 100644 --- a/src/types/messages/message_reaction_remove.ts +++ b/src/types/messages/message_reaction_remove.ts @@ -1,9 +1,4 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { MessageReactionAdd } from "./message_reaction_add.ts"; -export type MessageReactionRemove = Omit; - /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove */ -export type DiscordMessageReactionRemove = SnakeCasedPropertiesDeep< - MessageReactionRemove ->; +export type MessageReactionRemove = Omit; diff --git a/src/types/messages/message_reaction_remove_all.ts b/src/types/messages/message_reaction_remove_all.ts index 6e7264889..b8f91f4bb 100644 --- a/src/types/messages/message_reaction_remove_all.ts +++ b/src/types/messages/message_reaction_remove_all.ts @@ -1,12 +1,7 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { MessageReactionAdd } from "./message_reaction_add.ts"; +/** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-all */ export type MessageReactionRemoveAll = Pick< MessageReactionAdd, "channelId" | "messageId" | "guildId" >; - -/** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-all */ -export type DiscordMessageReactionRemoveAll = SnakeCasedPropertiesDeep< - MessageReactionRemoveAll ->; diff --git a/src/types/messages/message_reaction_remove_emoji.ts b/src/types/messages/message_reaction_remove_emoji.ts index 6460ef99a..829bd0dae 100644 --- a/src/types/messages/message_reaction_remove_emoji.ts +++ b/src/types/messages/message_reaction_remove_emoji.ts @@ -1,12 +1,7 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { MessageReactionAdd } from "./message_reaction_add.ts"; +/** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-emoji */ export type MessageReactionRemoveEmoji = Pick< MessageReactionAdd, "channelId" | "guildId" | "messageId" | "emoji" >; - -/** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-emoji */ -export type DiscordMessageReactionRemoveEmoji = SnakeCasedPropertiesDeep< - MessageReactionRemoveEmoji ->; diff --git a/src/types/messages/message_reference.ts b/src/types/messages/message_reference.ts index ba2b143e8..7978e50cd 100644 --- a/src/types/messages/message_reference.ts +++ b/src/types/messages/message_reference.ts @@ -1,5 +1,4 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; - +/** https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure */ export interface MessageReference { /** id of the originating message */ messageId?: string; @@ -13,8 +12,3 @@ export interface MessageReference { /** When sending, whether to error if the referenced message doesn't exist instead of sending as a normal (non-reply) message, default true */ failIfNotExists: boolean; } - -/** https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure */ -export type DiscordMessageReference = SnakeCasedPropertiesDeep< - MessageReference ->; diff --git a/src/types/messages/message_sticker.ts b/src/types/messages/message_sticker.ts index e7f3b2ff1..bcc369508 100644 --- a/src/types/messages/message_sticker.ts +++ b/src/types/messages/message_sticker.ts @@ -1,6 +1,6 @@ -import { SnakeCasedPropertiesDeep } from "../util.ts"; import { DiscordMessageStickerFormatTypes } from "./message_sticker_format_types.ts"; +/** https://discord.com/developers/docs/resources/channel#message-object-message-sticker-structure */ export interface MessageSticker { /** id of the sticker */ id: string; @@ -25,6 +25,3 @@ export interface MessageSticker { /** Type of sticker format */ formatType: DiscordMessageStickerFormatTypes; } - -/** https://discord.com/developers/docs/resources/channel#message-object-message-sticker-structure */ -export type DiscordMessageSticker = SnakeCasedPropertiesDeep; diff --git a/src/types/messages/reaction.ts b/src/types/messages/reaction.ts index dbb30e28c..ff673f604 100644 --- a/src/types/messages/reaction.ts +++ b/src/types/messages/reaction.ts @@ -1,5 +1,6 @@ import { Emoji } from "../emojis/emoji.ts"; +/** https://discord.com/developers/docs/resources/channel#reaction-object */ export interface Reaction { /** Times this emoji has been used to react */ count: number; @@ -8,6 +9,3 @@ export interface Reaction { /** Emoji information */ emoji: Partial; } - -/** https://discord.com/developers/docs/resources/channel#reaction-object */ -export type DiscordReaction = Reaction;