From 2a08e700872a7724e2260ec4b4587eaca401db3e Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 30 Jul 2020 13:45:42 +0300
Subject: [PATCH] automod: fix crash, improve user id detection
---
backend/src/plugins/Automod/functions/runAutomod.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/backend/src/plugins/Automod/functions/runAutomod.ts b/backend/src/plugins/Automod/functions/runAutomod.ts
index 44ff0335..8f54ab1c 100644
--- a/backend/src/plugins/Automod/functions/runAutomod.ts
+++ b/backend/src/plugins/Automod/functions/runAutomod.ts
@@ -7,7 +7,7 @@ import { CleanAction } from "../actions/clean";
import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown";
export async function runAutomod(pluginData: PluginData<AutomodPluginType>, context: AutomodContext) {
- const userId = context.user?.id || context.message?.user_id;
+ 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 channelId = context.message?.channel_id;
@@ -23,7 +23,7 @@ export async function runAutomod(pluginData: PluginData<AutomodPluginType>, cont
for (const [ruleName, rule] of Object.entries(config.rules)) {
if (rule.enabled === false) continue;
- if (!rule.affects_bots && user.bot) continue;
+ if (!rule.affects_bots && user?.bot) continue;
if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) {
return;