diff --git a/src/errors/Messages.js b/src/errors/Messages.js index c84006503647..8075940f4f33 100644 --- a/src/errors/Messages.js +++ b/src/errors/Messages.js @@ -96,6 +96,7 @@ const Messages = { INVALID_ELEMENT: (type, name, elem) => `Supplied ${type} ${name} includes an invalid element: ${elem}`, WEBHOOK_MESSAGE: 'The message was not sent by a webhook.', + MESSAGE_REFERENCE_MISSING: 'The message does not reference another message', EMOJI_TYPE: 'Emoji must be a string or GuildEmoji/ReactionEmoji', EMOJI_MANAGED: 'Emoji is managed and has no Author.', diff --git a/src/structures/Message.js b/src/structures/Message.js index 954ddab3991a..a8cb7f894266 100644 --- a/src/structures/Message.js +++ b/src/structures/Message.js @@ -406,15 +406,16 @@ class Message extends Base { } /** - * The Message this crosspost/reply/pin-add references, if cached - * @type {?Message} - * @readonly + * Fetches the Message this crosspost/reply/pin-add references, if available to the client + * @returns {Promise} */ - get referencedMessage() { - if (!this.reference) return null; - const referenceChannel = this.client.channels.resolve(this.reference.channelID); - if (!referenceChannel) return null; - return referenceChannel.messages.resolve(this.reference.messageID); + async fetchReference() { + if (!this.reference) throw new Error('MESSAGE_REFERENCE_MISSING'); + const { channelID, messageID } = this.reference; + const channel = this.client.channels.resolve(channelID); + if (!channel) throw new Error('GUILD_CHANNEL_RESOLVE'); + const message = await channel.messages.fetch(messageID); + return message; } /** diff --git a/typings/index.d.ts b/typings/index.d.ts index 84b249657d38..aae928fdd8eb 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -1020,7 +1020,6 @@ declare module 'discord.js' { public webhookID: Snowflake | null; public flags: Readonly; public reference: MessageReference | null; - public readonly referencedMessage: Message | null; public awaitReactions( filter: CollectorFilter<[MessageReaction, User]>, options?: AwaitReactionsOptions, @@ -1035,6 +1034,7 @@ declare module 'discord.js' { ): Promise; public edit(content: StringResolvable, options: MessageEditOptions | MessageEmbed): Promise; public equals(message: Message, rawData: object): boolean; + public fetchReference(): Promise; public fetchWebhook(): Promise; public crosspost(): Promise; public fetch(force?: boolean): Promise;