Skip to content

Commit 87776bb

Browse files
refactor(actions): safer getChannel calls (#10434)
* refactor(actions): safer getChannel calls * chore: consistency --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 2d5531f commit 87776bb

13 files changed

+13
-13
lines changed

packages/discord.js/src/client/actions/MessageCreate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
66
class MessageCreateAction extends Action {
77
handle(data) {
88
const client = this.client;
9-
const channel = this.getChannel(data);
9+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, author: data.author });
1010
if (channel) {
1111
if (!channel.isTextBased()) return {};
1212

packages/discord.js/src/client/actions/MessageDelete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
66
class MessageDeleteAction extends Action {
77
handle(data) {
88
const client = this.client;
9-
const channel = this.getChannel(data);
9+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
1010
let message;
1111
if (channel) {
1212
if (!channel.isTextBased()) return {};

packages/discord.js/src/client/actions/MessagePollVoteAdd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
55

66
class MessagePollVoteAddAction extends Action {
77
handle(data) {
8-
const channel = this.getChannel(data);
8+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
99
if (!channel?.isTextBased()) return false;
1010

1111
const message = this.getMessage(data, channel);

packages/discord.js/src/client/actions/MessagePollVoteRemove.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
55

66
class MessagePollVoteRemoveAction extends Action {
77
handle(data) {
8-
const channel = this.getChannel(data);
8+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
99
if (!channel?.isTextBased()) return false;
1010

1111
const message = this.getMessage(data, channel);

packages/discord.js/src/client/actions/MessageReactionAdd.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MessageReactionAdd extends Action {
2222
if (!user) return false;
2323

2424
// Verify channel
25-
const channel = this.getChannel(data);
25+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id });
2626
if (!channel?.isTextBased()) return false;
2727

2828
// Verify message

packages/discord.js/src/client/actions/MessageReactionRemove.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class MessageReactionRemove extends Action {
1919
if (!user) return false;
2020

2121
// Verify channel
22-
const channel = this.getChannel(data);
22+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, user_id: data.user_id });
2323
if (!channel?.isTextBased()) return false;
2424

2525
// Verify message

packages/discord.js/src/client/actions/MessageReactionRemoveAll.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
66
class MessageReactionRemoveAll extends Action {
77
handle(data) {
88
// Verify channel
9-
const channel = this.getChannel(data);
9+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
1010
if (!channel?.isTextBased()) return false;
1111

1212
// Verify message

packages/discord.js/src/client/actions/MessageReactionRemoveEmoji.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const Events = require('../../util/Events');
55

66
class MessageReactionRemoveEmoji extends Action {
77
handle(data) {
8-
const channel = this.getChannel(data);
8+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
99
if (!channel?.isTextBased()) return false;
1010

1111
const message = this.getMessage(data, channel);

packages/discord.js/src/client/actions/MessageUpdate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const Action = require('./Action');
44

55
class MessageUpdateAction extends Action {
66
handle(data) {
7-
const channel = this.getChannel(data);
7+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
88
if (channel) {
99
if (!channel.isTextBased()) return {};
1010

packages/discord.js/src/client/actions/StageInstanceCreate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
66
class StageInstanceCreateAction extends Action {
77
handle(data) {
88
const client = this.client;
9-
const channel = this.getChannel(data);
9+
const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
1010

1111
if (channel) {
1212
const stageInstance = channel.guild.stageInstances._add(data);

0 commit comments

Comments
 (0)