Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-15 19:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: GuildChannel#guildId not being patched to undefined (#10505)

Browse Source 
* fix: `GuildChannel#guildId` not being patched to `undefined`

* fix: guildId to guild_id check
This commit is contained in:
Qjuh
2024-09-14 19:14:03 +02:00
committed by GitHub
parent 495bc60345
commit 2adee06b6e
10 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/discord.js/src/client/actions/MessageCreate.js
View File

@@ -6,7 +6,11 @@ const Events = require('../../util/Events');
class MessageCreateAction extends Action { class MessageCreateAction extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, author: data.author }); const channel = this.getChannel({
id: data.channel_id,
author: data.author,
...('guild_id' in data && { guild_id: data.guild_id }),
});
if (channel) { if (channel) {
if (!channel.isTextBased()) return {}; if (!channel.isTextBased()) return {};

2
packages/discord.js/src/client/actions/MessageDelete.js
View File

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class MessageDeleteAction extends Action { class MessageDeleteAction extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
let message; let message;
if (channel) { if (channel) {
if (!channel.isTextBased()) return {}; if (!channel.isTextBased()) return {};

2
packages/discord.js/src/client/actions/MessagePollVoteAdd.js
View File

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
class MessagePollVoteAddAction extends Action { class MessagePollVoteAddAction extends Action {
handle(data) { handle(data) {
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (!channel?.isTextBased()) return false; if (!channel?.isTextBased()) return false;
const message = this.getMessage(data, channel); const message = this.getMessage(data, channel);

2
packages/discord.js/src/client/actions/MessagePollVoteRemove.js
View File

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
class MessagePollVoteRemoveAction extends Action { class MessagePollVoteRemoveAction extends Action {
handle(data) { handle(data) {
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (!channel?.isTextBased()) return false; if (!channel?.isTextBased()) return false;
const message = this.getMessage(data, channel); const message = this.getMessage(data, channel);

2
packages/discord.js/src/client/actions/MessageReactionAdd.js
View File

@@ -25,7 +25,7 @@ class MessageReactionAdd extends Action {
// Verify channel // Verify channel
const channel = this.getChannel({ const channel = this.getChannel({
id: data.channel_id, id: data.channel_id,
guild_id: data.guild_id, ...('guild_id' in data && { guild_id: data.guild_id }),
user_id: data.user_id, user_id: data.user_id,
...this.spreadInjectedData(data), ...this.spreadInjectedData(data),
}); });

6
packages/discord.js/src/client/actions/MessageReactionRemove.js
View File

@@ -19,7 +19,11 @@ class MessageReactionRemove extends Action {
if (!user) return false; if (!user) return false;
// Verify channel // Verify channel
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id }); const channel = this.getChannel({
id: data.channel_id,
...('guild_id' in data && { guild_id: data.guild_id }),
user_id: data.user_id,
});
if (!channel?.isTextBased()) return false; if (!channel?.isTextBased()) return false;
// Verify message // Verify message

2
packages/discord.js/src/client/actions/MessageReactionRemoveAll.js
View File

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class MessageReactionRemoveAll extends Action { class MessageReactionRemoveAll extends Action {
handle(data) { handle(data) {
// Verify channel // Verify channel
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (!channel?.isTextBased()) return false; if (!channel?.isTextBased()) return false;
// Verify message // Verify message

2
packages/discord.js/src/client/actions/MessageReactionRemoveEmoji.js
View File

@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
class MessageReactionRemoveEmoji extends Action { class MessageReactionRemoveEmoji extends Action {
handle(data) { handle(data) {
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (!channel?.isTextBased()) return false; if (!channel?.isTextBased()) return false;
const message = this.getMessage(data, channel); const message = this.getMessage(data, channel);

2
packages/discord.js/src/client/actions/MessageUpdate.js
View File

@@ -4,7 +4,7 @@ const Action = require('./Action');
class MessageUpdateAction extends Action { class MessageUpdateAction extends Action {
handle(data) { handle(data) {
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (channel) { if (channel) {
if (!channel.isTextBased()) return {}; if (!channel.isTextBased()) return {};

2
packages/discord.js/src/client/actions/TypingStart.js
View File

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class TypingStart extends Action { class TypingStart extends Action {
handle(data) { handle(data) {
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id }); const channel = this.getChannel({ id: data.channel_id, ...('guild_id' in data && { guild_id: data.guild_id }) });
if (!channel) return; if (!channel) return;
if (!channel.isTextBased()) { if (!channel.isTextBased()) {