From e1c613829950a534d9f45c00a033b83575be3b3c Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Fri, 17 Jun 2022 20:03:05 -0400 Subject: remove global client variable --- src/arguments/globalUser.ts | 4 ++-- src/arguments/messageLink.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/arguments') diff --git a/src/arguments/globalUser.ts b/src/arguments/globalUser.ts index df4f5d9..4324aa9 100644 --- a/src/arguments/globalUser.ts +++ b/src/arguments/globalUser.ts @@ -2,6 +2,6 @@ import type { BushArgumentTypeCaster } from '#lib'; import type { User } from 'discord.js'; // resolve non-cached users -export const globalUser: BushArgumentTypeCaster> = async (_, phrase) => { - return client.users.resolve(phrase) ?? (await client.users.fetch(`${phrase}`).catch(() => null)); +export const globalUser: BushArgumentTypeCaster> = async (message, phrase) => { + return message.client.users.resolve(phrase) ?? (await message.client.users.fetch(`${phrase}`).catch(() => null)); }; diff --git a/src/arguments/messageLink.ts b/src/arguments/messageLink.ts index a473485..c95e42d 100644 --- a/src/arguments/messageLink.ts +++ b/src/arguments/messageLink.ts @@ -1,7 +1,7 @@ import { BushArgumentTypeCaster, regex } from '#lib'; import type { Message } from 'discord.js'; -export const messageLink: BushArgumentTypeCaster> = async (_, phrase) => { +export const messageLink: BushArgumentTypeCaster> = async (message, phrase) => { const match = new RegExp(regex.messageLink).exec(phrase); if (!match || !match.groups) return null; @@ -9,12 +9,12 @@ export const messageLink: BushArgumentTypeCaster> = asyn if (!guild_id || !channel_id || message_id) return null; - const guild = client.guilds.cache.get(guild_id); + const guild = message.client.guilds.cache.get(guild_id); if (!guild) return null; const channel = guild.channels.cache.get(channel_id); if (!channel || (!channel.isTextBased() && !channel.isThread())) return null; - const message = await channel.messages.fetch(message_id).catch(() => null); - return message; + const msg = await channel.messages.fetch(message_id).catch(() => null); + return msg; }; -- cgit