From 2e9e47ac83b4984e091877daae57493fa29349b9 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Sun, 2 Aug 2020 16:11:42 +0300 Subject: [PATCH] Fix up some automod context objects/types --- backend/src/plugins/Automod/functions/runAutomod.ts | 4 ++-- backend/src/plugins/Automod/types.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/plugins/Automod/functions/runAutomod.ts b/backend/src/plugins/Automod/functions/runAutomod.ts index 8f54ab1c..97cbba3f 100644 --- a/backend/src/plugins/Automod/functions/runAutomod.ts +++ b/backend/src/plugins/Automod/functions/runAutomod.ts @@ -8,8 +8,8 @@ import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown"; export async function runAutomod(pluginData: PluginData, context: AutomodContext) { const userId = context.user?.id || context.member?.id || context.message?.user_id; - const user = userId && pluginData.client.users.get(userId); - const member = userId && pluginData.guild.members.get(userId); + const user = context.user || (userId && pluginData.client.users.get(userId)); + const member = context.member || (userId && pluginData.guild.members.get(userId)); const channelId = context.message?.channel_id; const channel = channelId && pluginData.guild.channels.get(channelId); const categoryId = channel?.parentID; diff --git a/backend/src/plugins/Automod/types.ts b/backend/src/plugins/Automod/types.ts index 231e71f7..56239792 100644 --- a/backend/src/plugins/Automod/types.ts +++ b/backend/src/plugins/Automod/types.ts @@ -81,7 +81,7 @@ export interface AutomodContext { timestamp: number; actioned?: boolean; - user?: User | UnknownUser; + user?: User; message?: SavedMessage; member?: Member; joined?: boolean;