mirror of
https://github.com/discordjs/discord.js.git
synced 2024-08-21 06:14:41 +12:00
fix(Action): Ensure all properties on getChannel()
are passed (#10278)
* fix(Action): ensure all properties on `getChannel()` are passed * refactor: flip `recipient` check
This commit is contained in:
parent
35207b0b31
commit
92c1a511dc
1 changed files with 2 additions and 6 deletions
|
@ -31,21 +31,17 @@ class GenericAction {
|
||||||
const payloadData = {};
|
const payloadData = {};
|
||||||
const id = data.channel_id ?? data.id;
|
const id = data.channel_id ?? data.id;
|
||||||
|
|
||||||
if ('recipients' in data) {
|
if (!('recipients' in data)) {
|
||||||
payloadData.recipients = data.recipients;
|
|
||||||
} else {
|
|
||||||
// Try to resolve the recipient, but do not add the client user.
|
// Try to resolve the recipient, but do not add the client user.
|
||||||
const recipient = data.author ?? data.user ?? { id: data.user_id };
|
const recipient = data.author ?? data.user ?? { id: data.user_id };
|
||||||
if (recipient.id !== this.client.user.id) payloadData.recipients = [recipient];
|
if (recipient.id !== this.client.user.id) payloadData.recipients = [recipient];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id !== undefined) payloadData.id = id;
|
if (id !== undefined) payloadData.id = id;
|
||||||
if ('guild_id' in data) payloadData.guild_id = data.guild_id;
|
|
||||||
if ('last_message_id' in data) payloadData.last_message_id = data.last_message_id;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
data[this.client.actions.injectedChannel] ??
|
data[this.client.actions.injectedChannel] ??
|
||||||
this.getPayload(payloadData, this.client.channels, id, Partials.Channel)
|
this.getPayload({ ...data, ...payloadData }, this.client.channels, id, Partials.Channel)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue