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

refactor(actions): safer getChannel calls (#10434)

Browse Source 
* refactor(actions): safer getChannel calls

* chore: consistency

---------

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
DD
2024-08-19 22:53:42 +03:00
committed by GitHub
parent 2d5531f35c
commit 87776bb0e8
13 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ 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(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id, author: data.author });
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(data); const channel = this.getChannel({ id: data.channel_id, 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(data); const channel = this.getChannel({ id: data.channel_id, 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(data); const channel = this.getChannel({ id: data.channel_id, 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

@@ -22,7 +22,7 @@ class MessageReactionAdd extends Action {
if (!user) return false; if (!user) return false;
// Verify channel // Verify channel
const channel = this.getChannel(data); const channel = this.getChannel({ id: data.channel_id, 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/MessageReactionRemove.js
View File

@@ -19,7 +19,7 @@ class MessageReactionRemove extends Action {
if (!user) return false; if (!user) return false;
// Verify channel // Verify channel
const channel = this.getChannel(data); const channel = this.getChannel({ id: data.channel_id, 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(data); const channel = this.getChannel({ id: data.channel_id, 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(data); const channel = this.getChannel({ id: data.channel_id, 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(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
if (channel) { if (channel) {
if (!channel.isTextBased()) return {}; if (!channel.isTextBased()) return {};

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class StageInstanceCreateAction extends Action { class StageInstanceCreateAction extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const channel = this.getChannel(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
if (channel) { if (channel) {
const stageInstance = channel.guild.stageInstances._add(data); const stageInstance = channel.guild.stageInstances._add(data);

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class StageInstanceDeleteAction extends Action { class StageInstanceDeleteAction extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const channel = this.getChannel(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
if (channel) { if (channel) {
const stageInstance = channel.guild.stageInstances._add(data); const stageInstance = channel.guild.stageInstances._add(data);

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

@@ -6,7 +6,7 @@ const Events = require('../../util/Events');
class StageInstanceUpdateAction extends Action { class StageInstanceUpdateAction extends Action {
handle(data) { handle(data) {
const client = this.client; const client = this.client;
const channel = this.getChannel(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
if (channel) { if (channel) {
const oldStageInstance = channel.guild.stageInstances.cache.get(data.id)?._clone() ?? null; const oldStageInstance = channel.guild.stageInstances.cache.get(data.id)?._clone() ?? null;

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(data); const channel = this.getChannel({ id: data.channel_id, guild_id: data.guild_id });
if (!channel) return; if (!channel) return;
if (!channel.isTextBased()) { if (!channel.isTextBased()) {