automod: fix crash, improve user id detection
This commit is contained in:
parent
9125dba2ab
commit
2a08e70087
1 changed files with 2 additions and 2 deletions
|
@ -7,7 +7,7 @@ import { CleanAction } from "../actions/clean";
|
||||||
import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown";
|
import { checkAndUpdateCooldown } from "./checkAndUpdateCooldown";
|
||||||
|
|
||||||
export async function runAutomod(pluginData: PluginData<AutomodPluginType>, context: AutomodContext) {
|
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 user = userId && pluginData.client.users.get(userId);
|
||||||
const member = userId && pluginData.guild.members.get(userId);
|
const member = userId && pluginData.guild.members.get(userId);
|
||||||
const channelId = context.message?.channel_id;
|
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)) {
|
for (const [ruleName, rule] of Object.entries(config.rules)) {
|
||||||
if (rule.enabled === false) continue;
|
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)) {
|
if (rule.cooldown && checkAndUpdateCooldown(pluginData, rule, context)) {
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Add table
Reference in a new issue