dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-07-08 12:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ApiMessage): finish renaming replyTo

Browse source
This commit is contained in:
monbrey 2020-10-07 21:39:01 +11:00
parent ef1856bb1f
commit 2e96b9a606
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/structures/APIMessage.js
View file

@ -171,15 +171,11 @@ class APIMessage {
: this.options.allowedMentions; : this.options.allowedMentions;
let message_reference; let message_reference;
if (this.options.inlineReplyTo) { if (typeof this.options.replyTo !== 'undefined') {
const message = this.target.messages.resolve(this.options.inlineReplyTo); const message_id = this.target.messages.resolveID(this.options.replyTo);
if (message) { if (message_id) {
message_reference = { message_id: message.id, channel_id: message.channel.id }; const channel_id = typeof this.options.replyTo === 'string' ? this.target.id : this.options.replyTo.channel.id;
} else { message_reference = { message_id, channel_id };
message_reference = {
message_id: this.options.inlineReplyTo.messageID,
channel_id: this.options.inlineReplyTo.channelID,
};
} }
} }

12
src/structures/Message.js
View file

@ -422,10 +422,16 @@ class Message extends Base {
); );
} }
/**
* The Message this crosspost/reply/pin add references, if cached
* @type {Message}
* @readonly
*/
get referencedMessage() { get referencedMessage() {
return this.reference && this.reference.messageID && this.client.channels.cache.has(this.reference.channelID) if (!this.reference) return null;
? this.client.channels.resolve(this.reference.channelID).messages.resolve(this.reference.messageID) const referenceChannel = this.client.channels.resolve(this.reference.channelID);
: null; if (!referenceChannel) return null;
return referenceChannel.messages.resolve(this.reference.messageID);
} }
/** /**

1
src/util/Constants.js
View file

@ -398,6 +398,7 @@ exports.WSEvents = keyMirror([
* * CHANNEL_FOLLOW_ADD * * CHANNEL_FOLLOW_ADD
* * GUILD_DISCOVERY_DISQUALIFIED * * GUILD_DISCOVERY_DISQUALIFIED
* * GUILD_DISCOVERY_REQUALIFIED * * GUILD_DISCOVERY_REQUALIFIED
* * INLINE_REPLY
* @typedef {string} MessageType * @typedef {string} MessageType
*/ */
exports.MessageTypes = [ exports.MessageTypes = [

4
typings/index.d.ts vendored
View file

@ -1518,8 +1518,6 @@ declare module 'discord.js' {
public fetchWebhooks(): Promise<Collection<Snowflake, Webhook>>; public fetchWebhooks(): Promise<Collection<Snowflake, Webhook>>;
} }
type TextBasedChannelResolvable = TextChannel | NewsChannel | DMChannel | Snowflake;
export class User extends PartialTextBasedChannel(Base) { export class User extends PartialTextBasedChannel(Base) {
constructor(client: Client, data: object); constructor(client: Client, data: object);
public avatar: string | null; public avatar: string | null;
@ -2829,7 +2827,7 @@ declare module 'discord.js' {
messageID: string | null; messageID: string | null;
} }
type MessageResolvable = Message | { id: Snowflake; channel: TextBasedChannelResolvable }; type MessageResolvable = Message | Snowflake;
type MessageTarget = TextChannel | NewsChannel | DMChannel | User | GuildMember | Webhook | WebhookClient; type MessageTarget = TextChannel | NewsChannel | DMChannel | User | GuildMember | Webhook | WebhookClient;