diff --git a/src/transformers/message.ts b/src/transformers/message.ts index 90ad8dc36..14dc54c4c 100644 --- a/src/transformers/message.ts +++ b/src/transformers/message.ts @@ -2,6 +2,8 @@ import { Bot } from "../bot.ts"; import { Message } from "../types/messages/message.ts"; import { CHANNEL_MENTION_REGEX } from "../util/constants.ts"; import { SnakeCasedPropertiesDeep } from "../types/util.ts"; +import { DiscordenoAttachment } from "./attachment.ts"; +import { DiscordMessageStickerFormatTypes } from "../types/messages/message_sticker_format_types.ts"; export function transformMessage(bot: Bot, data: SnakeCasedPropertiesDeep): DiscordenoMessage { return { @@ -12,7 +14,7 @@ export function transformMessage(bot: Bot, data: SnakeCasedPropertiesDeep bot.transformers.attachment(bot, attachment)), embeds: data.embeds, reactions: data.reactions, type: data.type, @@ -22,7 +24,11 @@ export function transformMessage(bot: Bot, data: SnakeCasedPropertiesDeep ({ + id: bot.transformers.snowflake(sticker.id), + name: sticker.name, + formatType: sticker.format_type, + })), // TRANSFORMED STUFF BELOW id: bot.transformers.snowflake(data.id), @@ -74,6 +80,9 @@ export interface DiscordenoMessage | "tts" | "pinned" | "mentionEveryone" + | "attachments" + | "messageReference" + | "stickerItems" > { id: bigint; /** Whether or not this message was sent by a bot */ @@ -107,4 +116,24 @@ export interface DiscordenoMessage timestamp: number; /** When this message was edited (or undefined if never) */ editedTimestamp?: number; + /** The attachments uploaded with this message */ + attachments: DiscordenoAttachment[]; + /** Data showing the source of a crossposted channel follow add, pin or reply message */ + messageReference?: { + /** id of the originating message */ + messageId?: bigint; + /** id of the originating message's channel */ + channelId?: bigint; + /** id of the originating message's guild */ + guildId?: bigint; + }; + /** Sent if the message contains stickers */ + stickerItems?: { + /** Id of the sticker */ + id: bigint; + /** Name of the sticker */ + name: string; + /** Type of sticker format */ + formatType: DiscordMessageStickerFormatTypes; + }[]; } diff --git a/src/types/discordeno/debug_arg.ts b/src/types/discordeno/debug_arg.ts deleted file mode 100644 index 883e3115e..000000000 --- a/src/types/discordeno/debug_arg.ts +++ /dev/null @@ -1,25 +0,0 @@ -export interface DebugArg { - /** Red is for errors or urgent issues. Yellow is for warnings/alerts. Green is for actions being taken. Blue is for */ - type?: - | "gatewayIdentify" - | "error" - | "globallyRateLimited" - | "requestCreate" - | "requestSuccess" - | "requestFetch" - | "requestFetched" - | "requestMembersProcessing" - | "gatewayHeartbeat" - | "gatewayHeartbeatStopped" - | "shardCreate" - | "gatewayInvalidSession" - | "gatewayReconnect" - | "gatewayResume" - | "gatewayResumed" - | "wsClose" - | "wsError" - | "wsReconnect" - | "missingShard" - | "loop"; - data: unknown; -} diff --git a/src/types/discordeno/guild_member.ts b/src/types/discordeno/guild_member.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/types/discordeno/guild_update_change.ts b/src/types/discordeno/guild_update_change.ts deleted file mode 100644 index 32e9e966e..000000000 --- a/src/types/discordeno/guild_update_change.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Guild } from "../guilds/guild.ts"; - -export interface GuildUpdateChange { - key: keyof Guild; - oldValue?: unknown; - value?: unknown; -} diff --git a/src/types/discordeno/mod.ts b/src/types/discordeno/mod.ts index d24c992cf..243586278 100644 --- a/src/types/discordeno/mod.ts +++ b/src/types/discordeno/mod.ts @@ -1,8 +1,5 @@ export * from "./create_slash_command.ts"; -export * from "./debug_arg.ts"; export * from "./edit_webhook_message.ts"; export * from "./errors.ts"; export * from "./file_content.ts"; -export * from "./guild_member.ts"; -export * from "./guild_update_change.ts"; export * from "./interaction_response.ts";