refactor(InlineReplies): rename property, rework Message resolution

This commit is contained in:
monbrey 2020-10-07 14:18:17 +11:00
parent ab0d6fc5c9
commit 67c2e56647
2 changed files with 16 additions and 6 deletions

View file

@ -199,11 +199,16 @@ class APIMessage {
} }
let message_reference; let message_reference;
if (this.options.messageReference) { if (this.options.inlineReplyTo) {
message_reference = { const message = this.target.messages.resolve(this.options.inlineReplyTo);
message_id: this.target.messages.resolveID(this.options.messageReference), if (message) {
channel_id: this.target.id, message_reference = { message_id: message.id, channel_id: message.channel.id };
}; } else {
message_reference = {
message_id: this.options.inlineReplyTo.messageID,
channel_id: this.options.inlineReplyTo.channelID,
};
}
} }
this.data = { this.data = {

7
typings/index.d.ts vendored
View file

@ -2831,7 +2831,7 @@ declare module 'discord.js' {
code?: string | boolean; code?: string | boolean;
split?: boolean | SplitOptions; split?: boolean | SplitOptions;
reply?: UserResolvable; reply?: UserResolvable;
messageReference?: MessageResolvable; inlineReplyTo?: MessageResolvable | MessageReplyReference;
} }
type MessageReactionResolvable = MessageReaction | Snowflake; type MessageReactionResolvable = MessageReaction | Snowflake;
@ -2842,6 +2842,11 @@ declare module 'discord.js' {
messageID: string | null; messageID: string | null;
} }
interface MessageReplyReference {
channelID: Snowflake;
messageID: Snowflake;
}
type MessageResolvable = Message | Snowflake; type MessageResolvable = Message | Snowflake;
type MessageTarget = TextChannel | NewsChannel | DMChannel | User | GuildMember | Webhook | WebhookClient; type MessageTarget = TextChannel | NewsChannel | DMChannel | User | GuildMember | Webhook | WebhookClient;